修改OL3下Map、Data相关Service和相应example。

caoxinke · caoxinke · commit c1e7c1a945c4 · 2017-02-23T18:55:52.000+08:00
diff --git a/examples/ol3/01_mapQueryByBounds.html b/examples/ol3/01_mapQueryByBounds.html
@@ -52,10 +52,11 @@
                 });
                 map.addLayer(resultLayer);
             });
-            queryService.queryByBounds({
-                filter: {name: "Capitals@World.1"},
+            var param = new QueryByBoundsParameters({
+                queryParams: {name: "Capitals@World.1"},
                 bounds: polygon.getExtent()
             });
+            queryService.queryByBounds(param);
         }
         function clearLayer() {
             if (vectorLayer) {
diff --git a/examples/ol3/01_mapQueryByDistance.html b/examples/ol3/01_mapQueryByDistance.html
@@ -47,11 +47,12 @@
                 });
                 map.addLayer(resultLayer);
             });
-            queryService.queryByDistance({
-                filter: {name: "Capitals@World.1"},
+            var param = new QueryByDistanceParameters({
+                queryParams: {name: "Capitals@World.1"},
                 distance: 30,
                 geometry: point
             });
+            queryService.queryByDistance(param);
         }
 
         function clearLayer() {
diff --git a/examples/ol3/01_mapQueryByGeometry.html b/examples/ol3/01_mapQueryByGeometry.html
@@ -42,10 +42,11 @@
             map.addLayer(vectorLayer);
 
             var queryService = new ol.supermap.QueryService(url);
-            queryService.queryByGeometry({
-                filter: {name: "Capitals@World.1"},
+            var param = new QueryByGeometryParameters({
+                queryParams: {name: "Capitals@World.1"},
                 geometry: polygon
             });
+            queryService.queryByGeometry(param);
             queryService.on("complete", function (serviceResult) {
                 var vectorSource = new ol.source.Vector({
                     features: (new ol.format.GeoJSON()).readFeatures(serviceResult.element.result[0])
diff --git a/examples/ol3/01_mapQueryBySQL.html b/examples/ol3/01_mapQueryBySQL.html
@@ -24,12 +24,13 @@
         function query() {
             clearLayer();
             var queryService = new ol.supermap.QueryService(url);
-            queryService.queryBySQL({
-                filter: {
+            var param = new QueryBySQLParameters({
+                queryParams: {
                     name: "Capitals@World.1",
                     attributeFilter: "SMID < 10"
                 }
             });
+            queryService.queryBySQL(param);
             queryService.on("complete", function (serviceResult) {
                 var vectorSource = new ol.source.Vector({
                     features: (new ol.format.GeoJSON()).readFeatures(serviceResult.element.result[0])
diff --git a/examples/ol3/01_measure.html b/examples/ol3/01_measure.html
@@ -46,7 +46,8 @@
                             for (var i = 0; i < points.length; i = i + 2) {
                                 line.appendCoordinate([points[i], points[i + 1]]);
                             }
-                            measureService.measureDistance(line);
+                            var distanceMeasureParam = new MeasureParameters(line);
+                            measureService.measureDistance(distanceMeasureParam);
                         }
                         return true;
                     }
@@ -67,7 +68,8 @@
                             for (var i = 0; i < points.length; i = i + 2) {
                                 polygonCoords.push([points[i], points[i + 1]]);
                             }
-                            measureService.measureArea(new ol.geom.Polygon([polygonCoords]));
+                            var areaMeasureParam = new MeasureParameters(new ol.geom.Polygon([polygonCoords]));
+                            measureService.measureArea(areaMeasureParam);
                         }
                         return true;
                     }
diff --git a/examples/ol3/02_editFeatures.html b/examples/ol3/02_editFeatures.html
@@ -44,11 +44,12 @@
                 });
                 map.addLayer(resultLayer);
             });
-            getFeaturesService.getFeaturesByGeometry({
+            var getFeatureParams = new GetFeaturesByGeometryParameters({
                 datasetNames: ["World:Capitals"],
                 geometry: polygon,
                 spatialQueryMode: "INTERSECT"
             });
+            getFeaturesService.getFeaturesByGeometry(getFeatureParams);
         }
 
         function addMarker() {
@@ -68,11 +69,12 @@
         function commit() {
             var me = this;
             var editFeaturesService = new ol.supermap.EditFeaturesService(urlCapital);
-            editFeaturesService.editFeatures({
+            var addFeatureParams = new EditFeaturesParameters({
                 features: pointFeature.getGeometry(),
                 editType: "add",
                 returnContent: true
             });
+            editFeaturesService.editFeatures(addFeatureParams);
             editFeaturesService.on("complete", function (serviceResult) {
                 if (serviceResult.element.result.succeed) {
                     id = serviceResult.element.result[0];
diff --git a/examples/ol3/02_getFeatureByBounds.html b/examples/ol3/02_getFeatureByBounds.html
@@ -42,11 +42,12 @@
             map.addLayer(vectorLayer);
 
             var getFeaturesService = new ol.supermap.GetFeaturesService(url);
-            getFeaturesService.getFeaturesByBounds({
+            var boundsParam = new GetFeaturesByBoundsParameters({
                 datasetNames: ["World:Countries"],
                 bounds: polygon.getExtent(),
                 spatialQueryMode: "INTERSECT"
             });
+            getFeaturesService.getFeaturesByBounds(boundsParam);
             getFeaturesService.on("complete", function (serviceResult) {
                 var vectorSource = new ol.source.Vector({
                     features: (new ol.format.GeoJSON()).readFeatures(serviceResult.element.result)
diff --git a/examples/ol3/02_getFeatureByBuffer.html b/examples/ol3/02_getFeatureByBuffer.html
@@ -43,11 +43,12 @@
             map.addLayer(vectorLayer);
 
             var getFeaturesService = new ol.supermap.GetFeaturesService(url);
-            getFeaturesService.getFeaturesByBuffer({
+            var bufferParam = new GetFeaturesByBufferParameters({
                 datasetNames: ["World:Capitals"],
                 bufferDistance: 10,
                 geometry: polygon
             });
+            getFeaturesService.getFeaturesByBuffer(bufferParam);
             getFeaturesService.on("complete", function (serviceResult) {
                 var vectorSource = new ol.source.Vector({
                     features: (new ol.format.GeoJSON()).readFeatures(serviceResult.element.result)
diff --git a/examples/ol3/02_getFeatureByGeometry.html b/examples/ol3/02_getFeatureByGeometry.html
@@ -52,11 +52,12 @@
                 });
                 map.addLayer(resultLayer);
             });
-            getFeaturesService.getFeaturesByGeometry({
+            var geometryParam = new GetFeaturesByGeometryParameters({
                 datasetNames: ["World:Countries"],
                 geometry: polygon,
                 spatialQueryMode: "INTERSECT"
             });
+            getFeaturesService.getFeaturesByGeometry(geometryParam);
         }
         function clearLayer() {
             if (vectorLayer) {
diff --git a/examples/ol3/02_getFeatureByIDs.html b/examples/ol3/02_getFeatureByIDs.html
@@ -26,10 +26,11 @@
         function query() {
             clearLayer();
             var getFeaturesService = new ol.supermap.GetFeaturesService(url);
-            getFeaturesService.getFeaturesByIDs({
-                IDs: [1, 247],
+            var idsParam = new GetFeaturesByIDsParameters({
+                IDs: [246, 247],
                 datasetNames: ["World:Countries"]
             });
+            getFeaturesService.getFeaturesByIDs(idsParam);
             getFeaturesService.on("complete", function (serviceResult) {
                 var vectorSource = new ol.source.Vector({
                     features: (new ol.format.GeoJSON()).readFeatures(serviceResult.element.result)
diff --git a/examples/ol3/02_getFeatureBySQL.html b/examples/ol3/02_getFeatureBySQL.html
@@ -34,11 +34,14 @@
                 });
                 map.addLayer(resultLayer);
             });
-            getFeaturesService.getFeaturesBySQL({
-                name: "Countries@World",
-                attributeFilter: "SMID = 1",
+            var sqlParam = new GetFeaturesBySQLParameters({
+                queryParameter: {
+                    name: "Countries@World",
+                    attributeFilter: "SMID = 247"
+                },
                 datasetNames: ["World:Countries"]
             });
+            getFeaturesService.getFeaturesBySQL(sqlParam);
         }
 
         function clearLayer() {
diff --git a/examples/ol3/02_getGridCellInfos.html b/examples/ol3/02_getGridCellInfos.html
@@ -77,12 +77,13 @@
 
             map.on("click", function (evt) {
                 var getGridCellInfosService = new ol.supermap.GetGridCellInfosService(url);
-                getGridCellInfosService.getGridCellInfos({
+                var getGridCellInfosParam = new GetGridCellInfosParameter({
                     dataSourceName: "World",
                     datasetName: "WorldEarth",
                     X: evt.coordinate[0],
                     Y: evt.coordinate[1]
                 });
+                getGridCellInfosService.getGridCellInfos(getGridCellInfosParam);
                 getGridCellInfosService.on("complete", function (serviceResult) {
                     var result = serviceResult.element.result;
                     var innerHTML = "栅格查询结果: " + "<br>" + "column: " + result.column + "<br>";
diff --git a/src/Leaflet/SuperMap/iServer/NetworkAnalystService.js b/src/Leaflet/SuperMap/iServer/NetworkAnalystService.js
@@ -234,31 +234,31 @@ NetworkAnalystService = ServiceBase.extend({
 
         if (params.centers && L.Util.isArray(params.centers)) {
             params.centers.map(function (point, key) {
-                params.centers[key] = (point instanceof L.LatLng) ? {x: point.lng, y: params.lat} : point;
+                params.centers[key] = (point instanceof L.LatLng) ? {x: point.lng, y: point.lat} : point;
             });
         }
 
         if (params.nodes && L.Util.isArray(params.nodes)) {
             params.nodes.map(function (point, key) {
-                params.nodes[key] = (point instanceof L.LatLng) ? {x: point.lng, y: params.lat} : point;
+                params.nodes[key] = (point instanceof L.LatLng) ? {x: point.lng, y: point.lat} : point;
             });
         }
 
         if (params.event && params.event instanceof L.LatLng) {
-            params.event = {x: point.lng, y: params.lat};
+            params.event = {x: point.lng, y: point.lat};
         }
 
         if (params.facilities && L.Util.isArray(params.facilities)) {
             params.facilities.map(function (point, key) {
-                params.facilities[key] = (point instanceof L.LatLng) ? {x: point.lng, y: params.lat} : point;
+                params.facilities[key] = (point instanceof L.LatLng) ? {x: point.lng, y: point.lat} : point;
             });
         }
 
         if (params.parameter && params.parameter.barrierPoints) {
             var barrierPoints = params.parameter.barrierPoints;
             if (L.Util.isArray(barrierPoints)) {
                 barrierPoints.map(function (point, key) {
-                    params.parameter.barrierPoints[key] = (point instanceof L.LatLng) ? {x: point.lng, y: params.lat} : point;
+                    params.parameter.barrierPoints[key] = (point instanceof L.LatLng) ? {x: point.lng, y: point.lat} : point;
                 });
             } else {
                 params.parameter.barrierPoints = [(barrierPoints instanceof L.LatLng) ? {x: barrierPoints.lng, y: barrierPoints.lat} : barrierPoints];
diff --git a/src/OL3/SuperMap/iServer/EditFeaturesService.js b/src/OL3/SuperMap/iServer/EditFeaturesService.js
@@ -16,16 +16,15 @@ ol.inherits(ol.supermap.EditFeaturesService, ol.supermap.ServiceBase);
  * editType，IDs，returnContent，isUseBatch
  */
 ol.supermap.EditFeaturesService.prototype.editFeatures = function (params) {
-    var me = this, param = me._processParams(params);
-    var editFeatureParameter = new SuperMap.REST.EditFeaturesParameters(param);
+    var me = this;
     editFeatureService = new SuperMap.REST.EditFeaturesService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    editFeatureService.processAsync(editFeatureParameter);
+    editFeatureService.processAsync(me._processParams(params));
     return me;
 };
 
diff --git a/src/OL3/SuperMap/iServer/GetFeaturesService.js b/src/OL3/SuperMap/iServer/GetFeaturesService.js
@@ -17,64 +17,59 @@ ol.inherits(ol.supermap.GetFeaturesService, ol.supermap.ServiceBase);
 
 /**
  * 数据集ID查询服务
- * @param params
+ * @param params <GetFeaturesByIDsParameters>
  */
 ol.supermap.GetFeaturesService.prototype.getFeaturesByIDs = function (params) {
-    var me = this, param = me._processParams(params);
-    var getFeaturesByIDsParameters = new SuperMap.REST.GetFeaturesByIDsParameters(param);
+    var me = this;
     var getFeaturesByIDsService = new SuperMap.REST.GetFeaturesByIDsService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    getFeaturesByIDsService.processAsync(getFeaturesByIDsParameters);
+    getFeaturesByIDsService.processAsync(me._processParams(params));
     return me;
 
 };
 /**
  * 数据集Bounds查询服务
- * @param params
+ * @param params <GetFeaturesByBoundsParameters>
  */
 ol.supermap.GetFeaturesService.prototype.getFeaturesByBounds = function (params) {
-    var me = this, param = me._processParams(params);
-    var getFeaturesByBoundsParameters = new SuperMap.REST.GetFeaturesByBoundsParameters(param);
+    var me = this;
     var getFeaturesByBoundsService = new SuperMap.REST.GetFeaturesByBoundsService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    getFeaturesByBoundsService.processAsync(getFeaturesByBoundsParameters);
+    getFeaturesByBoundsService.processAsync(me._processParams(params));
     return me;
 };
 /**
  * 数据集Buffer查询服务
- * @param params
+ * @param params <GetFeaturesByBufferParameters>
  */
 ol.supermap.GetFeaturesService.prototype.getFeaturesByBuffer = function (params) {
-    var me = this, param = me._processParams(params);
-    var getFeatureByBufferParameter = new SuperMap.REST.GetFeaturesByBufferParameters(param);
+    var me = this;
     var getFeatureService = new SuperMap.REST.GetFeaturesByBufferService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    getFeatureService.processAsync(getFeatureByBufferParameter);
+    getFeatureService.processAsync(me._processParams(params));
     return me;
 };
 /**
  * 数据集SQL查询服务
- * @param params
+ * @param params <GetFeaturesBySQLParameters>
  */
 ol.supermap.GetFeaturesService.prototype.getFeaturesBySQL = function (params) {
-    var me = this, param = me._processParams(params);
-    param.queryParameter = new SuperMap.REST.FilterParameter(param);
-    var getFeatureBySQLParams = new SuperMap.REST.GetFeaturesBySQLParameters(param);
+    var me = this;
     var getFeatureBySQLService = new SuperMap.REST.GetFeaturesBySQLService(me.options.url, {
         eventListeners: {
             scope: me,
@@ -83,24 +78,23 @@ ol.supermap.GetFeaturesService.prototype.getFeaturesBySQL = function (params) {
         }
     });
 
-    getFeatureBySQLService.processAsync(getFeatureBySQLParams);
+    getFeatureBySQLService.processAsync(me._processParams(params));
     return me;
 };
 /**
  * 数据集几何查询服务类
- * @param params
+ * @param params <GetFeaturesByGeometryParameters>
  */
 ol.supermap.GetFeaturesService.prototype.getFeaturesByGeometry = function (params) {
-    var me = this, param = me._processParams(params);
-    var getFeaturesByGeometryParameters = new SuperMap.REST.GetFeaturesByGeometryParameters(param);
+    var me = this;
     var getFeaturesByGeometryService = new SuperMap.REST.GetFeaturesByGeometryService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    getFeaturesByGeometryService.processAsync(getFeaturesByGeometryParameters);
+    getFeaturesByGeometryService.processAsync(me._processParams(params));
     return me;
 };
 
diff --git a/src/OL3/SuperMap/iServer/GetGridCellInfosService.js b/src/OL3/SuperMap/iServer/GetGridCellInfosService.js
@@ -10,20 +10,22 @@ ol.supermap.GetGridCellInfosService = function (url, options) {
 };
 ol.inherits(ol.supermap.GetGridCellInfosService, ol.supermap.ServiceBase);
 
+/**
+ * @param params <GetGridCellInfosParameter>
+ */
 ol.supermap.GetGridCellInfosService.prototype.getGridCellInfos = function (params) {
     if (!params) {
         return null;
     }
     var me = this;
-    var gridCellQueryParam = new SuperMap.REST.GetGridCellInfosParameter(params);
     var gridCellQueryService = new SuperMap.REST.GetGridCellInfosService(me.options.url, {
         eventListeners: {
             scope: me,
             processCompleted: me.processCompleted,
             processFailed: me.processFailed
         }
     });
-    gridCellQueryService.processAsync(gridCellQueryParam);
+    gridCellQueryService.processAsync(params);
     return me;
 };
 
diff --git a/src/OL3/SuperMap/iServer/MeasureService.js b/src/OL3/SuperMap/iServer/MeasureService.js
diff --git a/src/OL3/SuperMap/iServer/NetworkAnalystService.js b/src/OL3/SuperMap/iServer/NetworkAnalystService.js
diff --git a/src/OL3/SuperMap/iServer/QueryService.js b/src/OL3/SuperMap/iServer/QueryService.js
diff --git a/src/OL3/SuperMap/iServer/SetLayerService.js b/src/OL3/SuperMap/iServer/SetLayerService.js

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@`
`46`	`46`	`for (var i = 0; i < points.length; i = i + 2) {`
`47`	`47`	`line.appendCoordinate([points[i], points[i + 1]]);`
`48`	`48`	`}`
`49`		`- measureService.measureDistance(line);`
	`49`	`+ var distanceMeasureParam = new MeasureParameters(line);`
	`50`	`+ measureService.measureDistance(distanceMeasureParam);`
`50`	`51`	`}`
`51`	`52`	`return true;`
`52`	`53`	`}`
`@@ -67,7 +68,8 @@`
`67`	`68`	`for (var i = 0; i < points.length; i = i + 2) {`
`68`	`69`	`polygonCoords.push([points[i], points[i + 1]]);`
`69`	`70`	`}`
`70`		`- measureService.measureArea(new ol.geom.Polygon([polygonCoords]));`
	`71`	`+ var areaMeasureParam = new MeasureParameters(new ol.geom.Polygon([polygonCoords]));`
	`72`	`+ measureService.measureArea(areaMeasureParam);`
`71`	`73`	`}`
`72`	`74`	`return true;`
`73`	`75`	`}`