@supermapgis/iclient-ol 12.0.1-r → 12.1.2

package/services/ServiceBase.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 Observable from 'ol/Observable';
@@ -7,20 +7,26 @@ import Observable from 'ol/Observable';
  * @class ServiceBase
  * @category iServer Core
  * @classdesc ol.supermap 的服务基类。
- * @param {string} url - 服务地址。
+ * @param {string} url - 服务地址。具体地址类型由子类决定。
  * @param {Object} options - 参数。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @extends {ol.Observable}
  * @usage
  */
 export class ServiceBase extends Observable {
-    constructor(url, options) {
-        super(url, options);
-        this.options = options || {};
+    constructor(url, dataUrl, options) {
+        super(url, dataUrl, options);
         this.url = url;
+
+        if (typeof dataUrl === 'object') {
+          this.options = dataUrl || {};
+        } else {
+          this.dataUrl = dataUrl;
+          this.options = options || {};
+        }
         this.dispatchEvent({type: 'initialized', value: this});
     }
 }

package/services/SpatialAnalystService.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} from '../core/Util';
@@ -7,7 +7,6 @@ import { Point as GeometryPoint } from '@supermapgis/iclient-common/commontypes/
 import { SpatialAnalystService as CommonSpatialAnalystService } from '@supermapgis/iclient-common/iServer/SpatialAnalystService';
 import {ServiceBase} from './ServiceBase';
 import LineString from 'ol/geom/LineString';
-import GeoJSON from 'ol/format/GeoJSON';
 
 /**
  * @class SpatialAnalystService
@@ -21,10 +20,10 @@ import GeoJSON from 'ol/format/GeoJSON';
  *      new SpatialAnalystService(url).bufferAnalysis(params,function(result){
  *          //doSomething
  *      })
- * @param {string} url - 服务地址。
+ * @param {string} url - 空间分析服务地址，如 http://{ip}:{port}/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst 。
  * @param {Object} options - 参数。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @usage
@@ -457,10 +456,6 @@ export class SpatialAnalystService extends ServiceBase {
      */
 
     convertGeometry(ol3Geometry) {
-        //判断是否传入的是geojson 并作相应处理
-        if(["FeatureCollection", "Feature", "Geometry"].indexOf(ol3Geometry.type) != -1){
-            return Util.toSuperMapGeometry(ol3Geometry);
-        }
-        return Util.toSuperMapGeometry(JSON.parse((new GeoJSON()).writeGeometry(ol3Geometry)));
+        return Util.toSuperMapGeometry(ol3Geometry);
     }
 }

package/services/ThemeService.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 {ServiceBase} from './ServiceBase';
@@ -7,7 +7,8 @@ import { ThemeService as CommonThemeService } from '@supermapgis/iclient-common/
 /**
  * @class ThemeService
  * @category  iServer Map Theme
- * @classdesc 专题图服务类。地图学中将突出而深入地表示一种或几种要素或现象，即集中表示一个主题内容的地图称为专题地图。在 SuperMap 中，专题图是地图图层的符号化显示，即用各种图形渲染风格（大小，颜色，线型，填充等）来图形化地表现专题要素的某方面特征。该类可用于获取专题图的信息。
+ * @classdesc 专题图服务类。该类可用于获取专题图的信息。<br>
+ * 地图学中将突出而深入地表示一种或几种要素或现象，即集中表示一个主题内容的地图称为专题地图。在 SuperMap 中，专题图是地图图层的符号化显示，即用各种图形渲染风格（大小，颜色，线型，填充等）来图形化地表现专题要素的某方面特征。
  * @modulecategory Services
  * @extends {ServiceBase}
  * @example
@@ -16,10 +17,10 @@ import { ThemeService as CommonThemeService } from '@supermapgis/iclient-common/
  *      }).getThemeInfo(params,function(result){
  *           //doSomething
  *      });
- * @param {string} url - 服务地址。
+ * @param {string} url - 地图服务地址。如 http://{ip}:{port}/iserver/services/map-world/rest/maps/World
  * @param {Object} options - 参数。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @usage

package/services/TrafficTransferAnalystService.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} from '../core/Util';
@@ -18,10 +18,10 @@ import Point from 'ol/geom/Point';
  *      new TrafficTransferAnalystService(url).queryStop(params,function(result){
  *           //doSomething
  *      })
- * @param {string} url - 服务地址。
+ * @param {string} url - 交通换乘分析服务地址，如 http://{ip}:{port}/iserver/services/traffictransferanalyst-sample/restjsr/traffictransferanalyst/Traffic-Changchun 。
  * @param {Object} options - 参数。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @usage

package/services/WebPrintingJobService.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 { ServiceBase } from './ServiceBase';
@@ -14,10 +14,10 @@ import Point from 'ol/geom/Point';
  *            提供方法：创建 Web 打印任务，获取 Web 打印任务内容，获取 Web 打印输出文档流，获取 Web 打印服务的布局模板信息等。
  * @modulecategory Services
  * @extends {ServiceBase}
- * @param {string} url - 服务地址。请求打印地图服务的 URL 应为：http://{服务器地址}:{服务端口号}/iserver/services/webprinting/rest/webprinting/v1。
+ * @param {string} url - Web 打印服务地址。请求打印地图服务的 URL 应为：http://{服务器地址}:{服务端口号}/iserver/services/webprinting/rest/webprinting/v1。
  * @param {Object} options - 服务交互时所需的可选参数。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @example

package/services/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 {AddressMatchService} from './AddressMatchService';