Fix: Draw creation and control added to map

* Bug fix when Draw created and added to Map
* Marker emits the same content _onMove and _onMoveend
* Update pyqtlet2/leaflet/layer/marker/marker.py

Author: ericj974

pyqtlet2/leaflet/control/control.py

@@ -42,10 +42,12 @@ def controlName(self, name):
 
     def __init__(self):
         super().__init__()
+        self._map = None
         self._controlName = self._getNewControlName()
 
     def addTo(self, map_):
         map_.addControl(self)
+        return self
 
     def removeFrom(self, map_):
         map_.removeControl(self)

pyqtlet2/leaflet/control/draw.py

@@ -14,7 +14,8 @@ def __init__(self, options={}, handleFeatureGroup=True):
         self.handleFeatureGroup = handleFeatureGroup
         self.featureGroup = None
         self._handleOptions()
-        self._initJs()
+        if self._map:
+            self._initJs()
         if handleFeatureGroup:
             self.addedToMap.connect(self.addDrawnToFeatureGroup)
 
@@ -23,7 +24,7 @@ def _initJs(self):
         if self.options:
             jsObject += '{options}'.format(options=self._stringifyForJs(self.options))
         jsObject += ')'
-        self._createJsObject(jsObject)
+        self._createJsObject(jsObject, self._map.mapWidgetIndex)
 
     def _handleOptions(self):
         # If there are no options, then we want to set the default options

pyqtlet2/leaflet/layer/marker/marker.py

@@ -28,7 +28,7 @@ def _onMove(self, event):
         self._logger.debug('marker moved. event: {event}'.format(event=event))
         event = self._qJsonValueToDict(event)
         self.latLng = [event["latlng"]["lat"], event["latlng"]["lng"]]
-        self.move.emit(event)
+        self.move.emit({**self._qJsonValueToDict(event), "sender": self})
 
     @Slot(QJsonValue)
     def _onMoveend(self, event):

pyqtlet2/leaflet/map/map.py

@@ -139,6 +139,7 @@ def removeLayer(self, layer):
     def addControl(self, control):
         self._controls.append(control)
         control.map = self
+        control._initJs()
         js = 'map.addControl({controlName})'.format(controlName=control.controlName)
         self.runJavaScriptForMap(js)
         return self