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

songyumeng · songyumeng · commit 35c35d96f2a5 · 2024-11-29T08:57:24.000+08:00
diff --git a/examples/leaflet/multiphaseplay.html b/examples/leaflet/multiphaseplay.html
@@ -116,7 +116,7 @@
     }
 
     function addTimeLine() {
-      var allTime = allFeatures.map(feature => feature.time.split('/')[0]);
+      var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];
       myChart = echarts.init(document.getElementById('timeline'));
       var option = {
         timeline: {
@@ -149,8 +149,8 @@
       myChart.on('timelinechanged', function (params) {
         var url = wmsUrlCache[params.currentIndex];
         layer.setUrl(url);
-        changeTimelinePlay(false);
         layer.once("load", changeTimelinePlay);
+        changeTimelinePlay(false);
       });
     }
 
diff --git a/examples/mapboxgl/multiphaseplay.html b/examples/mapboxgl/multiphaseplay.html
@@ -122,8 +122,15 @@
     }
 
     function start() {
+      map.on('sourcedata', onSourceData);
       addStaticImageLayer();
-      map.on('load', addTimeLine);
+    }
+
+    function onSourceData(e) {
+      if (e.sourceId === 'static-image-layer' && e.isSourceLoaded) {
+        map.off('sourcedata', onSourceData);
+        addTimeLine();
+      }
     }
 
     function addStaticImageLayer() {
@@ -142,7 +149,7 @@
     }
 
     function addTimeLine() {
-      var allTime = allFeatures.map(feature => feature.time.split('/')[0]);
+      var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];
       myChart = echarts.init(document.getElementById('timeline'));
       var option = {
         timeline: {
@@ -177,8 +184,8 @@
         map.getSource('static-image-layer').updateImage({
           url: url
         });
-        changeTimelinePlay(false);
         map.once('idle', changeTimelinePlay);
+        changeTimelinePlay(false);
       });
     }
 
diff --git a/examples/maplibregl/multiphaseplay.html b/examples/maplibregl/multiphaseplay.html
@@ -122,8 +122,15 @@
     }
 
     function start() {
+      map.on('sourcedata', onSourceData); 
       addStaticImageLayer();
-      map.on('load', addTimeLine)
+    }
+
+    function onSourceData(e) {
+      if (e.sourceId === 'static-image-layer' && e.isSourceLoaded) {
+        map.off('sourcedata', onSourceData);
+        addTimeLine();
+      }
     }
 
     function addStaticImageLayer() {
@@ -177,8 +184,8 @@
         map.getSource('static-image-layer').updateImage({
           url: url
         });
-        changeTimelinePlay(false);
         map.once('idle', changeTimelinePlay);
+        changeTimelinePlay(false);
       });
     }
 
diff --git a/examples/openlayers/multiphaseplay.html b/examples/openlayers/multiphaseplay.html
@@ -135,7 +135,7 @@
     }
 
     function addTimeLine() {
-      var allTime = allFeatures.map(feature => feature.time.split('/')[0]);
+      var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];
       myChart = echarts.init(document.getElementById('timeline'));
       var option = {
         timeline: {
diff --git a/src/common/package.json b/src/common/package.json
@@ -17,13 +17,15 @@
     "@antv/g2": "^4.2.11",
     "@antv/g6": "^4.8.14",
     "@supermapgis/tile-decryptor": "^1.0.0",
+    "@turf/center": "^6.5.0",
     "@turf/meta": "^6.5.0",
     "echarts": "5.5.0",
     "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "flatgeobuf": "3.31.1",
     "insert-css": "^2.0.0",
+    "lodash.debounce": "^4.0.8",
     "promise-polyfill": "8.2.3",
     "lodash.topairs": "4.3.0",
     "lodash.uniqby": "^4.7.0",
diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -24,7 +24,6 @@
     "@supermapgis/iclient-common": "11.3.0",
     "canvg": "3.0.10",
     "flatgeobuf": "3.31.1",
-    "lodash.debounce": "^4.0.8",
     "rbush": "^2.0.2",
     "proj4": "2.11.0",
     "flv.js": "^1.6.2",
diff --git a/src/maplibregl/L7Layerfunc.js b/src/maplibregl/L7Layerfunc.js
diff --git a/test/mapboxgl/mapping/WebMapV2Spec.js b/test/mapboxgl/mapping/WebMapV2Spec.js
@@ -1414,11 +1414,14 @@ describe('mapboxgl_WebMapV2', () => {
     datavizWebmap.on('mapcreatesucceeded', callback);
   });
 
-  it('updateOverlayLayer featureProjection', (done) => {
+  xit('updateOverlayLayer featureProjection', (done) => {
     spyOn(FetchRequest, 'get').and.callFake((url) => {
       if (url.indexOf('portal.json') > -1) {
         return Promise.resolve(new Response(JSON.stringify(iportal_serviceProxy)));
       } else if (url.indexOf('1788054202/map.json') > -1) {
+        uniqueLayer_polygon.layers.map(item => {
+          item.projection='EPSG:3857'
+        })
         return Promise.resolve(new Response(JSON.stringify(uniqueLayer_polygon)));
       } else if (url.indexOf('datas/1960447494/content.json') > -1) {
         return Promise.resolve(new Response(layerData_CSV));
@@ -1434,7 +1437,7 @@ describe('mapboxgl_WebMapV2', () => {
         { id: uniqueLayer_polygon.layers[0].name, projection: 'EPSG:3857' },
         {
           type: 'FeatureCollection',
-          features: [{ type: 'Feature', geometry: { type: 'Point', coordinates: [110, 10] } }]
+          features: [{ type: 'Feature', geometry: { type: 'Point', coordinates: [110, 10] }, properties: {} }]
         },
         '',
         'EPSG:4326'

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`function addTimeLine() {`
`138`		`- var allTime = allFeatures.map(feature => feature.time.split('/')[0]);`
	`138`	`+ var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];`
`139`	`139`	`myChart = echarts.init(document.getElementById('timeline'));`
`140`	`140`	`var option = {`
`141`	`141`	`timeline: {`