@supermapgis/iclient-ol 11.2.1 → 12.0.0-r

package/control/ChangeTileVersion.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { MapService } from '../services/MapService';

package/control/Logo.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import {LogoBase64} from '@supermapgis/iclient-common/control/img/Logo';

package/control/ScaleLine.js

@@ -1,10 +1,9 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 
 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(

package/control/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 export {ChangeTileVersion} from './ChangeTileVersion';

package/core/MapExtend.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import olMap from 'ol/Map';

package/core/StyleUtils.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { Util as CommonUtil, DOTS_PER_INCH, INCHES_PER_UNIT } from '@supermapgis/iclient-common/commontypes/Util';
@@ -6,7 +6,7 @@ import { StringExt } from '@supermapgis/iclient-common/commontypes/BaseTypes';
 import { StyleMap } from '../overlay/vectortile/StyleMap';
 import { DeafultCanvasStyle } from '../overlay/vectortile/DeafultCanvasStyle';
 import { Util } from '../core/Util';
-import Canvg from 'canvg';
+import { Canvg } from 'canvg';
 import Style from 'ol/style/Style';
 import Icon from 'ol/style/Icon';
 import CircleStyle from 'ol/style/Circle';
@@ -966,7 +966,7 @@ export class StyleUtils {
    */
   static async getCanvasFromSVG(svgUrl, divDom, callBack) {
     //一个图层对应一个canvas
-    const canvgs = window.canvg && window.canvg.default ? window.canvg.default : Canvg;
+    const canvgs = Canvg;
     let canvas = document.createElement('canvas');
     canvas.id = 'dataviz-canvas-' + Util.newGuid(8);
     canvas.style.display = "none";

package/core/Util.js

@@ -1,9 +1,11 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
  import { Bounds } from '@supermapgis/iclient-common/commontypes/Bounds';
  import { GeoJSON as GeoJSONFormat } from '@supermapgis/iclient-common/format/GeoJSON';
  import { getMeterPerMapUnit, scalesToResolutions, getZoomByResolution, getDpi } from '@supermapgis/iclient-common/util/MapCalculateUtil';
+ import { isString, isArray } from '@supermapgis/iclient-common/util/BaseUtil';
+ import { isMatchAdministrativeName } from '@supermapgis/iclient-common/mapping/utils/util';
  import * as olUtil from 'ol/util';
  import Geometry from 'ol/geom/Geometry';
  import { getVectorContext } from 'ol/render';
@@ -74,7 +76,7 @@
        return null;
      }
      const result = new GeoJSONFormat().read(geoJSON, 'FeatureCollection');
-     return result[0].geometry;
+     return result && result[0].geometry;
    },
 
    /**
@@ -464,12 +466,6 @@
   }
  }
 
-function isString(str) {
-  return typeof str === 'string' && str.constructor === String;
-}
-function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
-}
  function unsetMask(layers) {
    const todoLayers = Array.isArray(layers) ? layers : [layers];
    for (let index = 0; index < todoLayers.length; index++) {
@@ -486,15 +482,3 @@ function isArray(obj) {
      layer.changed();
    }
  }
-
- function isMatchAdministrativeName(featureName, fieldName) {
-   if (isString(fieldName)) {
-     let shortName = featureName.substr(0, 2);
-     // 张家口市和张家界市 特殊处理
-     if (shortName === '张家') {
-       shortName = featureName.substr(0, 3);
-     }
-     return !!fieldName.match(new RegExp(shortName));
-   }
-   return false;
- }

package/core/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 export {StyleUtils} from './StyleUtils';

package/css/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import './ChangeTileVersion.css';