Update URL Transform, Zoom behavior (#39)

* update url transform to not add parameters to non-Mapbox API requests * update zoom behavior on click to only increase zoom +1 from current level
mapbox · Feb 3, 2018 · 86f273e · 86f273e
1 parent bae0b6d
commit 86f273e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/mapboxgl/__init__.py b/mapboxgl/__init__.py
@@ -1,4 +1,4 @@
 from .viz import CircleViz, GraduatedCircleViz, HeatmapViz, ClusteredCircleViz
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 __all__ = ['CircleViz', 'GraduatedCircleViz', 'HeatmapViz', 'ClusteredCircleViz']
diff --git a/mapboxgl/templates/circle.html b/mapboxgl/templates/circle.html
@@ -9,8 +9,15 @@
     center: {{ center }},
     zoom: {{ zoom }},
     transformRequest: (url, resourceType)=> {
-        return {
-           url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+        if ( url.slice(0,22) == 'https://api.mapbox.com' ) {
+            //Add Python Plugin identifier for Mapbox API traffic
+            return {
+               url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+             }
+         }
+         else {
+             //Do not transform URL for non Mapbox GET requests
+             return {url: url}
          }
     }
 });
@@ -91,7 +98,7 @@
     map.on('click', 'circle', function(e) {
         map.flyTo({
             center: e.features[0].geometry.coordinates,
-            zoom: 10
+            zoom: map.getZoom() + 1
         });
     });
 });

diff --git a/mapboxgl/templates/clustered_circle.html b/mapboxgl/templates/clustered_circle.html
@@ -9,8 +9,15 @@
     center: {{ center }},
     zoom: {{ zoom }},
     transformRequest: (url, resourceType)=> {
-        return {
-           url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+        if ( url.slice(0,22) == 'https://api.mapbox.com' ) {
+            //Add Python Plugin identifier for Mapbox API traffic
+            return {
+               url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+             }
+         }
+         else {
+             //Do not transform URL for non Mapbox GET requests
+             return {url: url}
          }
     }
 });
@@ -106,7 +113,14 @@
     map.on('click', 'circle-unclustered', function(e) {
         map.flyTo({
             center: e.features[0].geometry.coordinates,
-            zoom: 10
+            zoom: map.getZoom() + 1
+        });
+    });
+
+    map.on('click', 'circle-cluster', function(e) {
+        map.flyTo({
+            center: map.unproject(e.point),
+            zoom: map.getZoom() + 1
         });
     });
 });

diff --git a/mapboxgl/templates/graduated_circle.html b/mapboxgl/templates/graduated_circle.html
@@ -9,8 +9,15 @@
     center: {{ center }},
     zoom: {{ zoom }},
     transformRequest: (url, resourceType)=> {
-        return {
-           url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+        if ( url.slice(0,22) == 'https://api.mapbox.com' ) {
+            //Add Python Plugin identifier for Mapbox API traffic
+            return {
+               url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+             }
+         }
+         else {
+             //Do not transform URL for non Mapbox GET requests
+             return {url: url}
          }
     }
 });
@@ -92,7 +99,7 @@
     map.on('click', 'circle', function(e) {
         map.flyTo({
             center: e.features[0].geometry.coordinates,
-            zoom: 10
+            zoom: map.getZoom() + 1
         });
     });
 });

diff --git a/mapboxgl/templates/heatmap.html b/mapboxgl/templates/heatmap.html
@@ -9,8 +9,15 @@
     center: {{ center }},
     zoom: {{ zoom }},
     transformRequest: (url, resourceType)=> {
-        return {
-           url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+        if ( url.slice(0,22) == 'https://api.mapbox.com' ) {
+            //Add Python Plugin identifier for Mapbox API traffic
+            return {
+               url: [url.slice(0, url.indexOf("?")+1), "pluginName=PythonMapboxgl&", url.slice(url.indexOf("?")+1)].join('')
+             }
+         }
+         else {
+             //Do not transform URL for non Mapbox GET requests
+             return {url: url}
          }
     }
 });