1. leaflet map下添加两个查询服务 2.去掉leaflet地图和数据查询接口service后缀 review by caoxinke

zhurc · zhurc · commit b0baa4a7aacd · 2017-02-20T10:23:31.000+08:00
diff --git a/build/deps.js b/build/deps.js
@@ -87,6 +87,8 @@ var deps = {
                     "./src/Leaflet/SuperMap/iServer/TiledMapLayer.js",
                     "./src/Leaflet/SuperMap/iServer/MapService.js",
                     "./src/Leaflet/SuperMap/iServer/QueryService.js",
+                    "./src/Leaflet/SuperMap/iServer/ChartQueryService.js",
+                    "./src/Leaflet/SuperMap/iServer/TilesetsService.js",
                     "./src/Leaflet/SuperMap/iServer/GetLayersInfoService.js"
                 ]
             },
diff --git a/examples/leaflet/01_mapQueryByBounds.html b/examples/leaflet/01_mapQueryByBounds.html
@@ -22,7 +22,7 @@
         function query() {
             clearLayer();
             polygon.addTo(map);
-            L.supermap.queryService(url).queryByBoundsService({
+            L.supermap.queryService(url).queryByBounds({
                 filter: {name: "Capitals@World.1"},
                 bounds: polygon.getBounds()
             }).on("complete", function (serviceResult) {
diff --git a/examples/leaflet/01_mapQueryByDistance.html b/examples/leaflet/01_mapQueryByDistance.html
@@ -21,7 +21,7 @@
         }
         function query() {
             clearLayer();
-            L.supermap.queryService(url).queryByDistanceService({
+            L.supermap.queryService(url).queryByDistance({
                 filter: {name: "Capitals@World.1"},
                 distance: 30,
                 geometry: circleMarker
diff --git a/examples/leaflet/01_mapQueryByGeometry.html b/examples/leaflet/01_mapQueryByGeometry.html
@@ -22,7 +22,7 @@
         function query() {
             clearLayer();
             polygon.addTo(map);
-            L.supermap.queryService(url).queryByGeometryService({
+            L.supermap.queryService(url).queryByGeometry({
                 filter: {name: "Capitals@World.1"},
                 geometry: polygon
             }).on("complete", function (serviceResult) {
diff --git a/examples/leaflet/01_mapQueryBySQL.html b/examples/leaflet/01_mapQueryBySQL.html
@@ -20,7 +20,7 @@
         }
         function query() {
             clearLayer();
-            L.supermap.queryService(url).queryBySQLService({
+            L.supermap.queryService(url).queryBySQL({
                 filter: {
                     name: "Capitals@World.1",
                     attributeFilter: "SMID < 10"
diff --git a/examples/leaflet/02_getFeatureByBounds.html b/examples/leaflet/02_getFeatureByBounds.html
@@ -23,7 +23,7 @@
         function query() {
             clearLayer();
             polygon.addTo(map);
-            L.supermap.getFeaturesService(url).getFeaturesByBoundsService({
+            L.supermap.getFeaturesService(url).getFeaturesByBounds({
                 dataSetNames: ["World:Countries"],
                 bounds: polygon.getBounds(),
                 spatialQueryMode: "INTERSECT"
diff --git a/examples/leaflet/02_getFeatureByBuffer.html b/examples/leaflet/02_getFeatureByBuffer.html
@@ -23,7 +23,7 @@
         function query() {
             clearLayer();
             polygon.addTo(map);
-            L.supermap.getFeaturesService(url).getFeaturesByBufferService({
+            L.supermap.getFeaturesService(url).getFeaturesByBuffer({
                 dataSetNames: ["World:Capitals"],
                 bufferDistance: 10,
                 geometry: polygon
diff --git a/examples/leaflet/02_getFeatureByGeometry.html b/examples/leaflet/02_getFeatureByGeometry.html
@@ -23,7 +23,7 @@
         function query() {
             clearLayer();
             polygon.addTo(map);
-            L.supermap.getFeaturesService(url).getFeaturesByGeometryService({
+            L.supermap.getFeaturesService(url).getFeaturesByGeometry({
                 dataSetNames: ["World:Countries"],
                 geometry: polygon,
                 spatialQueryMode: "INTERSECT"
diff --git a/examples/leaflet/02_getFeatureByIDs.html b/examples/leaflet/02_getFeatureByIDs.html
@@ -22,7 +22,7 @@
         }
         function query() {
             clearLayer();
-            L.supermap.getFeaturesService(url).getFeaturesByIDsService({
+            L.supermap.getFeaturesService(url).getFeaturesByIDs({
                 IDs: [1, 247],
                 dataSetNames: ["World:Countries"]
             }).on("complete", function (serviceResult) {
diff --git a/examples/leaflet/02_getFeatureBySQL.html b/examples/leaflet/02_getFeatureBySQL.html
@@ -21,7 +21,7 @@
         }
         function query() {
             clearLayer();
-            L.supermap.getFeaturesService(url).getFeaturesBySQLService({
+            L.supermap.getFeaturesService(url).getFeaturesBySQL({
                 name: "Countries@World",
                 attributeFilter: "SMID = 1",
                 dataSetNames: ["World:Countries"]
diff --git a/src/Core/iServer/ChartQueryService.js b/src/Core/iServer/ChartQueryService.js
@@ -77,6 +77,7 @@ SuperMap.REST.ChartQueryService = SuperMap.Class(SuperMap.CoreServiceBase, {
             return;
         }
         end = me.url.substr(me.url.length - 1, 1);
+        me.format = (options.format) ? options.format : "geojson";
         me.format = me.format.toLowerCase();
         // TODO 待iServer featureResul资源GeoJSON表述bug修复当使用以下注释掉的逻辑
         // if (me.format==="geojson" && me.isInTheSameDomain) {
diff --git a/src/Core/iServer/GetFeaturesServiceBase.js b/src/Core/iServer/GetFeaturesServiceBase.js
@@ -82,6 +82,7 @@ SuperMap.REST.GetFeaturesServiceBase = SuperMap.Class(SuperMap.CoreServiceBase,
         }
         var me = this, end;
         end = me.url.substr(me.url.length - 1, 1);
+        me.format = (options.format) ? options.format : "geojson";
         me.format = me.format.toLowerCase();
         // TODO 待iServer featureResul资源GeoJSON表述bug修复当使用以下注释掉的逻辑
         // if (me.format==="geojson" && me.isInTheSameDomain) {
diff --git a/src/Leaflet/SuperMap/iServer/ChartQueryService.js b/src/Leaflet/SuperMap/iServer/ChartQueryService.js
@@ -0,0 +1,67 @@
+﻿/**
+ * Class:ChartQueryService
+ * 海图查询服务
+ * 用法：
+ *      L.superMap.chartQueryService(url).queryChart()
+ *      .on("complete",function(result){
+ *          //doSomething
+ *      }).on("failed",function(result){
+ *          //doSomething
+ *      });
+ */
+require('../../../Core/base');
+require('../../../Core/iServer/ChartQueryService');
+require('./ServiceBase');
+
+ChartQueryService = ServiceBase.extend({
+
+    initialize: function (url, options) {
+        ServiceBase.prototype.initialize.call(this, url, options);
+    },
+
+    /**
+     * @param params:
+     *      bounds,chartLayerNames,returnContent,startRecord,
+     *      queryMode("ChartAttributeQuery","ChartBoundsQuery"),
+     *      filter(isQueryPoint,isQueryLine,isQueryRegion,attributeFilter,chartFeatureInfoSpecCode)
+     */
+    queryChart: function (params) {
+        var me = this, param = me._processParams(params);
+        var chartQueryParameters = new SuperMap.REST.ChartQueryParameters(param);
+        var chartQueryService = new SuperMap.REST.ChartQueryService(me.options.url, {
+            eventListeners: {
+                scope: me,
+                processCompleted: me.processCompleted,
+                processFailed: me.processFailed
+            }
+        });
+
+        chartQueryService.processAsync(chartQueryParameters);
+        return me;
+    },
+    _processParams: function (params) {
+        if (!params) {
+            return {};
+        }
+        params.returnContent = (params.returnContent == null) ? true : params.returnContent;
+        //对外接口调用使用filter,内部参数使用chartQueryFilterParameters，跟iClient保持一致
+        if (params.filter) {
+            params.chartQueryFilterParameters = L.Util.isArray(params.filter) ? params.filter : [params.filter];
+        }
+
+        if (params.bounds && params.bounds instanceof L.LatLngBounds) {
+            params.bounds = new SuperMap.Bounds(
+                params.bounds.getSouthWest().lng,
+                params.bounds.getSouthWest().lat,
+                params.bounds.getNorthEast().lng,
+                params.bounds.getNorthEast().lat
+            );
+        }
+    }
+});
+
+L.supermap.chartQueryService = function (url, options) {
+    return new ChartQueryService(url, options);
+};
+
+module.exports = L.supermap.chartQueryService;
diff --git a/src/Leaflet/SuperMap/iServer/GetFeaturesService.js b/src/Leaflet/SuperMap/iServer/GetFeaturesService.js
@@ -3,7 +3,7 @@
  * 数据集查询类。
  * 提供：ID查询，范围查询，SQL查询，几何查询，bounds查询，缓冲区查询
  * 用法：
- *      L.superMap.getFeaturesService(url).getFeaturesByIDsService{
+ *      L.superMap.getFeaturesService(url).getFeaturesByIDs{
  *           dataSetNames:name,
  *           IDs:IDs
  *      }.on("complete",function(result){
@@ -32,7 +32,7 @@ GetFeaturesService = ServiceBase.extend({
      *      IDs,getFeatureMode,fields,
      *      dataSetNames,returnContent,fromIndex,toIndex,returnCountOnly,maxFeatures
      */
-    getFeaturesByIDsService: function (params) {
+    getFeaturesByIDs: function (params) {
         var me = this, param = me._processParams(params);
         var getFeaturesByIDsParameters = new SuperMap.REST.GetFeaturesByIDsParameters(param);
         var getFeaturesByIDsService = new SuperMap.REST.GetFeaturesByIDsService(me.options.url, {
@@ -52,7 +52,7 @@ GetFeaturesService = ServiceBase.extend({
      *      bounds,spatialQueryMode ,attributeFilter,getFeatureMode,fields,
      *      dataSetNames,returnContent,fromIndex,toIndex,returnCountOnly,maxFeatures
      */
-    getFeaturesByBoundsService: function (params) {
+    getFeaturesByBounds: function (params) {
         var me = this, param = me._processParams(params);
         var getFeaturesByBoundsParameters = new SuperMap.REST.GetFeaturesByBoundsParameters(param);
         var getFeaturesByBoundsService = new SuperMap.REST.GetFeaturesByBoundsService(me.options.url, {
@@ -71,7 +71,7 @@ GetFeaturesService = ServiceBase.extend({
      *      bufferDistance,attributeFilter,geometry,fields,
      *      dataSetNames,returnContent,fromIndex,toIndex,returnCountOnly,maxFeatures
      */
-    getFeaturesByBufferService: function (params) {
+    getFeaturesByBuffer: function (params) {
         var me = this, param = me._processParams(params);
         var getFeatureByBufferParameter = new SuperMap.REST.GetFeaturesByBufferParameters(param);
         var getFeatureService = new SuperMap.REST.GetFeaturesByBufferService(me.options.url, {
@@ -90,7 +90,7 @@ GetFeaturesService = ServiceBase.extend({
      *      getFeatureMode,queryParameter,
      *      dataSetNames,returnContent,fromIndex,toIndex,returnCountOnly,maxFeatures
      */
-    getFeaturesBySQLService: function (params) {
+    getFeaturesBySQL: function (params) {
         var me = this, param = me._processParams(params);
         param.queryParameter = new SuperMap.REST.FilterParameter(param);
         var getFeatureBySQLParams = new SuperMap.REST.GetFeaturesBySQLParameters(param);
diff --git a/src/Leaflet/SuperMap/iServer/QueryService.js b/src/Leaflet/SuperMap/iServer/QueryService.js
@@ -3,7 +3,7 @@
  * 地图查询服务类
  * 提供：范围查询，SQL查询，几何查询，距离查询
  * 用法：
- *      L.superMap.QueryService(url).queryByBoundsService{
+ *      L.superMap.QueryService(url).queryByBounds{
  *           filter:{name:name},
  *           bounds:bounds
  *      }.on("complete",function(result){
@@ -31,7 +31,7 @@ QueryService = ServiceBase.extend({
      *      bounds,returnContent,filter
      *      customParams,prjCoordSys,expectCount,networkType,queryOption,,startRecord,holdTime,returnCustomResult
      */
-    queryByBoundsService: function (params) {
+    queryByBounds: function (params) {
         var me = this, param = me._processParams(params);
         var queryByBoundsParams = new SuperMap.REST.QueryByBoundsParameters(param);
         var queryService = new SuperMap.REST.QueryByBoundsService(me.options.url, {
@@ -52,7 +52,7 @@ QueryService = ServiceBase.extend({
      *      distance,geometry,isNearest,returnContent,filter
      *      customParams,prjCoordSys,expectCount,networkType,queryOption,,startRecord,holdTime,returnCustomResult
      */
-    queryByDistanceService: function (params) {
+    queryByDistance: function (params) {
         var me = this, param = me._processParams(params);
         var queryByDistanceParams = new SuperMap.REST.QueryByDistanceParameters(param);
         var queryByDistanceService = new SuperMap.REST.QueryByDistanceService(me.options.url, {
@@ -73,7 +73,7 @@ QueryService = ServiceBase.extend({
      *      returnContent,filter
      *      customParams,prjCoordSys,expectCount,networkType,queryOption,,startRecord,holdTime,returnCustomResult
      */
-    queryBySQLService: function (params) {
+    queryBySQL: function (params) {
         var me = this, param = me._processParams(params);
         var queryBySQLParams = new SuperMap.REST.QueryBySQLParameters(param);
         var queryBySQLService = new SuperMap.REST.QueryBySQLService(me.options.url, {
@@ -94,10 +94,10 @@ QueryService = ServiceBase.extend({
      *      geometry,returnContent,spatialQueryMode,filter
      *      customParams,prjCoordSys,expectCount,networkType,queryOption,,startRecord,holdTime,returnCustomResult
      */
-    queryByGeometryService: function (params) {
+    queryByGeometry: function (params) {
         var me = this, param = me._processParams(params);
         var queryByGeometryParameters = new SuperMap.REST.QueryByGeometryParameters(param);
-        var queryByGeometryService = new SuperMap.REST.QueryByGeometryService(url, {
+        var queryByGeometryService = new SuperMap.REST.QueryByGeometryService(me.options.url, {
             eventListeners: {
                 scope: me,
                 processCompleted: me.processCompleted,
@@ -108,13 +108,17 @@ QueryService = ServiceBase.extend({
         queryByGeometryService.processAsync(queryByGeometryParameters);
         return me;
     },
+
     _processParams: function (params) {
         if (!params) {
             return {};
         }
         params.returnContent = (params.returnContent == null) ? true : params.returnContent;
         //对外接口调用使用filter,内部参数使用queryParams，跟iClient保持一致
-        params.queryParams = L.Util.isArray(params.filter) ? params.filter : [params.filter];
+        if (params.filter) {
+            params.queryParams = L.Util.isArray(params.filter) ? params.filter : [params.filter];
+        }
+
         if (params.bounds && params.bounds instanceof L.LatLngBounds) {
             params.bounds = new SuperMap.Bounds(
                 params.bounds.getSouthWest().lng,
@@ -123,6 +127,7 @@ QueryService = ServiceBase.extend({
                 params.bounds.getNorthEast().lat
             );
         }
+
         if (params.geometry) {
             if (params.geometry instanceof L.Point) {
                 params.geometry = new SuperMap.Geometry.Point(params.geometry.x, params.geometry.y);
diff --git a/src/Leaflet/SuperMap/iServer/TilesetsService.js b/src/Leaflet/SuperMap/iServer/TilesetsService.js
@@ -0,0 +1,40 @@
+﻿/**
+ * Class:TilesetsService
+ * 切片列表信息查询服务
+ * 用法：
+ *      L.superMap.tilesetsService(url).getTilesets()
+ *      .on("complete",function(result){
+ *          //doSomething
+ *      }).on("failed",function(result){
+ *          //doSomething
+ *      });
+ */
+require('../../../Core/iServer/TilesetsService');
+require('./ServiceBase');
+
+TilesetsService = ServiceBase.extend({
+
+    initialize: function (url, options) {
+        ServiceBase.prototype.initialize.call(this, url, options);
+    },
+
+    getTilesets: function () {
+        var me = this;
+        var tilesetsService = new SuperMap.REST.TilesetsService(me.options.url, {
+            eventListeners: {
+                scope: me,
+                processCompleted: me.processCompleted,
+                processFailed: me.processFailed
+            }
+        });
+
+        tilesetsService.processAsync();
+        return me;
+    }
+});
+
+L.supermap.tilesetsService = function (url, options) {
+    return new TilesetsService(url, options);
+};
+
+module.exports = L.supermap.tilesetsService;

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ var deps = {`
`87`	`87`	`"./src/Leaflet/SuperMap/iServer/TiledMapLayer.js",`
`88`	`88`	`"./src/Leaflet/SuperMap/iServer/MapService.js",`
`89`	`89`	`"./src/Leaflet/SuperMap/iServer/QueryService.js",`
	`90`	`+ "./src/Leaflet/SuperMap/iServer/ChartQueryService.js",`
	`91`	`+ "./src/Leaflet/SuperMap/iServer/TilesetsService.js",`
`90`	`92`	`"./src/Leaflet/SuperMap/iServer/GetLayersInfoService.js"`
`91`	`93`	`]`
`92`	`94`	`},`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`}`
`22`	`22`	`function query() {`
`23`	`23`	`clearLayer();`
`24`		`- L.supermap.queryService(url).queryByDistanceService({`
	`24`	`+ L.supermap.queryService(url).queryByDistance({`
`25`	`25`	`filter: {name: "Capitals@World.1"},`
`26`	`26`	`distance: 30,`
`27`	`27`	`geometry: circleMarker`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`function query() {`
`22`	`22`	`clearLayer();`
`23`		`- L.supermap.queryService(url).queryBySQLService({`
	`23`	`+ L.supermap.queryService(url).queryBySQL({`
`24`	`24`	`filter: {`
`25`	`25`	`name: "Capitals@World.1",`
`26`	`26`	`attributeFilter: "SMID < 10"`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`}`
`23`	`23`	`function query() {`
`24`	`24`	`clearLayer();`
`25`		`- L.supermap.getFeaturesService(url).getFeaturesByIDsService({`
	`25`	`+ L.supermap.getFeaturesService(url).getFeaturesByIDs({`
`26`	`26`	`IDs: [1, 247],`
`27`	`27`	`dataSetNames: ["World:Countries"]`
`28`	`28`	`}).on("complete", function (serviceResult) {`