Merge branch 'dev' of github.com:MapGIS/WebClient-JavaScript into dev

Author: 潘卓然ParnDeedlit

src/openlayers/layer/tileMapLayer.js

@@ -215,19 +215,19 @@ Zondy.Source.TileLayerSource = TileLayerSource;
  * @param {String} [opt_options.ip = ''] 服务器ip地址，本地为“127.0.0.1”或“localhost”。
  * @param {String} [opt_options.port = ''] 服务器端口号，默认为6163
  * @param {String} [opt_options.domain = ''] 服务器域名，注意：传入ip、port和传入domain两种方式二选一，代理服务器不提供端口号时可采用传入domain的方式。例如：domain:`http://www.sgic.net.cn/CoCloud3`。
- * @param {ol.ProjectionLike} [opt_options.projection = ''] 必选项，瓦片地图投影信息，通过如下方法获得
+ * @param {ol.ProjectionLike} [opt_options.projection = ''] 可选项，瓦片地图投影信息，通过如下方法获得
  *          //projectionExtent为图层左下角到右上角坐标范围
  *          var projectionExtent = [114.12567815477894, 30.457571584721734, 114.47583026053915, 30.708389893334449];
  *          var projection = new ol.proj.Projection({
                 units: ol.proj.Units.DEGREES,
                 extent: projectionExtent
             });
- * @param {Boolean} [opt_options.isAutoConfig = 'true'] 可选项，是否自动配置，默认为true
+ * @param {Boolean} [opt_options.isAutoConfig = 'true'] 可选项，是否自动配置瓦片服务参数，默认为true，注意：该参数为true时调用GetMapInfoService，获取瓦片的范围、分辨率等参数，为false时需要手动添加这些参数，且参数列表中必须指定projection，否则瓦片无法正常显示
  * @param {Boolean} [opt_options.cache = 'false'] 可选项，瓦片地图是否为地图文档发布动态裁图方式，默认为false
  * @param {String} [opt_options.token = ''] 可选项，服务访问控制，如果在 MapGIS Server Manager 服务管理中开启token，须设置此项，其key值可在设置处获取。
  * @param {Number} [opt_options.maxResolution = ''] 可选项，最大分辨率
- * @param {Number} [opt_options.minZoom = ''] 可选项，最小分辨率
- * @param {Number} [opt_options.maxZoom = ''] 可选项，最大分辨率
+ * @param {Number} [opt_options.minZoom = ''] 可选项，最小缩放级别
+ * @param {Number} [opt_options.maxZoom = ''] 可选项，最大缩放级别
  * @param {String} [opt_options.tileOriginType = 'leftTop'] 可选项，瓦片裁剪方式，是左上还是左下的方式，即是新瓦片裁剪的方式还是旧瓦片。一般无需设置此参数，直接由原点和中心点进行判断，只有在某些特殊的裁剪的瓦片中需要用到。例如若裁剪瓦片时以左下角为原点，方式却是新瓦片的方式则需要设置此参数为leftTop。
  * @param {Number} [opt_options.tileSize = '256'] 可选项，地图图片大小
  * @example1

src/service/ArcGis/Circle.js

@@ -0,0 +1,38 @@
+import {
+    Zondy, extend
+} from "../common";
+import {ArcGisGeometry} from "./Geometry";
+import * as T from '@turf/turf'
+import * as H from '@turf/helpers'
+
+/**
+ * @class module:ArcGis.ArcGisCircle
+ * @description ArcGis服务
+ * @author 基础平台-杨琨
+ * @param options - {Object} 必选项，构造圆对象参数。
+ * @param {String} [options.center] 可选项。圆的中心点坐标，默认[0, 0]。
+ * @param {String} [options.radius] 可选项。圆的半径，默认1000。
+ * @param {String} [options.radiusUnit] 可选项。圆的半径单位，默认米，可选值["feet"|"kilometers"|"meters"|"miles"|"nautical-miles"|"yards"]。
+ * @param {String} [options.numberOfPoints] 可选项。构成圆弧的插值数量，默认60。
+ * @param {String} [options.geodesic] 可选项。启用自定义坐标系，默认false。
+ * @param {ArcGisSpatialReference} [options.spatialReference] 可选项。多边形的空间坐标系，默认4326。
+ */
+class ArcGisCircle extends ArcGisGeometry{
+    constructor(options) {
+        super(options);
+        this.center = [0, 0];
+        this.radius = 1000;
+        this.radiusUnit = "meters";
+        this.numberOfPoints = 60;
+        this.geodesic = false;
+        this.type = "circle";
+
+        extend(this,options);
+        let opts = {steps: this.numberOfPoints, units: this.radiusUnit};
+        let circle = T.circle(this.center, this.radius, opts);
+        this.rings = circle.geometry.coordinates;
+    }
+}
+
+export {ArcGisCircle};
+Zondy.Service.ArcGisCircle = ArcGisCircle;

src/service/ArcGis/QueryTask.js

@@ -1,19 +1,25 @@
-import {Zondy} from '../common/Base';
+import {Zondy} from '../common';
 import {
-    getPromise,getPromiseP,formatQuery,formatEdits,extend
+    formatQuery,extend
 } from '../common';
+import {ArcGisServiceBase} from "./ServiceBase";
 
 class ArcGisQueryTask {
     constructor(options) {
-        this.options = {
-            url: null,
-            gdbVersion: null
-        }
-        extend(this.options,options);
+        this.url = null;
+        this.gdbVersion = null;
+        extend(this,options);
     }
 }
 
-ArcGisQueryTask.prototype.execute = function (query, requestOptions) {}
+ArcGisQueryTask.prototype.execute = function () {}
+ArcGisQueryTask.prototype.queryByLayer = function (layerId, queryParams) {
+    queryParams.outFields = queryParams.outFields || "*";
+    let url = this.url + "/" + layerId + "/query?f=json";
+    let service = new ArcGisServiceBase();
+    url = formatQuery(queryParams,url,["geometry"],null);
+    return service.getPromise(url);
+}
 ArcGisQueryTask.prototype.executeAttachmentQuery = function () {}
 ArcGisQueryTask.prototype.executeForCount = function () {}
 ArcGisQueryTask.prototype.executeForExtent = function () {}

src/service/ArcGis/index.js

@@ -16,6 +16,7 @@ import { ArcGisMultipoint } from './Multipoint';
 import { ArcGisPolyline } from './Polyline';
 import { ArcGisGraphic } from './Graphic';
 import { ArcGisExtent } from './Extent';
+import {ArcGisCircle} from "./Circle";
 
 export {
     ArcGisFeatureLayer,
@@ -30,6 +31,7 @@ export {
     ArcGisMultipoint,
     ArcGisPolyline,
     ArcGisPolygon,
+    ArcGisCircle,
     ArcGisGraphic,
     ArcGisExtent
 };
@@ -47,6 +49,7 @@ const ArcGis = {
     ArcGisMultipoint,
     ArcGisPolyline,
     ArcGisPolygon,
+    ArcGisCircle,
     ArcGisGraphic,
     ArcGisExtent
 };

src/service/common/Util.js

@@ -1057,11 +1057,17 @@ var formatQuery = function (query,url,paramArr,formatObj) {
                     if(param.type === "polyline"){
                         geometry["paths"] = query[key]["paths"];
                     }
+                    if(param.type === "circle"){
+                        param.type = "polygon";
+                        geometry["rings"] = query[key]["rings"];
+                    }
                     geometry["spatialReference"] = query[key]["spatialReference"];
                     param = geometry;
                     url += "&geometryType=esriGeometry" + query[key]["type"].charAt(0).toUpperCase() + query[key]["type"].slice(1);
+                    param = encodeURI(JSON.stringify(param));
+                }else {
+                    param = JSON.stringify(param);
                 }
-                param = JSON.stringify(param);
             }
             if(formatObj && formatObj.hasOwnProperty(key)){
                 keyStr = formatObj[key];