veldapps-leaflet-js - npm Package Compare versions

Comparing version 1.0.10 to 1.0.11

CHANGELOG.md

@@ -0,1 +1,5 @@
+### 2022/09/26 (1.0.11)
+
+* Optimizes for usage with RequireJS
+
 ### 2022/09/25 (1.0.10)
@@ -2,0 +6,0 @@

package.json

 {
   "name": "veldapps-leaflet-js",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Leaflet package for Veldapps apps",
@@ -5,0 +5,0 @@ "main": "index.js",

src/leafletjs.com/leaflet-1.8.0.js

@@ -17,3 +17,3 @@ function defined(module) { return module; }
 /*- TODO stylesheets should be part of the plugins! */
-define(["module","proj4","./node_modules/leaflet/dist/leaflet-src", "./wicket",
+define(["module", "proj4", "leaflet", "./wicket", "./awesome_markers", "./locate",
 	"stylesheet!./node_modules/leaflet/dist/leaflet.css",
@@ -28,19 +28,25 @@ "stylesheet!./bower_components/leaflet.locatecontrol/dist/L.Control.Locate.css",
 	"stylesheet!./bower_components/leaflet.zoomhome/dist/leaflet.zoomhome.css"
-], function(module, proj4, leaflet, wicket) { 
-	var path = "../../" + js.normalize(module.uri, "./bower_components/");
+], function(module, proj4, L, wicket, awesome_markers, locate) { 
+	// var path = "../../" + js.normalize(module.uri, "./bower_components/");
+	var path = "leaflet/bower_components/";
 	// var css = "stylesheet!" + path;
-	define("leaflet/plugins/proj4", [path + "Proj4Leaflet/src/proj4leaflet.js"], defined);
-	// define("leaflet/plugins/bouncemarker", [path + "leaflet.bouncemarker/bouncemarker.js", defined]);
-	define("leaflet/plugins/bouncemarker", ["leaflet/bouncemarker", defined]);
-	define("leaflet/plugins/locate", [path + "leaflet.locatecontrol/dist/L.Control.Locate.min.js"], defined);
-	define("leaflet/plugins/awesome-markers", [path + "Leaflet.awesome-markers/dist/leaflet.awesome-markers.js"], function() {
+	define("leaflet/plugins/proj4", [path + "Proj4Leaflet/src/proj4leaflet"], defined);
+	// define("leaflet/plugins/bouncemarker", [path + "leaflet.bouncemarker/bouncemarker", defined]);
+	// define("leaflet/plugins/bouncemarker", ["leaflet/bouncemarker", defined]);
+	define("leaflet/plugins/locate", () => {
+		debugger;
+		console.log("locate === L.Control.Locate", locate === L.Control.Locate, locate);
+		return L.Control.Locate;
+	});
+	define("leaflet/plugins/awesome-markers", ["leaflet/awesome_markers"], function(awe) {
+		debugger;
 	    L.AwesomeMarkers.Icon.prototype.options.prefix = "fa";
 	    return arguments[0];
 	});
-	define("leaflet/plugins/markercluster", [path + "leaflet.markercluster/dist/leaflet.markercluster-src.js"], defined);
-	define("leaflet/plugins/history", [path + "leaflet-history/dist/leaflet-history-src.js"], defined);	
-	// define("leaflet/plugins/prunecluster", [path + "PruneCluster/dist/PruneCluster.js"], defined);	
-	define("leaflet/plugins/search", [path + "leaflet-search/dist/leaflet-search.src.js"], defined);
-	define("leaflet/plugins/home", [path + "leaflet.zoomhome/dist/leaflet.zoomhome.js"], defined);
-	define("leaflet/plugins/freedraw", [path + "leaflet-freedraw/dist/leaflet-freedraw.web.js"], function(FreeDraw) { 
+	define("leaflet/plugins/markercluster", [path + "leaflet.markercluster/dist/leaflet.markercluster-src"], defined);
+	define("leaflet/plugins/history", [path + "leaflet-history/dist/leaflet-history-src"], defined);	
+	// define("leaflet/plugins/prunecluster", [path + "PruneCluster/dist/PruneCluster"], defined);	
+	define("leaflet/plugins/search", [path + "leaflet-search/dist/leaflet-search.src"], defined);
+	define("leaflet/plugins/home", [path + "leaflet.zoomhome/dist/leaflet.zoomhome"], defined);
+	define("leaflet/plugins/freedraw", [path + "leaflet-freedraw/dist/leaflet-freedraw.web"], function(FreeDraw) { 
 		return FreeDraw; });
@@ -104,6 +110,2 @@
 
-	// define("leaflet/plugins/wicket", [path + "Wicket/wicket-leaflet"
-	// ], function() {
-	// 	return wicket;
-	// });	
 	L.getRandomLatLng = function getRandomLatLng(map) {
@@ -123,13 +125,1 @@ var bounds = map.getBounds(),
 });
-/* 
-	<link rel="stylesheet" href="../lib/veldoffice.nl/node_modules/leaflet/dist/leaflet.css">
-	<link rel="stylesheet" href="../lib/veldoffice.nl/bower_components/leaflet.locatecontrol/dist/L.Control.Locate.css">
-	<link rel="stylesheet" href="../lib/veldoffice.nl/bower_components/Leaflet.awesome-markers/dist/leaflet.awesome-markers.css">
-	<link rel="stylesheet" href="../lib/veldoffice.nl/bower_components/leaflet.markercluster/dist/MarkerCluster.Default.css">
-	<link rel="stylesheet" href="../lib/veldoffice.nl/bower_components/leaflet.markercluster/dist/MarkerCluster.css">
-	<link rel="stylesheet" href="../lib/veldoffice.nl/bower_components/leaflet-history/dist/leaflet-history.css">
-	<script src="../lib/veldoffice.nl/bower_components/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
-	<script src="../lib/veldoffice.nl/bower_components/Leaflet.awesome-markers/dist/leaflet.awesome-markers.min.js"></script>
-	<script src="../lib/veldoffice.nl/bower_components/leaflet.markercluster/dist/leaflet.markercluster-src.js"></script>
-	<script src="../lib/veldoffice.nl/bower_components/leaflet-history/dist/leaflet-history-src.js"></script>
-*/	

src/leafletjs.com/wicket.js

@@ -1,2 +0,2 @@
-define(["./node_modules/leaflet/dist/leaflet-src", "./bower_components/Wicket/wicket"], function(L, wicket) {
+define(["leaflet", "./bower_components/Wicket/wicket"], function(L, wicket) {
 	
@@ -3,0 +3,0 @@ window.Wkt = wicket;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

750080

increased by0.38%

Number of package files

33

increased by6.45%

Lines of code

14692

increased by0.58%

No dependency changes