Skip to content

Commit b35bba9

Browse files
zhurczhurc
committed
1.leaflet对接地图查询服务，并添加example 2.fix leaflet 要素查询服务参数不全问题 review by caoxinke
1 parent 0a32956 commit b35bba9

20 files changed

+369
-102
lines changed

‎build/deps.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var deps = {
8686
"src": [
8787
"./src/Leaflet/SuperMap/iServer/TiledMapLayer.js",
8888
"./src/Leaflet/SuperMap/iServer/MapService.js",
89-
"./src/Leaflet/SuperMap/iServer/QueryByBoundsService.js",
89+
"./src/Leaflet/SuperMap/iServer/QueryService.js",
9090
"./src/Leaflet/SuperMap/iServer/GetLayersInfoService.js"
9191
]
9292
},

‎examples/leaflet/01_layerService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<title>SuperMap 图层信息</title>
66
<link rel="stylesheet" href="../css/bootstrap.min.css">
7-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
8-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
7+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
8+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
99
<script type="text/javascript">
1010
var map, infowin,
1111
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";

‎examples/leaflet/01_mapQueryByBounds.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title>地图bounds查询</title>
55
<link rel="stylesheet" href="../css/bootstrap.min.css">
6-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
7-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
6+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
7+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
88
<script type="text/javascript">
99
var map, polygon, resultLayer,
1010
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
@@ -22,10 +22,10 @@
2222
function query() {
2323
clearLayer();
2424
polygon.addTo(map);
25-
L.supermap.queryByBoundsService(url, {
26-
name: "Capitals@World.1",
27-
queryBounds: polygon.getBounds()
28-
}).query().on("complete", function (serviceResult) {
25+
L.supermap.queryService(url).queryByBoundsService({
26+
filter: {name: "Capitals@World.1"},
27+
bounds: polygon.getBounds()
28+
}).on("complete", function (serviceResult) {
2929
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
3030
});
3131
}

‎examples/leaflet/01_mapQueryByDistance.html‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE>
2+
<html>
3+
<head>
4+
<title>地图距离查询</title>
5+
<link rel="stylesheet" href="../css/bootstrap.min.css">
6+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
7+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
8+
<script type="text/javascript">
9+
var map, circleMarker, resultLayer,
10+
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
11+
function init() {
12+
map = L.map('map', {
13+
preferCanvas: true,
14+
crs: L.CRS.EPSG4326,
15+
center: [34,104],
16+
maxZoom: 18,
17+
zoom: 2
18+
});
19+
L.supermap.tiledMapLayer(url).addTo(map);
20+
circleMarker = L.circleMarker([30, 104]).addTo(map);
21+
}
22+
function query() {
23+
clearLayer();
24+
L.supermap.queryService(url).queryByDistanceService({
25+
filter: {name: "Capitals@World.1"},
26+
distance: 30,
27+
geometry: circleMarker
28+
}).on("complete", function (serviceResult) {
29+
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
30+
});
31+
}
32+
function clearLayer() {
33+
if (resultLayer) {
34+
resultLayer.removeFrom(map);
35+
}
36+
}
37+
</script>
38+
</head>
39+
<body onload="init()" style=" margin: 0;overflow: hidden;background: #fff;">
40+
<div id="toolbar" style=" position: relative;padding-top: 10px; padding-bottom: 10px;">
41+
<input type="button" class="btn btn-primary" value="地图距离查询" onclick="query()"/>
42+
<input type="button" class="btn btn-primary" value="清除结果" onclick="clearLayer()"/>
43+
<span class="alert alert-danger" role="alert">距离：distance = 30</span>
44+
</div>
45+
<div id="map" style="margin:0 auto;position: relative; height: 510px;border: 1px solid #3473b7;"></div>
46+
</body>
47+
</html>

‎examples/leaflet/01_mapQueryByGeometry.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE>
2+
<html>
3+
<head>
4+
<title>地图几何查询</title>
5+
<link rel="stylesheet" href="../css/bootstrap.min.css">
6+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
7+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
8+
<script type="text/javascript">
9+
var map, polygon, resultLayer,
10+
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
11+
function init() {
12+
map = L.map('map', {
13+
preferCanvas: true,
14+
crs: L.CRS.EPSG4326,
15+
center: [-10,40],
16+
maxZoom: 18,
17+
zoom: 3
18+
});
19+
L.supermap.tiledMapLayer(url).addTo(map);
20+
polygon = L.polygon([[0, 20], [-30, 20], [-10, 50], [0, 20]], {color: 'red'});
21+
}
22+
function query() {
23+
clearLayer();
24+
polygon.addTo(map);
25+
L.supermap.queryService(url).queryByGeometryService({
26+
filter: {name: "Capitals@World.1"},
27+
geometry: polygon
28+
}).on("complete", function (serviceResult) {
29+
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
30+
});
31+
}
32+
function clearLayer() {
33+
if (polygon) {
34+
polygon.removeFrom(map);
35+
}
36+
if (resultLayer) {
37+
resultLayer.removeFrom(map);
38+
}
39+
}
40+
</script>
41+
</head>
42+
<body onload="init()" style=" margin: 0;overflow: hidden;background: #fff;">
43+
<div id="toolbar" style=" position: relative;padding-top: 10px; padding-bottom: 10px;">
44+
<input type="button" class="btn btn-primary" value="地图几何查询" onclick="query()"/>
45+
<input type="button" class="btn btn-primary" value="清除结果" onclick="clearLayer()"/>
46+
</div>
47+
<div id="map" style="margin:0 auto;position: relative; height: 510px;border: 1px solid #3473b7;"></div>
48+
</body>
49+
</html>

‎examples/leaflet/01_mapQueryBySQL.html‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE>
2+
<html>
3+
<head>
4+
<title>地图SQL查询</title>
5+
<link rel="stylesheet" href="../css/bootstrap.min.css">
6+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
7+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
8+
<script type="text/javascript">
9+
var map, resultLayer,
10+
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
11+
function init() {
12+
map = L.map('map', {
13+
preferCanvas: true,
14+
crs: L.CRS.EPSG4326,
15+
center: {lon: 0, lat: 0},
16+
maxZoom: 18,
17+
zoom: 1
18+
});
19+
L.supermap.tiledMapLayer(url).addTo(map);
20+
}
21+
function query() {
22+
clearLayer();
23+
L.supermap.queryService(url).queryBySQLService({
24+
filter: {
25+
name: "Capitals@World.1",
26+
attributeFilter: "SMID < 10"
27+
}
28+
}).on("complete", function (serviceResult) {
29+
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
30+
});
31+
}
32+
function clearLayer() {
33+
if (resultLayer) {
34+
resultLayer.removeFrom(map);
35+
}
36+
}
37+
</script>
38+
</head>
39+
<body onload="init()" style=" margin: 0;overflow: hidden;background: #fff;">
40+
<div id="toolbar" style=" position: relative;padding-top: 10px; padding-bottom: 10px;">
41+
<input type="button" class="btn btn-primary" value="地图SQL查询" onclick="query()"/>
42+
<input type="button" class="btn btn-primary" value="清除结果" onclick="clearLayer()"/>
43+
<span class="alert alert-danger" role="alert">SQL：SMID < 10</span>
44+
</div>
45+
<div id="map" style="margin:0 auto;position: relative; height: 510px;border: 1px solid #3473b7;"></div>
46+
</body>
47+
</html>

‎examples/leaflet/01_mapService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<title>SuperMap 地图信息</title>
66
<link rel="stylesheet" href="../css/bootstrap.min.css">
7-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
8-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
7+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
8+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
99
<script type="text/javascript">
1010
var map, infowin,
1111
url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";

‎examples/leaflet/01_tiledMapLayer.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<title>SuperMap REST 地图服务底图</title>
66
<link rel="stylesheet" href="../css/bootstrap.min.css">
7-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
8-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
7+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
8+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
99
<script type="text/javascript">
1010
var map, url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World";
1111
function init() {

‎examples/leaflet/02_filedStatistics.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<title>数据集字段查询统计</title>
55
<link rel="stylesheet" href="../css/bootstrap.min.css">
6-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
7-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
6+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
7+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
88
<style>
99
.resultInfo {
1010
padding: 6px 8px;

‎examples/leaflet/02_filedsService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<title>SuperMap 字段信息</title>
66
<link rel="stylesheet" href="../css/bootstrap.min.css">
7-
<link rel="stylesheet" href="../../dist/SuperMapiClient9.css">
8-
<script type="text/javascript" src="../../dist/SuperMapiClient9.js"></script>
7+
<link rel="stylesheet" href="../../dist/SuperMapiClient9 for Leaflet.css">
8+
<script type="text/javascript" src="../../dist/SuperMapiClient9 for Leaflet.js"></script>
99
<script type="text/javascript">
1010
var map, infowin,
1111
baseUrl = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/World",

0 commit comments

Comments
 (0)