make clientside helpers local variables

plotly · Jan 18, 2024 · efc9303 · efc9303
1 parent 7eeb7fc
commit efc9303
Showing 1 changed file with 38 additions and 41 deletions.
diff --git a/src/lib/cyleaflet_clientside.js b/src/lib/cyleaflet_clientside.js
@@ -5,60 +5,45 @@ if (!window.dash_clientside) {
     window.dash_clientside = {};
 }
 
-window.dash_clientside.cyleaflet_utils = {
-    // Proj4 coordinate conversion object
-    // object with 2 methods: `forward` converts from lat/lon to x/y,
-    // and `inverse` converts from x/y to lat/lon.
-    //  - EPSG:4326 is the 'standard' lat/lon coordinate system,
-    //  - EPSG:3857 is the 'Web Mercator' projection used by many
-    //    online mapping serveces including Leaflet
-    // Note: proj4.js is imported as an part of `external_scripts`
-    // in demos/usage-cy-leaflet-aio-ekl.py
-    _proj4js_converter: proj4('EPSG:4326', 'EPSG:3857'),
+// Proj4 coordinate conversion object
+// object with 2 methods: `forward` converts from lat/lon to x/y,
+// and `inverse` converts from x/y to lat/lon.
+//  - EPSG:4326 is the 'standard' lat/lon coordinate system,
+//  - EPSG:3857 is the 'Web Mercator' projection used by many
+//    online mapping serveces including Leaflet
+// Note: proj4.js is imported as an part of `external_scripts`
+// in demos/usage-cy-leaflet-aio-ekl.py
+var _proj4js_converter = proj4('EPSG:4326', 'EPSG:3857');
 
-    lonLatToXY: function (lon, lat) {
-        var xy = this._proj4js_converter.forward([lon, lat]);
-        var x = xy[0];
-        var y = -xy[1];
-        return [x, y];
-    },
+function lonLatToXY(lon, lat) {
+    var xy = _proj4js_converter.forward([lon, lat]);
+    var x = xy[0];
+    var y = -xy[1];
+    return [x, y];
+}
 
-    xYToLonLat: function (x, y) {
-        var lonlat = this._proj4js_converter.inverse([x, -y]);
-        var lon = lonlat[0];
-        var lat = lonlat[1];
-        return [lon, lat];
-    },
+function xYToLonLat(x, y) {
+    var lonlat = _proj4js_converter.inverse([x, -y]);
+    var lon = lonlat[0];
+    var lat = lonlat[1];
+    return [lon, lat];
+}
 
-    transformElements: function (elements) {
-        return elements.map((e) => {
-            if (e.data.hasOwnProperty('lat')) {
-                var xy = this.lonLatToXY(e.data.lon, e.data.lat);
-                return {
-                    data: e.data,
-                    position: {
-                        y: xy[1],
-                        x: xy[0],
-                    },
-                };
-            }
-            return e;
-        });
-    },
+
+window.dash_clientside.cyleaflet_utils = {
 };
 
 window.dash_clientside.cyleaflet = {
     updateLeafBounds: function (cyExtent) {
         if (!cyExtent) {
             return window.dash_clientside.no_update;
         }
-        var utils = window.dash_clientside.cyleaflet_utils;
 
-        var lonLatMin = utils.xYToLonLat(cyExtent.x1, cyExtent.y1);
+        var lonLatMin = xYToLonLat(cyExtent.x1, cyExtent.y1);
         var lonMin = lonLatMin[0];
         var latMin = lonLatMin[1];
 
-        var lonLatMax = utils.xYToLonLat(cyExtent.x2, cyExtent.y2);
+        var lonLatMax = xYToLonLat(cyExtent.x2, cyExtent.y2);
         var lonMax = lonLatMax[0];
         var latMax = lonLatMax[1];
 
@@ -83,6 +68,18 @@ window.dash_clientside.cyleaflet = {
         ];
     },
     transformElements: function (elements) {
-        return window.dash_clientside.cyleaflet_utils.transformElements(elements);
+        return elements.map((e) => {
+            if (e.data.hasOwnProperty('lat')) {
+                var xy = lonLatToXY(e.data.lon, e.data.lat);
+                return {
+                    data: e.data,
+                    position: {
+                        y: xy[1],
+                        x: xy[0],
+                    },
+                };
+            }
+            return e;
+        });    
     },
 };