Merge pull request #7012 from vvlladd28/improvement/leaflet/update/1.8.0

[3.4.1] UI: Updated leaflet version to 1.8

ui-ngx/package.json

@@ -29,7 +29,7 @@
     "@date-io/date-fns": "^2.11.0",
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "~0.4.6",
-    "@geoman-io/leaflet-geoman-free": "~2.11.4",
+    "@geoman-io/leaflet-geoman-free": "^2.13.0",
     "@juggle/resize-observer": "^3.3.1",
     "@mat-datetimepicker/core": "~7.0.1",
     "@material-ui/core": "4.12.3",
@@ -58,10 +58,10 @@
     "jstree": "^3.3.12",
     "jstree-bootstrap-theme": "^1.0.1",
     "jszip": "^3.7.1",
-    "leaflet": "~1.7.1",
+    "leaflet": "~1.8.0",
     "leaflet-polylinedecorator": "^1.6.0",
     "leaflet-providers": "^1.13.0",
-    "leaflet.gridlayer.googlemutant": "^0.13.4",
+    "leaflet.gridlayer.googlemutant": "^0.13.5",
     "leaflet.markercluster": "^1.5.3",
     "libphonenumber-js": "^1.10.4",
     "messageformat": "^2.3.0",
@@ -115,11 +115,11 @@
     "@types/jquery": "^3.5.9",
     "@types/js-beautify": "^1.13.3",
     "@types/jstree": "^3.3.41",
-    "@types/leaflet": "^1.7.6",
+    "@types/leaflet": "^1.7.11",
     "@types/leaflet-polylinedecorator": "^1.6.1",
     "@types/leaflet-providers": "^1.2.1",
     "@types/leaflet.gridlayer.googlemutant": "^0.4.6",
-    "@types/leaflet.markercluster": "^1.4.6",
+    "@types/leaflet.markercluster": "^1.5.1",
     "@types/lodash": "^4.14.177",
     "@types/moment-timezone": "^0.5.30",
     "@types/mousetrap": "^1.6.0",

ui-ngx/patches/leaflet+1.7.1.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/leaflet/dist/leaflet-src.js b/node_modules/leaflet/dist/leaflet-src.js
-index 9acc7da..6c9acf8 100644
---- a/node_modules/leaflet/dist/leaflet-src.js
-+++ b/node_modules/leaflet/dist/leaflet-src.js
-@@ -2050,6 +2050,8 @@
-   		obj.removeEventListener(POINTER_CANCEL, handler, false);
-   	}
- 
-+    delete obj['_leaflet_' + type + id];
-+
-   	return this;
-   }
- 

ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts

@@ -38,8 +38,7 @@ export class GoogleMap extends LeafletMap {
       const map = L.map($container, {
         attributionControl: false,
         doubleClickZoom: !this.options.disableDoubleClickZooming,
-        zoomControl: !this.options.disableZoomControl,
+        zoomControl: !this.options.disableZoomControl
-        tap: L.Browser.safari && L.Browser.mobile
       }).setView(options?.parsedDefaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL);
       (L.gridLayer as any).googleMutant({
         type: options?.gmDefaultMapType || 'roadmap'

ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/here-map.ts

@@ -23,7 +23,6 @@ export class HEREMap extends LeafletMap {
     constructor(ctx: WidgetContext, $container, options: WidgetUnitedMapSettings) {
         super(ctx, $container, options);
         const map = L.map($container, {
-          tap: L.Browser.safari && L.Browser.mobile,
           doubleClickZoom: !this.options.disableDoubleClickZooming,
           zoomControl: !this.options.disableZoomControl
         }).setView(options?.parsedDefaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL);

ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts

@@ -242,8 +242,7 @@ export class ImageMap extends LeafletMap {
           zoomControl: !this.options.disableZoomControl,
           zoom: 1,
           crs: L.CRS.Simple,
-          attributionControl: false,
+          attributionControl: false
-          tap: L.Browser.safari && L.Browser.mobile
         });
         this.updateBounds(updateImage);
       }

ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts

@@ -24,8 +24,7 @@ export class OpenStreetMap extends LeafletMap {
         super(ctx, $container, options);
         const map =  L.map($container, {
           doubleClickZoom: !this.options.disableDoubleClickZooming,
-          zoomControl: !this.options.disableZoomControl,
+          zoomControl: !this.options.disableZoomControl
-          tap: L.Browser.safari && L.Browser.mobile
         }).setView(options?.parsedDefaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL);
         let tileLayer;
         if (options.useCustomProvider) {

ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/tencent-map.ts

@@ -26,8 +26,7 @@ export class TencentMap extends LeafletMap {
     const txUrl = 'http://rt{s}.map.gtimg.com/realtimerender?z={z}&x={x}&y={y}&type=vector&style=0';
     const map = L.map($container, {
       doubleClickZoom: !this.options.disableDoubleClickZooming,
-      zoomControl: !this.options.disableZoomControl,
+      zoomControl: !this.options.disableZoomControl
-      tap: L.Browser.safari && L.Browser.mobile
     }).setView(options?.parsedDefaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL);
     const txLayer = L.tileLayer(txUrl, {
       subdomains: '0123',

ui-ngx/yarn.lock

@@ -1322,10 +1322,10 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@geoman-io/leaflet-geoman-free@~2.11.4":
+"@geoman-io/leaflet-geoman-free@^2.13.0":
-  version "2.11.4"
+  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.11.4.tgz#4a43fa8d3d5d2bca751135b775c19c6cc0063699"
+  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.13.0.tgz#df0834485d5852419d9c51014ff4589b1fdf0197"
-  integrity sha512-uWfgaGDhrtoCMHdHi2oNVKb8WXFMQvyNnan1sS/+Yn5jMPuhijWFyAjy0G5kTCamXhGXg4vUvlEpiRSrBwewKg==
+  integrity sha512-8uVVcRSAgZLQPfaEIAGitZEoG1v++tmPJlJYVCbGx7FbJYP9jmErsamECO0dz4eMkWLusIaEDgADY9WzAapcEQ==
   dependencies:
     "@turf/boolean-contains" "^6.5.0"
     "@turf/kinks" "^6.5.0"
@@ -1974,14 +1974,14 @@
   dependencies:
     "@types/leaflet" "*"
 
-"@types/leaflet.markercluster@^1.4.6":
+"@types/leaflet.markercluster@^1.5.1":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz#d039ada408a30bda733b19a24cba89b81f0ace4b"
   integrity sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==
   dependencies:
     "@types/leaflet" "*"
 
-"@types/leaflet@*", "@types/leaflet@^1.7.6":
+"@types/leaflet@*", "@types/leaflet@^1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.7.11.tgz#48b33b7a15b015bbb1e8950399298a112c3220c8"
   integrity sha512-VwAYom2pfIAf/pLj1VR5aLltd4tOtHyvfaJlNYCoejzP2nu52PrMi1ehsLRMUS+bgafmIIKBV1cMfKeS+uJ0Vg==
@@ -6134,7 +6134,7 @@ leaflet-rotatedmarker@^0.2.0:
   resolved "https://registry.yarnpkg.com/leaflet-rotatedmarker/-/leaflet-rotatedmarker-0.2.0.tgz#4467f49f98d1bfd56959bd9c6705203dd2601277"
   integrity sha512-yc97gxLXwbZa+Gk9VCcqI0CkvIBC9oNTTjFsHqq4EQvANrvaboib4UdeQLyTnEqDpaXHCqzwwVIDHtvz2mUiDg==
 
-leaflet.gridlayer.googlemutant@^0.13.4:
+leaflet.gridlayer.googlemutant@^0.13.5:
   version "0.13.5"
   resolved "https://registry.yarnpkg.com/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.13.5.tgz#7182c26f479e726bff8b85a7ebf9d3f44dd3ea57"
   integrity sha512-DHUEXpo1t0WZ9tpdLUHHkrTK7LldCXr/gqkV5E/4hHidDJB2srceLLCZj4PV/pl0jPdTkVBT+Lr8nL9EZDB5hw==
@@ -6144,10 +6144,10 @@ leaflet.markercluster@^1.5.3:
   resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz#9cdb52a4eab92671832e1ef9899669e80efc4056"
   integrity sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==
 
-leaflet@~1.7.1:
+leaflet@~1.8.0:
-  version "1.7.1"
+  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e"
-  integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
+  integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==
 
 less-loader@10.0.1:
   version "10.0.1"