【update】 ol 回退到 6.5.0; review by luox

xiongjiaojiao · xiongjiaojiao · commit 9958d33f345b · 2021-09-29T11:51:45.000+08:00
diff --git a/dist/ol/include-ol.js b/dist/ol/include-ol.js
@@ -54,8 +54,8 @@
         var excludes = (targetScript.getAttribute('exclude') || '').split(',');
         // 在线
         if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/css/ol.css');
-            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/build/ol.js');
+            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css');
+            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js');
         }
         if (inArray(includes, 'ol@4.6.5')) {
             inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');
diff --git a/dist/openlayers/include-openlayers.js b/dist/openlayers/include-openlayers.js
@@ -54,8 +54,8 @@
         var excludes = (targetScript.getAttribute('exclude') || '').split(',');
         // 在线
         if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/css/ol.css');
-            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/build/ol.js');
+            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css');
+            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js');
         }
         if (inArray(includes, 'ol@4.6.5')) {
             inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');
diff --git a/libs/openlayers/ol.css b/libs/openlayers/ol.css
diff --git a/libs/openlayers/ol.js b/libs/openlayers/ol.js
diff --git a/package.json b/package.json
@@ -127,7 +127,7 @@
     "lodash.topairs": "4.3.0",
     "mapbox-gl": "1.13.1",
     "mapv": "2.0.62",
-    "ol": "6.6.1",
+    "ol": "6.5.0",
     "pbf": "3.2.1",
     "proj4": "2.7.5",
     "promise-polyfill": "8.2.0",
diff --git a/src/openlayers/package.json b/src/openlayers/package.json
@@ -17,7 +17,7 @@
     "@turf/turf": "6.5.0",
     "echarts": "4.9.0",
     "mapv": "2.0.62",
-    "ol": "6.6.1",
+    "ol": "6.5.0",
     "@supermap/iclient-common": "10.2.0",
     "proj4": "2.7.5",
     "xlsx": "0.17.2",
diff --git a/test/openlayers/core/StyleUtilsSpec.js b/test/openlayers/core/StyleUtilsSpec.js
@@ -311,12 +311,12 @@ describe('openlayers_StyleUtils', () => {
                 expect(imageStyle.getImage()).not.toBeNull();
                 var size = imageStyle.getSize();
                 expect(size).not.toBeNull();
-                expect(size[0]).toBe(7);
-                expect(size[1]).toBe(7);
+                expect(size[0]).toBe(9);
+                expect(size[1]).toBe(9);
                 var anchor = imageStyle.getAnchor();
                 expect(anchor).not.toBeNull();
-                expect(anchor[0]).toBe(3.5);
-                expect(anchor[1]).toBe(3.5);
+                expect(anchor[0]).toBe(4.5);
+                expect(anchor[1]).toBe(4.5);
                 var stroke = imageStyle.getStroke();
                 expect(stroke).not.toBeNull();
                 expect(stroke.getColor()).toBe("#c33");
@@ -512,4 +512,4 @@ var requestFeature = (url) => {
             features = tileFormat.readFeatures(Util.toGeoJSON(features));
             return features;
         });
-}
+}
