Merge pull request #12 from lipton-ice-tea/1.0.7

1.0.7
lipton-ice-tea · Jul 5, 2021 · d9f57c4 · d9f57c4
2 parents 7159973 + c20806e
commit d9f57c4
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/docs/images/arrow.svg b/docs/images/arrow.svg
diff --git a/docs/index.html b/docs/index.html
@@ -75,7 +75,7 @@
             coordinates: L.latLng(51.495, -0.06),
             prevLatlng: L.latLng(51.503, -0.09),
             img: './images/arrow.svg',
-            imgSize: [40, 40],
+            imgSize: [50, 50],
             priority: 2,
         },
     ];
@@ -103,12 +103,12 @@
             case 'img':
                 const coordinatesPopup = '[' + point.coordinates.lat + ',' + point.coordinates.lng + ']';
                 L.canvasMarker(point.coordinates, {
-                    radius: 20,
                     prevLatlng: point.prevLatlng,
                     img: {
                         url: point.img,
                         size: point.imgSize,
                         rotate: point.imgRotate || 0,
+                        offset: point.offset || { x: 0, y: 0 },
                     },
                 }).bindPopup(coordinatesPopup).addTo(map);
                 break;

diff --git a/docs/leaflet-canvas-markers.js b/docs/leaflet-canvas-markers.js
@@ -60,7 +60,14 @@
         },
     });
 
-    L.canvasMarker = function (...options) {
-        return new CanvasMarker(...options);
+    L.canvasMarker = function (...opt) {
+        try {
+            const i = opt.findIndex(o => typeof o === 'object' && o.img);
+            if (i+1) {
+                if (!opt[i].radius && opt[i].img && opt[i].img.size) opt[i].radius = Math.ceil(Math.max(...opt[i].img.size)/2);
+                if (opt[i].pane) delete opt[i].pane;
+            }
+        } catch(e) {}
+        return new CanvasMarker(...opt);
     };
 }));
diff --git a/example/images/arrow.svg b/example/images/arrow.svg
diff --git a/example/index.html b/example/index.html
@@ -75,7 +75,7 @@
             coordinates: L.latLng(51.495, -0.06),
             prevLatlng: L.latLng(51.503, -0.09),
             img: './images/arrow.svg',
-            imgSize: [40, 40],
+            imgSize: [50, 50],
             priority: 2,
         },
     ];
@@ -103,12 +103,12 @@
             case 'img':
                 const coordinatesPopup = '[' + point.coordinates.lat + ',' + point.coordinates.lng + ']';
                 L.canvasMarker(point.coordinates, {
-                    radius: 20,
                     prevLatlng: point.prevLatlng,
                     img: {
                         url: point.img,
                         size: point.imgSize,
                         rotate: point.imgRotate || 0,
+                        offset: point.offset || { x: 0, y: 0 },
                     },
                 }).bindPopup(coordinatesPopup).addTo(map);
                 break;

diff --git a/leaflet-canvas-markers.js b/leaflet-canvas-markers.js
@@ -60,7 +60,14 @@
         },
     });
 
-    L.canvasMarker = function (...options) {
-        return new CanvasMarker(...options);
+    L.canvasMarker = function (...opt) {
+        try {
+            const i = opt.findIndex(o => typeof o === 'object' && o.img);
+            if (i+1) {
+                if (!opt[i].radius && opt[i].img && opt[i].img.size) opt[i].radius = Math.ceil(Math.max(...opt[i].img.size)/2);
+                if (opt[i].pane) delete opt[i].pane;
+            }
+        } catch(e) {}
+        return new CanvasMarker(...opt);
     };
 }));
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-canvas-markers",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Adding all images to one canvas, together with the base L.CircleMarker! And you can create a direction arrow just by pointing to the previous waypoint.",
   "main": "leaflet-canvas-markers.js",
   "scripts": {