@supermapgis/iclient-ol 12.0.1-r → 12.1.2

package/control/ChangeTileVersion.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 

package/control/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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';
@@ -988,15 +988,6 @@ export class StyleUtils {
     }
   }
 
-  /**
-   * @function StyleUtils.stopCanvg
-   * @description 调用Canvg实例的stop();
-   */
-  static stopCanvg() {
-    this.canvgsV.forEach(v => v.stop());
-    this.canvgsV = [];
-  }
-
   /**
    * @function StyleUtils.getMarkerDefaultStyle 获取默认标注图层feature的样式
    * @param {string} featureType feature的类型

package/core/Util.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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';
@@ -15,6 +15,7 @@
  import Feature from 'ol/Feature';
  import Projection from 'ol/proj/Projection';
  import { get } from 'ol/proj';
+ import GeoJSON from 'ol/format/GeoJSON';
 
  /**
   * @name Util
@@ -67,16 +68,26 @@
 
    /**
     * @function Util.toSuperMapGeometry
-    * @description 将 GeoJSON 对象转为 SuperMap 几何图形。
-    * @param {GeoJSONObject} geoJSON - GeoJSON 对象。
+    * @description 将 GeoJSON 对象 或 OpenaLayers 几何对象要素对象转为 SuperMap 几何对象。
+    * @param {GeoJSONObject|ModuleGeometry} obj - GeoJSON 对象 或 OpenaLayers 几何对象要素对象。
     * @private
     */
-   toSuperMapGeometry(geoJSON) {
-     if (!geoJSON || !geoJSON.type) {
+   toSuperMapGeometry(obj) {
+     if (!obj) {
        return null;
      }
-     const result = new GeoJSONFormat().read(geoJSON, 'FeatureCollection');
-     return result && result[0].geometry;
+     let result = obj;
+     if (obj instanceof Geometry) {
+       result = new GeoJSON().writeGeometryObject(obj);
+     }
+     if (obj instanceof Feature) {
+       result = new GeoJSON().writeFeatureObject(obj);
+     }
+     if (GeoJSONFormat.isGeoJSON(result)) {
+       const newFeatures = new GeoJSONFormat().read(result, 'FeatureCollection');
+       return newFeatures && newFeatures[0].geometry;
+     }
+     return null;
    },
 
    /**

package/core/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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';