Skip to content

Commit 3ca5e50

Browse files
zhurczhurc
committed
整合leaflet数据查询各种服务为一个统一接口,并修改example
1 parent b7a7b23 commit 3ca5e50

15 files changed

+193
-318
lines changed

‎build/deps.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ var deps = {
9494
"name": "Data服务",
9595
"src": [
9696
"./src/Leaflet/SuperMap/iServer/FieldStatisticService.js",
97-
"./src/Leaflet/SuperMap/iServer/GetFeaturesByBoundsService.js",
98-
"./src/Leaflet/SuperMap/iServer/GetFeaturesByBufferService.js",
99-
"./src/Leaflet/SuperMap/iServer/GetFeaturesByGeometryService.js",
100-
"./src/Leaflet/SuperMap/iServer/GetFeaturesByIDsService.js",
101-
"./src/Leaflet/SuperMap/iServer/GetFeaturesBySQLService.js",
97+
"./src/Leaflet/SuperMap/iServer/GetFeaturesService.js",
10298
"./src/Leaflet/SuperMap/iServer/GetFieldsService.js"
10399
]
104100
}

‎examples/leaflet/02_getFeatureByBounds.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
function query() {
2424
clearLayer();
2525
polygon.addTo(map);
26-
L.supermap.getFeaturesByBoundsService(url, {
26+
L.supermap.getFeaturesService(url).getFeaturesByBoundsService({
2727
dataSetNames: ["World:Countries"],
2828
bounds: polygon.getBounds(),
29-
spatialQueryMode:"INTERSECT"
30-
}).getFeatures().on("complete", function (serviceResult) {
29+
spatialQueryMode: "INTERSECT"
30+
}).on("complete", function (serviceResult) {
3131
resultLayer = L.geoJSON(serviceResult.result, {
3232
onEachFeature: function (feature, layer) {
3333
layer.bindPopup("国家：" + feature.properties.COUNTRY);

‎examples/leaflet/02_getFeatureByBuffer.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
function query() {
2424
clearLayer();
2525
polygon.addTo(map);
26-
L.supermap.getFeaturesByBufferService(url, {
26+
L.supermap.getFeaturesService(url).getFeaturesByBufferService({
2727
dataSetNames: ["World:Capitals"],
2828
bufferDistance: 10,
2929
geometry: polygon
30-
}).getFeatures().on("complete", function (serviceResult) {
30+
}).on("complete", function (serviceResult) {
3131
resultLayer = L.geoJSON(serviceResult.result, {
3232
onEachFeature: function (feature, layer) {
3333
layer.bindPopup("首都：" + feature.properties.CAPITAL);

‎examples/leaflet/02_getFeatureByGeometry.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
function query() {
2424
clearLayer();
2525
polygon.addTo(map);
26-
L.supermap.getFeaturesByGeometryService(url, {
26+
L.supermap.getFeaturesService(url).getFeaturesByGeometryService({
2727
dataSetNames: ["World:Countries"],
2828
geometry: polygon,
2929
spatialQueryMode: "INTERSECT"
30-
}).getFeatures().on("complete", function (serviceResult) {
30+
}).on("complete", function (serviceResult) {
3131
resultLayer = L.geoJSON(serviceResult.result, {
3232
onEachFeature: function (feature, layer) {
3333
layer.bindPopup("国家：" + feature.properties.COUNTRY);

‎examples/leaflet/02_getFeatureByIDs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
}
2323
function query() {
2424
clearLayer();
25-
L.supermap.getFeaturesByIDsService(url, {
25+
L.supermap.getFeaturesService(url).getFeaturesByIDsService({
2626
IDs: [1, 247],
2727
dataSetNames: ["World:Countries"]
28-
}).getFeatures().on("complete", function (serviceResult) {
28+
}).on("complete", function (serviceResult) {
2929
resultLayer = L.geoJSON(serviceResult.result, {
3030
onEachFeature: function (feature, layer) {
3131
layer.bindPopup("ID: " + feature.properties.SMID + "<br>" + "国家：" + feature.properties.COUNTRY);

‎examples/leaflet/02_getFeatureBySQL.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
}
2222
function query() {
2323
clearLayer();
24-
L.supermap.getFeaturesBySQLService(url, {
24+
L.supermap.getFeaturesService(url).getFeaturesBySQLService({
2525
name: "Countries@World",
2626
attributeFilter: "SMID = 1",
2727
dataSetNames: ["World:Countries"]
28-
}).getFeatures().on("complete", function (serviceResult) {
28+
}).on("complete", function (serviceResult) {
2929
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3030
});
3131
}

‎src/Core/iServer/GetFeaturesServiceBase.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ SuperMap.REST.GetFeaturesServiceBase = SuperMap.Class(SuperMap.CoreServiceBase,
157157
*/
158158
serviceProcessCompleted: function (result) {
159159
var me = this, results;
160-
result = SuperMap.Util.transformResult(result);
160+
results = result = SuperMap.Util.transformResult(result);
161161
if (me.format === "geojson" && result.features) {
162162
var geoJSONFormat = new SuperMap.Format.GeoJSON();
163163
results = JSON.parse(geoJSONFormat.write(result.features));

‎src/Leaflet/SuperMap/iServer/GetFeaturesByBoundsService.js‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/Leaflet/SuperMap/iServer/GetFeaturesByBufferService.js‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/Leaflet/SuperMap/iServer/GetFeaturesByGeometryService.js‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)