Adjust structure to work with multiple maps (#54)

* Fix the creation of layers using draw control * Fix LayerGroup.toGeoJSON --------- Co-authored-by: Baljak <[email protected]>
JaWeilBaum · Feb 2, 2023 · 0e9fdd8 · 0e9fdd8
1 parent 90d58dc
commit 0e9fdd8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/pyqtlet2/__init__.py b/pyqtlet2/__init__.py
@@ -3,7 +3,7 @@
 """
 
 __author__ = 'Leon Friedmann <[email protected]>'
-__version__ = '0.9.2'
+__version__ = '0.9.3'
 
 from .mapwidget import MapWidget
 from .leaflet import L
diff --git a/pyqtlet2/leaflet/layer/layer.py b/pyqtlet2/leaflet/layer/layer.py
@@ -36,6 +36,10 @@ def runJavaScriptForMapIndex(self, js):
         if self._map is not None:
             self.runJavaScript(js, self._map.mapWidgetIndex)
 
+    def getJsResponseForMapIndex(self, js, callback):
+        if self._map is not None:
+            self.getJsResponse(js, self._map.mapWidgetIndex, callback)
+
     def __init__(self):
         super().__init__()
         self._map = None

diff --git a/pyqtlet2/leaflet/layer/layergroup.py b/pyqtlet2/leaflet/layer/layergroup.py
@@ -21,6 +21,8 @@ def _initJs(self):
 
     def addLayer(self, layer):
         self._layers.append(layer)
+        layer.map = self._map
+        layer._initJs()
         js = '{layerGroup}.addLayer({layerName})'.format(layerGroup=self._layerName,
                 layerName=layer._layerName)
         self.runJavaScriptForMapIndex(js)
@@ -39,5 +41,5 @@ def clearLayers(self):
         self.runJavaScriptForMapIndex(js)
 
     def toGeoJSON(self, callback):
-        self.getJsResponse('{layer}.toGeoJSON()'.format(layer=self.jsName), callback)
+        self.getJsResponseForMapIndex(f'{self.jsName}.toGeoJSON()', callback)
 
diff --git a/pyqtlet2/leaflet/layer/vector/circle.py b/pyqtlet2/leaflet/layer/vector/circle.py
@@ -12,4 +12,4 @@ def _initJs(self):
         if self.options:
             leafletJsObject += ', {options}'.format(options=self.options)
         leafletJsObject += ')'
-        self._createJsObject(leafletJsObject, self)
+        self._createJsObject(leafletJsObject, self._map.mapWidgetIndex)
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='pyqtlet2',
-    version='0.9.2',
+    version='0.9.3',
     description='Bringing leaflet maps to Python Qt bindings',
     long_description=long_description,
     long_description_content_type="text/markdown",