Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: songyumeng

src/common/package.json

@@ -19,6 +19,7 @@
     "@supermapgis/tile-decryptor": "^1.0.0",
     "@turf/center": "^6.5.0",
     "@turf/meta": "^6.5.0",
+    "canvg": "3.0.10",
     "echarts": "5.5.0",
     "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",
@@ -38,6 +39,7 @@
     "rbush": "^2.0.2",
     "urijs": "^1.19.11",
     "flv.js": "^1.6.2",
+    "three": "0.150.1",
     "video.js": "^7.10.2",
     "videojs-flvjs-es6": "^1.0.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"

src/leaflet/package.json

@@ -24,6 +24,7 @@
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",
     "flatgeobuf": "3.31.1",
+    "proj4": "2.11.0",
     "rbush": "^2.0.2"
   }
 }

src/mapboxgl/package.json

@@ -16,18 +16,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@mapbox/mapbox-gl-style-spec": "^14.3.0",
-    "@turf/center": "^6.5.0",
     "@turf/turf": "6.5.0",
+    "@turf/meta": "^6.5.0",
     "mapv": "2.0.62",
     "mapbox-gl": "1.13.2",
-    "three": "0.150.1",
     "@supermapgis/iclient-common": "11.3.0",
-    "canvg": "3.0.10",
-    "flatgeobuf": "3.31.1",
-    "rbush": "^2.0.2",
-    "proj4": "2.11.0",
-    "flv.js": "^1.6.2",
-    "video.js": "^7.10.2",
-    "videojs-flvjs-es6": "^1.0.1"
+    "lodash.clonedeep": "^4.5.0",
+    "proj4": "2.11.0"
   }
 }

src/maplibregl/core/MapExtend.js

@@ -10,9 +10,14 @@ import { createMapExtendExtending } from '@supermapgis/iclient-common/util/MapEx
   * @private
   */
  export var MapExtend = (function () {
+  const originMapProto = maplibregl.Map.prototype;
+
+  if (!originMapProto._inherit) {
     maplibregl.Map = class MapEnhance extends createMapExtendExtending(maplibregl) {
       constructor(options) {
         super(options);
       }
     }
+    maplibregl.Map.prototype._inherit = true;
+  }
 })();

src/maplibregl/package.json

@@ -17,10 +17,8 @@
   "dependencies": {
     "@maplibre/maplibre-gl-style-spec": "^20.3.0",
     "maplibre-gl": "4.3.2",
-    "mapv": "2.0.62",
-    "three": "0.150.1",
-    "canvg": "3.0.10",
     "@supermapgis/iclient-common": "11.3.0",
-    "rbush": "^2.0.2"
+    "lodash.clonedeep": "^4.5.0",
+    "proj4": "2.11.0"
   }
 }

src/openlayers/package.json

@@ -21,9 +21,10 @@
     "mapv": "2.0.62",
     "ol": "7.5.2",
     "canvg": "3.0.10",
+    "lodash.clonedeep": "^4.5.0",
     "lodash.remove": "^4.7.0",
     "lodash.difference": "^4.5.0",
     "flatgeobuf": "3.31.1",
-    "rbush": "^2.0.2"
+    "proj4": "2.11.0"
   }
 }