Skip to content

Commit 6e21cdb

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
2 parents a5f11ca + e9f0123 commit 6e21cdb

File tree

66 files changed

+3393
-1853
lines changed

Some content is hidden

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

66 files changed

+3393
-1853
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1072 additions & 521 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.js‎

Lines changed: 1081 additions & 518 deletions
Large diffs are not rendered by default.

‎examples/leaflet/04_thiessenAnalystService_datasets.html‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
maxZoom: 18,
2828
zoom: 1
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
thiessenAnalystProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on("load", function () {
33+
thiessenAnalystProcess();
34+
});
35+
3236
}
3337

3438
function thiessenAnalystProcess() {
@@ -38,18 +42,7 @@
3842
});
3943
thiessenAnalystService.thiessenAnalysis(dThiessenAnalystParameters)
4044
.on('complete', function (serviceResult) {
41-
//resultLayer = L.geoJSON(serviceResult.result, {color: "blue"}).addTo(map);
42-
points = [];
43-
var i,j;
44-
for(i = 0; i<serviceResult.result.regions.length; i++){
45-
var c = serviceResult.result.regions[i];
46-
for(j=0; j<c.points.length; j++){
47-
var point = [serviceResult.result.regions[i].points[j].y,serviceResult.result.regions[i].points[j].x];
48-
points.push(point);
49-
}
50-
L.polygon([points]).addTo(map);
51-
points = [];
52-
}
45+
resultLayer = L.geoJSON(serviceResult.result, {weight: 2}).addTo(map);
5346
});
5447
}
5548
</script>

‎examples/leaflet/04_thiessenAnalystService_geometry.html‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
1212
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1313
<script type="text/javascript">
14-
var map, pointsList, points, resultLayer, thiessenAnalystService, gThiessenAnalystParameters,
14+
var map, thiessenAnalystService, gThiessenAnalystParameters,
1515
baseUrl = "http://support.supermap.com.cn:8090/iserver/services/map-changchun/rest/maps/长春市区图",
1616
serviceUrl = "http://support.supermap.com.cn:8090/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
1717

@@ -27,53 +27,33 @@
2727
maxZoom: 18,
2828
zoom: 1
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
thiessenAnalystProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on("load", function () {
33+
thiessenAnalystProcess();
34+
});
3235
}
3336

3437
function thiessenAnalystProcess() {
35-
/*var pointsList1 = [
36-
[-1724.229865, 5238.998556],
37-
[-2118.538477, 4996.270055],
38-
[-2070.794081, 5450.34263],
39-
[-2521.162355, 5317.70775],
40-
[-1970.130198, 5741.149405],
41-
[-1575.858795, 4716.133098],
42-
[-2255.928819, 5447.671615],
43-
[-1135.598744, 4783.423507],
44-
[-2189.15344, 5472.712382],
45-
[-2425.40363, 5752.716961]
46-
];*/
47-
pointsList = [
48-
//L.point中x,y的顺序与SuperMap.Geometry.Point中的顺序一样
49-
L.point(5238.998556, -1724.229865),
50-
L.point(4996.270055, -2118.538477),
51-
L.point(5450.34263, -2070.794081),
52-
L.point(5317.70775, -2521.162355),
53-
L.point(5741.149405, -1970.130198),
54-
L.point(4716.133098, -1575.858795),
55-
L.point(5447.671615, -2255.928819),
56-
L.point(4783.423507, -1135.598744),
57-
L.point(5472.712382, -2189.15344),
58-
L.point(5752.716961, -2425.40363)
38+
var pointsList = [
39+
[5238.998556, -1724.229865],
40+
[4996.270055, -2118.538477],
41+
[5450.34263, -2070.794081],
42+
[5317.70775, -2521.162355],
43+
[5741.149405, -1970.130198],
44+
[4716.133098, -1575.858795],
45+
[5447.671615, -2255.928819],
46+
[4783.423507, -1135.598744],
47+
[5472.712382, -2189.15344],
48+
[5752.716961, -2425.40363]
5949
];
6050
gThiessenAnalystParameters = new GeometryThiessenAnalystParameters({
6151
points: pointsList
6252
});
6353
thiessenAnalystService = L.supermap.spatialAnalystService(serviceUrl);
6454
thiessenAnalystService.thiessenAnalysis(gThiessenAnalystParameters)
6555
.on('complete', function (serviceResult) {
66-
//resultLayer = L.geoJSON(serviceResult.result, {color: "blue"}).addTo(map);
67-
points = [];
68-
var i, j;
69-
for (i = 0; i < serviceResult.result.regions.length; i++) {
70-
for (j = 0; j < serviceResult.result.regions[i].points.length; j++) {
71-
var point = [serviceResult.result.regions[i].points[j].y, serviceResult.result.regions[i].points[j].x];
72-
points.push(point);
73-
}
74-
L.polygon([points]).addTo(map);
75-
points = [];
76-
}
56+
L.geoJSON(serviceResult.result, {weight: 2}).addTo(map);
7757
})
7858
}
7959
</script>

‎examples/leaflet/05_findClosestFacilitiesService.html‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,20 @@
2727
maxZoom: 18,
2828
zoom: 3
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
findClosetFacilitiesProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on('load', function () {
33+
findClosetFacilitiesProcess();
34+
});
35+
3236
}
3337
function findClosetFacilitiesProcess() {
3438
//添加设施点
3539
var marker1 = L.marker([-3500, 2500]).addTo(map);
3640
marker1.bindPopup("设施点一");
3741
var marker2 = L.marker([-2500, 5500]).addTo(map);
3842
marker2.bindPopup("设施点二");
39-
var marker3 =L.marker([-4000, 7000]).addTo(map);
43+
var marker3 = L.marker([-4000, 7000]).addTo(map);
4044
marker3.bindPopup("设施点三");
4145
//添加事件点
4246
var myIcon = L.icon({
@@ -77,20 +81,9 @@
7781
//进行查找
7882
findClosetFacilitiesService.findClosestFacilities(findClosetFacilitiesParameter)
7983
.on('complete', function (serviceResult) {
80-
var result = serviceResult.result;
81-
//L.geoJSON(serviceResult.result, {color: "red"}).addTo(map);
82-
var features = [];
83-
if (result.facilityPathList) {
84-
for (var i = 0, facilityPathList = result.facilityPathList, len = facilityPathList.length; i < len; i++) {
85-
for (var j = 0; j < facilityPathList[i].route.points.length; j++) {
86-
features.push([facilityPathList[i].route.points[j].y, facilityPathList[i].route.points[j].x]);
87-
}
88-
}
89-
}
90-
setTimeout(function(){
91-
L.polyline(features).addTo(map)
92-
},1000)
93-
84+
serviceResult.result.map(function (result) {
85+
L.geoJSON(result.route, {color: "red"}).addTo(map);
86+
});
9487
});
9588
}
9689
</script>

‎examples/leaflet/05_findLocationService.html‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,23 @@
2727
maxZoom: 18,
2828
zoom: 1
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
findLocationProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on("load", function () {
33+
findLocationProcess();
34+
});
35+
3236
}
3337
function findLocationProcess() {
3438
//添加设施点
35-
var marker1 = L.marker([-593.56822512495194, 1675.9256791377206]).addTo(map);
36-
var marker2 = L.marker([-2358.0414663985171, 2820.35101097629]).addTo(map);
37-
var marker3 = L.marker([-3647.0074300836109, 2909.4396668115278]).addTo(map);
38-
var marker4 = L.marker([-5616.5950974905827, 1544.5037476378677]).addTo(map);
39-
var marker5 = L.marker([-2130.4887600981415, 6623.5972101719526]).addTo(map);
40-
var marker6 = L.marker([-4504.2328567816048, 5482.4979617984973]).addTo(map);
41-
var marker7 = L.marker([-1627.6012900626256, 6940.6579024271468]).addTo(map);
42-
var marker8 = L.marker([-5747.5063918659716, 8215.9188781715948]).addTo(map);
43-
/* //为设施点添加弹窗
44-
marker1.bindPopup("设施点一");
45-
marker2.bindPopup("设施点二");
46-
marker3.bindPopup("设施点三");
47-
marker4.bindPopup("设施点四");
48-
marker5.bindPopup("设施点五");
49-
marker6.bindPopup("设施点六");
50-
marker7.bindPopup("设施点七");
51-
marker8.bindPopup("设施点八");*/
39+
L.marker([-593.56822512495194, 1675.9256791377206]).addTo(map);
40+
L.marker([-2358.0414663985171, 2820.35101097629]).addTo(map);
41+
L.marker([-3647.0074300836109, 2909.4396668115278]).addTo(map);
42+
L.marker([-5616.5950974905827, 1544.5037476378677]).addTo(map);
43+
L.marker([-2130.4887600981415, 6623.5972101719526]).addTo(map);
44+
L.marker([-4504.2328567816048, 5482.4979617984973]).addTo(map);
45+
L.marker([-1627.6012900626256, 6940.6579024271468]).addTo(map);
46+
L.marker([-5747.5063918659716, 8215.9188781715948]).addTo(map);
5247

5348
// 设置设施点的资源供给中心
5449
var supplyCenterType_FIXEDCENTER = SupplyCenterType.FIXEDCENTER,
@@ -130,20 +125,11 @@
130125
//进行查找
131126
findLocationService.findLocation(findLocationParameter)
132127
.on('complete', function (serviceResult) {
133-
//L.geoJSON(serviceResult.result, {color: "red"}).addTo(map);
134-
var result = serviceResult.result;
135-
var features = [];
136-
if (result.demandResults) {
137-
for (var i = 0, demandResults = result.demandResults, len = demandResults.length; i < len; i++) {
138-
for (j = 0; j < demandResults[i].geometry.points.length; j++) {
139-
features.push([demandResults[i].geometry.points[j].y, demandResults[i].geometry.points[j].x]);
140-
}
141-
128+
L.geoJSON(serviceResult.result.demandResults, {
129+
pointToLayer: function (geoJsonPoint, latlng) {
130+
return L.circleMarker(latlng, {radius: 1, color: "green"});
142131
}
143-
}
144-
for (k = 0; k < features.length; k++) {
145-
L.circleMarker(features[k], {color: 'green', radius: 1}).addTo(map)
146-
}
132+
}).addTo(map);
147133
});
148134
}
149135
</script>

‎examples/leaflet/05_findMTSPPathsService.html‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
maxZoom: 18,
2828
zoom: 1
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
findMTSPPathsProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on("load", function () {
33+
findMTSPPathsProcess();
34+
});
3235
}
3336
function findMTSPPathsProcess() {
3437
//添加配送点
@@ -80,19 +83,10 @@
8083
//进行查找
8184
findMTSPPathsService.findMTSPPaths(findMTSPPathsParameter)
8285
.on('complete', function (serviceResult) {
83-
//L.geoJSON(serviceResult.result, {color: "red"}).addTo(map);
84-
var result = serviceResult.result;
85-
var points = [];
86-
if (result.pathList) {
87-
for (var i = 0; i < result.pathList.length; i++) {
88-
for (var j = 0; j < result.pathList[0].route.points.length; j++) {
89-
var point = [result.pathList[i].route.points[j].y, result.pathList[i].route.points[j].x];
90-
points.push(point);
91-
}
92-
L.polyline(points, {color: 'green'}).addTo(map);
93-
points = [];
94-
}
95-
}
86+
serviceResult.result.map(function (result) {
87+
L.geoJSON(result.route, {color: "red"}).addTo(map);
88+
});
89+
9690
});
9791
}
9892
</script>

‎examples/leaflet/05_findPathService.html‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<script type="text/javascript">
1414
var map, findPathService, findPathParameter,
1515
baseUrl = "http://support.supermap.com.cn:8090/iserver/services/map-changchun/rest/maps/长春市区图",
16-
serviceUrl = "http://support.supermap.com.cn:8090/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
16+
serviceUrl = "http://support.supermap.com.cn:8090/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun",
17+
iconUrl = "http://support.supermap.com.cn:8090/iserver/iClient/forJavaScript/examples/images/walk.png";
1718
//最佳路径分析必须按照指定顺序对站点进行访问
1819
init();
1920

@@ -27,8 +28,12 @@
2728
maxZoom: 18,
2829
zoom: 3
2930
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
findPathProcess();
31+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
32+
.addTo(map)
33+
.on("load", function () {
34+
findPathProcess();
35+
});
36+
3237
}
3338
function findPathProcess() {
3439
//添加站点
@@ -62,32 +67,21 @@
6267
hasLeastEdgeCount: false,
6368
parameter: analystParameter
6469
});
70+
var myIcon = L.icon({
71+
iconUrl: iconUrl,
72+
iconSize: [20, 20]
73+
});
6574
//进行查找
6675
findPathService.findPath(findPathParameter)
6776
.on('complete', function (serviceResult) {
68-
// L.geoJSON(serviceResult.result, {color: "red"}).addTo(map);
69-
var result = serviceResult.result;
70-
var features = [];
71-
var guideFeatures = []; //显示每个pathGuideItem和对应的描述信息
72-
if (result.pathList) {
73-
for (var i = 0, pathList = result.pathList, len = pathList.length; i < len; i++) {
74-
for (var j = 0; j < pathList[i].route.points.length; j++) {
75-
features.push([pathList[i].route.points[j].y, pathList[i].route.points[j].x]);
77+
serviceResult.result.map(function (result) {
78+
L.polyline(result.route).addTo(map);
79+
L.geoJSON(result.pathGuideItems, {
80+
pointToLayer: function (geoPoints, latlng) {
81+
L.marker(latlng, {icon: myIcon}).addTo(map);
7682
}
77-
}
78-
for (var k = 0; k < result.pathList[0].pathGuideItems.length; k++) {
79-
guideFeatures.push([result.pathList[0].pathGuideItems[k].geometry.points[0].y, result.pathList[0].pathGuideItems[k].geometry.points[0].x]);
80-
}
81-
}
82-
L.polyline(features).addTo(map);
83-
84-
var myIcon = L.icon({
85-
iconUrl: 'http://support.supermap.com.cn:8090/iserver/iClient/forJavaScript/examples/images/walk.png',
86-
iconSize:[20, 20]
87-
});
88-
for (var l = 0; l < guideFeatures.length; l++) {
89-
L.marker(guideFeatures[l], {icon: myIcon}).addTo(map);
90-
}
83+
}).addTo(map);
84+
})
9185
});
9286
}
9387

‎examples/leaflet/05_findTSPPathsService.html‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
maxZoom: 18,
2828
zoom: 1
2929
});
30-
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
31-
findTSPPathsProcess();
30+
L.supermap.tiledMapLayer(baseUrl, {noWrap: true})
31+
.addTo(map)
32+
.on("load", function () {
33+
findTSPPathsProcess();
34+
});
3235
}
3336
function findTSPPathsProcess() {
3437
//添加站点
@@ -73,23 +76,11 @@
7376
//进行查找
7477
findTSPPathsService.findTSPPaths(findTSPPathsParameter)
7578
.on('complete', function (serviceResult) {
76-
//L.geoJSON(serviceResult.result, {color: "red"}).addTo(map);
77-
result = serviceResult.result;
78-
addPath(result);
79+
serviceResult.result.map(function (result) {
80+
L.geoJSON(result.route).addTo(map);
81+
});
7982
});
8083

81-
function addPath(result) {
82-
var features = [];
83-
if (result.tspPathList) {
84-
for (var j = 0; j < result.tspPathList[0].route.points.length; j++) {
85-
features.push([result.tspPathList[0].route.points[j].y, result.tspPathList[0].route.points[j].x])
86-
}
87-
L.polyline(features).addTo(map);
88-
/* for (i = 0; i < features.length - 1; i++) {
89-
L.polyline([features[i], features[i + 1]], {color: 'green'}).addTo(map);
90-
}*/
91-
}
92-
}
9384
}
9485
</script>
9586
</body>

0 commit comments

Comments
 (0)