Merge pull request #59 from phegman/androidfanatic-patch-1

Pete Hegman · web-flow · commit f67ef9754d30 · 2019-02-13T20:41:22.000-08:00
Add the ability to use `options` with `NavigationControl`
diff --git a/dist/Mapbox.js b/dist/Mapbox.js
@@ -401,7 +401,7 @@ exports.default = {
 
 			//Nav Control
 			if (this.navControl.show) {
-				var nav = new mapboxgl.NavigationControl();
+				var nav = new mapboxgl.NavigationControl(this.navControl.options);
 				map.addControl(nav, this.navControl.position);
 			}
 
diff --git a/dist/app.js b/dist/app.js
@@ -444,7 +444,7 @@ exports.default = {
 
 			//Nav Control
 			if (this.navControl.show) {
-				var nav = new mapboxgl.NavigationControl();
+				var nav = new mapboxgl.NavigationControl(this.navControl.options);
 				map.addControl(nav, this.navControl.position);
 			}
 
diff --git a/index.html b/index.html
@@ -7,10 +7,10 @@
         <meta name="description" content="A Vue JS component for Mapbox GL">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.42.2/mapbox-gl.js'></script>
-        <script src='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.0/mapbox-gl-draw.js'></script>
-        <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.42.2/mapbox-gl.css' rel='stylesheet' />
-        <link rel='stylesheet' href='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v0.19.0/mapbox-gl-draw.css' type='text/css' />
+        <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.0/mapbox-gl.js'></script>
+        <script src='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.9/mapbox-gl-draw.js'></script>
+        <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.0/mapbox-gl.css' rel='stylesheet' />
+        <link rel='stylesheet' href='https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.9/mapbox-gl-draw.css' type='text/css' />
         <style>
 			#map {
 				width: 100%;
@@ -21,7 +21,7 @@
     <body>
 		<div id="app">
 			<mapbox
-				access-token="your access token"
+				access-token="***REMOVED***"
 				:map-options="{
 			    	style: 'mapbox://styles/mapbox/light-v9',
 			    	center: [-96, 37.8],
diff --git a/src/components/Mapbox.vue b/src/components/Mapbox.vue
@@ -308,7 +308,7 @@
 			addControls (map) {
 				//Nav Control
 				if (this.navControl.show) {
-					const nav = new mapboxgl.NavigationControl();
+					const nav = new mapboxgl.NavigationControl(this.navControl.options);
 					map.addControl(nav, this.navControl.position);
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ exports.default = {`
`401`	`401`
`402`	`402`	`//Nav Control`
`403`	`403`	`if (this.navControl.show) {`
`404`		`- var nav = new mapboxgl.NavigationControl();`
	`404`	`+ var nav = new mapboxgl.NavigationControl(this.navControl.options);`
`405`	`405`	`map.addControl(nav, this.navControl.position);`
`406`	`406`	`}`
`407`	`407`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ exports.default = {`
`444`	`444`
`445`	`445`	`//Nav Control`
`446`	`446`	`if (this.navControl.show) {`
`447`		`- var nav = new mapboxgl.NavigationControl();`
	`447`	`+ var nav = new mapboxgl.NavigationControl(this.navControl.options);`
`448`	`448`	`map.addControl(nav, this.navControl.position);`
`449`	`449`	`}`
`450`	`450`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@`
`308`	`308`	`addControls (map) {`
`309`	`309`	`//Nav Control`
`310`	`310`	`if (this.navControl.show) {`
`311`		`- const nav = new mapboxgl.NavigationControl();`
	`311`	`+ const nav = new mapboxgl.NavigationControl(this.navControl.options);`
`312`	`312`	`map.addControl(nav, this.navControl.position);`
`313`	`313`	`}`
`314`	`314`