add rightmenu to added shapes

to close #141

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.4.2 - Fix editing injected shapes.
  - v2.4.1 - Add convex-hull node for grouping objects.
  - v2.3.16 - Add heading to default addMarker, allow custom http icon size.
  - v2.3.13 - Fix geoson feature properties fill color, and better marker handling

README.md

@@ -11,6 +11,7 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.4.2 - Fix editing injected shapes.
 - v2.4.1 - Add convex-hull node for grouping objects.
 - v2.3.16 - Add heading to default addMarker, allow custom http icon size.
 - v2.3.13 - Fix geoson feature properties fill color, and better marker handling

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "cgi": "0.3.1",

worldmap/worldmap.js

@@ -998,7 +998,7 @@ function setMarker(data) {
         if (polygons[data.name] == undefined) {
             rightcontext = "<button id='delbutton' onclick='delMarker(\""+data.name+"\",true);'>Delete</button>";
         }
-        else if (data.editable) {
+        if (data.editable) {
             rightcontext = "<button onclick='editPoly(\""+data.name+"\",true);'>Edit</button><button onclick='delMarker(\""+data.name+"\",true);'>Delete</button>";
         }
         if ((data.contextmenu !== undefined) && (typeof data.contextmenu === "string")) {
@@ -1106,19 +1106,19 @@ function setMarker(data) {
         if (!data.hasOwnProperty("weight")) { opt.weight = 3; }    //Standard settings different for lines
         if (!data.hasOwnProperty("opacity")) { opt.opacity = 0.8; }
         var polyln = L.polyline(data.line, opt);
-        polygons[data.name] = polyln;
+        polygons[data.name] = rightmenu(polyln);
     }
     else if (data.hasOwnProperty("area") && Array.isArray(data.area)) {
         var polyarea;
         if (data.area.length === 2) { polyarea = L.rectangle(data.area, opt); }
         else { polyarea = L.polygon(data.area, opt); }
-        polygons[data.name] = polyarea;
+        polygons[data.name] = rightmenu(polyarea);
     }
     else if (data.hasOwnProperty("sdlat") && data.hasOwnProperty("sdlon")) {
         if (!data.hasOwnProperty("iconColor")) { opt.color = "blue"; }     //different standard Color Settings
         if (!data.hasOwnProperty("fillColor")) { opt.fillColor = "blue"; }
         var ellipse = L.ellipse(new L.LatLng((data.lat*1), (data.lon*1)), [200000*data.sdlon*Math.cos(data.lat*Math.PI/180), 200000*data.sdlat], 0, opt);
-        polygons[data.name] = ellipse;
+        polygons[data.name] = rightmenu(ellipse);
     }
     else if (data.hasOwnProperty("radius")) {
         if (data.hasOwnProperty("lat") && data.hasOwnProperty("lon")) {
@@ -1129,7 +1129,7 @@ function setMarker(data) {
             else {
                 polycirc = L.circle(new L.LatLng((data.lat*1), (data.lon*1)), data.radius*1, opt);
             }
-            polygons[data.name] = polycirc;
+            polygons[data.name] = rightmenu(polycirc);
             if (!data.hasOwnProperty("icon")) {
                 delete (data.lat);
                 delete (data.lon);