Skip to content

Commit 198014d

Browse files
zhurczhurc
committed
提取Core中Map,Data下所有服务相关参数供外部调用。并修改example review by caoxinke
1 parent c9def72 commit 198014d

File tree

74 files changed

+3199
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3199
-257
lines changed

‎build/deps.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ var deps = {
2626
"./src/Core/iServer/QueryByGeometryService.js",
2727
"./src/Core/iServer/QueryBySQLService.js",
2828
"./src/Core/iServer/QueryByBoundsService.js",
29-
"./src/Core/iServer/QueryService.js",
3029
"./src/Core/iServer/TilesetsService.js",
3130
"./src/Core/iServer/MeasureService.js",
3231
"./src/Core/iServer/ChartFeatureInfoSpecsService.js",

‎examples/leaflet/01_mapQueryByBounds.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
99
<script type="text/javascript">
1010
var map, polygon, resultLayer,
11-
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
11+
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
1212
function init() {
1313
map = L.map('map', {
1414
preferCanvas: true,
@@ -23,10 +23,11 @@
2323
function query() {
2424
clearLayer();
2525
polygon.addTo(map);
26-
L.supermap.queryService(url).queryByBounds({
27-
filter: {name: "Capitals@World.1"},
26+
var param = new QueryByBoundsParameters({
27+
queryParams: {name: "Capitals@World.1"},
2828
bounds: polygon.getBounds()
29-
}).on("complete", function (serviceResult) {
29+
});
30+
L.supermap.queryService(url).queryByBounds(param).on("complete", function (serviceResult) {
3031
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3132
});
3233
}

‎examples/leaflet/01_mapQueryByDistance.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
map = L.map('map', {
1414
preferCanvas: true,
1515
crs: L.CRS.EPSG4326,
16-
center: [34,104],
16+
center: [34, 104],
1717
maxZoom: 18,
1818
zoom: 2
1919
});
@@ -22,11 +22,12 @@
2222
}
2323
function query() {
2424
clearLayer();
25-
L.supermap.queryService(url).queryByDistance({
26-
filter: {name: "Capitals@World.1"},
25+
var param = new QueryByDistanceParameters({
26+
queryParams: {name: "Capitals@World.1"},
2727
distance: 30,
2828
geometry: circleMarker
29-
}).on("complete", function (serviceResult) {
29+
});
30+
L.supermap.queryService(url).queryByDistance(param).on("complete", function (serviceResult) {
3031
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3132
});
3233
}

‎examples/leaflet/01_mapQueryByGeometry.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
map = L.map('map', {
1414
preferCanvas: true,
1515
crs: L.CRS.EPSG4326,
16-
center: [-10,40],
16+
center: [-10, 40],
1717
maxZoom: 18,
1818
zoom: 3
1919
});
@@ -23,10 +23,11 @@
2323
function query() {
2424
clearLayer();
2525
polygon.addTo(map);
26-
L.supermap.queryService(url).queryByGeometry({
27-
filter: {name: "Capitals@World.1"},
26+
var param = new QueryByGeometryParameters({
27+
queryParams: {name: "Capitals@World.1"},
2828
geometry: polygon
29-
}).on("complete", function (serviceResult) {
29+
});
30+
L.supermap.queryService(url).queryByGeometry(param).on("complete", function (serviceResult) {
3031
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3132
});
3233
}

‎examples/leaflet/01_mapQueryBySQL.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
}
2222
function query() {
2323
clearLayer();
24-
L.supermap.queryService(url).queryBySQL({
25-
filter: {
24+
var param = new QueryBySQLParameters({
25+
queryParams: {
2626
name: "Capitals@World.1",
2727
attributeFilter: "SMID < 10"
2828
}
29-
}).on("complete", function (serviceResult) {
29+
});
30+
L.supermap.queryService(url).queryBySQL(param).on("complete", function (serviceResult) {
3031
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3132
});
3233
}

‎examples/leaflet/01_measure.html‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
resultLayer.addLayer(polyline);
3131
resultLayer.addLayer(marker1);
3232
resultLayer.addLayer(marker2);
33-
L.supermap.measureService(url).measureDistance({
34-
geometry: polyline
35-
}).on("complete", function (serviceResult) {
33+
var distanceMeasureParam = new MeasureParameters(polyline);
34+
L.supermap.measureService(url).measureDistance(distanceMeasureParam).on("complete", function (serviceResult) {
3635
var content = "距离： " + serviceResult.result.distance + " 米";
3736
marker1.bindPopup(content).openPopup(marker1.getLatLng());
3837
});
@@ -41,9 +40,8 @@
4140
clearLayer();
4241
polygon = L.polygon([[24, 100], [40, 100], [40, 120], [24, 120], [24, 100]], {color: "red"});
4342
resultLayer.addLayer(polygon);
44-
L.supermap.measureService(url).measureArea({
45-
geometry: polygon
46-
}).on("complete", function (serviceResult) {
43+
var areaMeasureParam = new MeasureParameters(polygon);
44+
L.supermap.measureService(url).measureArea(areaMeasureParam).on("complete", function (serviceResult) {
4745
var content = "面积： " + serviceResult.result.area + " 平方米";
4846
polygon.bindPopup(content).openPopup(polygon.getCenter());
4947
});

‎examples/leaflet/01_tiledMapLayer3857.html‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>SuperMap REST 地图服务底图</title>
6+
<link rel="stylesheet" href="../css/bootstrap.min.css">
7+
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v1.0.2/leaflet.css">
8+
<script type="text/javascript" src="http://cdn.leafletjs.com/leaflet/v1.0.2/leaflet.js"></script>
9+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
10+
<script type="text/javascript">
11+
var map, url = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China";
12+
function init() {
13+
map = L.map('map', {
14+
center: [0, 0],
15+
maxZoom: 18,
16+
zoom: 1
17+
});
18+
L.supermap.tiledMapLayer(url).addTo(map);
19+
}
20+
21+
</script>
22+
</head>
23+
<body onload="init()" style=" margin: 0;overflow: hidden;background: #fff;">
24+
<div id="map" style="margin:0 auto;position: relative; height: 510px;border: 1px solid #3473b7;"></div>
25+
</body>
26+
</html>

examples/leaflet/01_tiledMapLayer.html renamed to examples/leaflet/01_tiledMapLayer4326.html

File renamed without changes.

‎examples/leaflet/02_editFeatures.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
}
2626
function initFeature() {
2727
var polygon = L.polygon([[10, 100], [10, 124], [40, 124], [40, 100], [10, 100]]);
28-
L.supermap.getFeaturesService(url).getFeaturesByGeometry({
28+
var getFeatureParams = new GetFeaturesByGeometryParameters({
2929
datasetNames: ["World:Capitals"],
3030
geometry: polygon,
3131
spatialQueryMode: "INTERSECT"
32-
}).on("complete", function (serviceResult) {
32+
});
33+
L.supermap.getFeaturesService(url).getFeaturesByGeometry(getFeatureParams).on("complete", function (serviceResult) {
3334
resultLayer = L.geoJSON(serviceResult.result, {
3435
onEachFeature: function (feature, layer) {
3536
layer.bindPopup("首都：" + feature.properties.CAPITAL);
@@ -53,11 +54,12 @@
5354
function commit() {
5455
var me = this;
5556
if (featureGroup.hasLayer(marker)) {
56-
L.supermap.editFeaturesService(urlCapital).editFeatures({
57+
var addFeatureParams = new EditFeaturesParameters({
5758
features: marker,
5859
editType: "add",
5960
returnContent: true
60-
}).on("complete", function (serviceResult) {
61+
});
62+
L.supermap.editFeaturesService(urlCapital).editFeatures(addFeatureParams).on("complete", function (serviceResult) {
6163
if (serviceResult.result.succeed) {
6264
id = serviceResult.result[0];
6365
featureGroup.removeFrom(map);
@@ -75,10 +77,11 @@
7577
return;
7678
}
7779
if (id) {
78-
L.supermap.editFeaturesService(urlCapital).editFeatures({
80+
var deleteParams = new EditFeaturesParameters({
7981
IDs: [id],
8082
editType: "delete"
81-
}).on("complete", function (serviceResult) {
83+
});
84+
L.supermap.editFeaturesService(urlCapital).editFeatures(deleteParams).on("complete", function (serviceResult) {
8285
if (serviceResult.result.succeed) {
8386
resultLayer.removeFrom(map);
8487
me.initFeature();
@@ -89,7 +92,7 @@
8992
}
9093
if (featureGroup && featureGroup.hasLayer(marker)) {
9194
featureGroup.removeLayer(marker);
92-
marker=null;
95+
marker = null;
9396
}
9497
}
9598
</script>

‎examples/leaflet/02_filedStatistics.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
function getFields() {
100100
var layerSelect = document.getElementById("layerSelect");
101-
var name = layerSelect.options[layerSelect.selectedIndex].innerHTML;//:selected").text();
101+
var name = layerSelect.options[layerSelect.selectedIndex].innerHTML;
102102
var dataInfo;
103103
for (var i = 0; i < layersName.length; i++) {
104104
dataInfo = layersName[i];

0 commit comments

Comments
 (0)