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

songyumeng · songyumeng · commit b32f1e4da765 · 2024-12-01T19:58:56.000+08:00
diff --git a/src/common/package.json b/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"
diff --git a/src/leaflet/package.json b/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"
   }
 }
diff --git a/src/mapboxgl/package.json b/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"
   }
 }
diff --git a/src/maplibregl/core/MapExtend.js b/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;
+  }
 })();
diff --git a/src/maplibregl/package.json b/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"
   }
 }
diff --git a/src/openlayers/package.json b/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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`"jsonsql": "0.2.5",`
`25`	`25`	`"pbf": "3.2.1",`
`26`	`26`	`"flatgeobuf": "3.31.1",`
	`27`	`+ "proj4": "2.11.0",`
`27`	`28`	`"rbush": "^2.0.2"`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@`
`17`	`17`	`"dependencies": {`
`18`	`18`	`"@maplibre/maplibre-gl-style-spec": "^20.3.0",`
`19`	`19`	`"maplibre-gl": "4.3.2",`
`20`		`- "mapv": "2.0.62",`
`21`		`- "three": "0.150.1",`
`22`		`- "canvg": "3.0.10",`
`23`	`20`	`"@supermapgis/iclient-common": "11.3.0",`
`24`		`- "rbush": "^2.0.2"`
	`21`	`+ "lodash.clonedeep": "^4.5.0",`
	`22`	`+ "proj4": "2.11.0"`
`25`	`23`	`}`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@`
`21`	`21`	`"mapv": "2.0.62",`
`22`	`22`	`"ol": "7.5.2",`
`23`	`23`	`"canvg": "3.0.10",`
	`24`	`+ "lodash.clonedeep": "^4.5.0",`
`24`	`25`	`"lodash.remove": "^4.7.0",`
`25`	`26`	`"lodash.difference": "^4.5.0",`
`26`	`27`	`"flatgeobuf": "3.31.1",`
`27`		`- "rbush": "^2.0.2"`
	`28`	`+ "proj4": "2.11.0"`
`28`	`29`	`}`
`29`	`30`	`}`