[fix]ol 10.5.0

Author: luoxiao-supermap

dist/ol/include-ol.js

@@ -56,8 +56,8 @@
         var excludes = (targetScript.getAttribute('exclude') || '').split(',');
         // 在线
         if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(excludes, 'ol')) {
-            inputCSS(libsurl + '/openlayers/7.5.2/ol.min.css');
-            inputScript(libsurl + '/openlayers/7.5.2/ol.js');
+            inputCSS(libsurl + '/openlayers/10.5.0/ol.min.css');
+            inputScript(libsurl + '/openlayers//10.5.0/ol.js');
         }
         if (inArray(includes, 'ol@4.6.5')) {
             inputCSS(libsurl + '/openlayers/4.6.5/ol.css');
@@ -83,7 +83,7 @@
             inputScript(libsurl + '/proj4/2.17.0/proj4.min.js');
         }
         if (inArray(includes, 'ol3-echarts')) {
-            inputScript(libsurl + '/openlayers/ol3-echarts/4.0.1-1/ol-echarts.js');
+            inputScript(libsurl + '/openlayers/ol3-echarts/4.0.2/ol-echarts.min.js');
         }
         if (inArray(includes, 'ol3-echarts@1.3.6')) {
             inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');

package.json

@@ -167,7 +167,7 @@
     "maplibre-gl": "5.6.0",
     "mapv": "2.0.62",
     "node-forge": "^1.3.1",
-    "ol": "7.5.2",
+    "ol": "10.5.0",
     "pbf": "3.2.1",
     "proj4": "2.17.0",
     "promise-polyfill": "8.2.3",

src/openlayers/control/ScaleLine.js

@@ -4,7 +4,6 @@
 
 import Scale from 'ol/control/ScaleLine';
 import * as olProj from 'ol/proj';
-import AssertionError from 'ol/AssertionError';
 
 /**
  * @class ScaleLine
@@ -119,7 +118,7 @@ export class ScaleLine extends Scale {
                 pointResolution /= 1609.3472;
             }
         } else {
-            throw new AssertionError(33); // Invalid units
+          throw new Error('Invalid units');// Invalid units
         }
         var DIGITS = [1, 2, 5];
         let i = 3 * Math.floor(

src/openlayers/package.json

@@ -19,7 +19,7 @@
     "@supermapgis/tile-decryptor": "^1.0.0",
     "@turf/turf": "7.2.0",
     "mapv": "2.0.62",
-    "ol": "7.5.2",
+    "ol": "10.5.0",
     "canvg": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",
     "lodash.remove": "^4.7.0",

test/openlayers/control/ScaleLineSpec.js

@@ -88,4 +88,20 @@ describe('openlayers_ScaleLine', () => {
     expect(scaleControl.element.style.display).toBe('none');
     done();
   });
+
+  it('test updateElementRepair error', (done) => {
+    var scaleControl = new ScaleLine();
+    map.addControl(scaleControl);
+    map.once('postrender', () => {
+      setTimeout(() => {
+        try {
+          scaleControl.setUnits('error');
+          scaleControl.updateElementRepair();
+        } catch (error) {
+          expect(error.message).toBe('Invalid units');
+          done();
+        }
+      }, 100);
+    });
+  });
 });