Fix conflicts

soal · Jul 5, 2018 · 9fdcca2 · 9fdcca2
2 parents 80fcc9f + e0b50d2
commit 9fdcca2
Show file tree

Hide file tree

Showing 9 changed files with 135 additions and 7 deletions.
diff --git a/dist/vue-mapbox.min.js b/dist/vue-mapbox.min.js
diff --git a/dist/vue-mapbox.min.js.gz b/dist/vue-mapbox.min.js.gz
diff --git a/dist/vue-mapbox.umd.min.js b/dist/vue-mapbox.umd.min.js
diff --git a/dist/vue-mapbox.umd.min.js.gz b/dist/vue-mapbox.umd.min.js.gz
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,4 +1,4 @@
-# Vue-mapbox <small>0.0.32</small>
+# Vue-mapbox <small>0.0.33</small>
 
 > Combine powers of [Vue.js](https://vuejs.org/) and [Mapbox Gl JS](https://mapbox.com/mapbox-gl-js)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-mapbox",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "Vuejs 2 components for interacting with mapbox-gj-js ",
   "main": "dist/vue-mapbox.umd.min.js",
   "repository": {
@@ -73,6 +73,7 @@
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-vue": "^4.5.0",
     "eventsource-polyfill": "^0.9.6",
     "friendly-errors-webpack-plugin": "^1.1.3",
     "html-webpack-plugin": "^2.28.0",

diff --git a/src/components/GlMap.vue b/src/components/GlMap.vue
@@ -114,7 +114,7 @@ export default {
 
       this.$_bindEvents(eventsToListen)
       this.$_bindPropsUpdateEvents()
-      this.initial = true
+      this.initial = false
       this.mapLoaded = true
     })
   },

diff --git a/src/components/UI/GeolocateControl.vue b/src/components/UI/GeolocateControl.vue
@@ -22,9 +22,17 @@
           }
         }
       },
-      watchPosition: {
+      trackUserLocation: {
         type: Boolean,
         default: false
+      },
+      showUserLocation: {
+        type: Boolean,
+        default: true
+      },
+      fitBoundsOptions: {
+        type: Object,
+        default: () => ({ maxZoom: 15 })
       }
     },