Skip to content

Commit 2df8947

Browse files
zhurczhurc
committed
1.修改common中服务返回的结果格式(结果中去掉originalResult)
2.leaflet服务调用方式由事件驱动修改为callback回调，并修改测试和example； 3.调整在线编辑页面代码高亮格式； review by songyumeng
1 parent c41652f commit 2df8947

242 files changed

Lines changed: 9940 additions & 9570 deletions

File tree

Some content is hidden

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

‎build/deps.js‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var deps = {
44
"./src/common/Base.js",
55
"./src/common/REST.js"
66
],
7-
"util":[
7+
"util": [
88
"./src/common/util/Request.js",
99
],
1010
"format": [
@@ -127,22 +127,17 @@ var deps = {
127127
"src": [
128128
"./src/leaflet/services/MapService.js",
129129
"./src/leaflet/services/QueryService.js",
130-
"./src/leaflet/services/ChartQueryService.js",
131-
"./src/leaflet/services/TilesetsService.js",
132-
"./src/leaflet/services/GetLayersInfoService.js",
133-
"./src/leaflet/services/ChartFeatureInfoSpecsService.js",
134-
"./src/leaflet/services/SetLayerService.js",
135-
"./src/leaflet/services/MeasureService.js"
130+
"./src/leaflet/services/LayerInfoService.js",
131+
"./src/leaflet/services/MeasureService.js",
132+
"./src/leaflet/services/ChartService.js"
136133
]
137134
},
138135
"Data": {
139136
"name": "数据服务",
140137
"src": [
141-
"./src/leaflet/services/FieldStatisticService.js",
142-
"./src/leaflet/services/GetFeaturesService.js",
143-
"./src/leaflet/services/GetFieldsService.js",
144-
"./src/leaflet/services/EditFeaturesService.js",
145-
"./src/leaflet/services/GetGridCellInfosService.js"
138+
"./src/leaflet/services/FeatureService.js",
139+
"./src/leaflet/services/FieldService.js",
140+
"./src/leaflet/services/GridCellInfosService.js"
146141
]
147142
},
148143
"Theme": {
@@ -189,9 +184,7 @@ var deps = {
189184
"GraphicLayer": {
190185
"name": "高效率点图层",
191186
"src": [
192-
"./src/leaflet/overlay/Graphic.js",
193-
"./src/leaflet/overlay/GraphicGroup.js",
194-
"./src/leaflet/overlay/CircleStyle.js"
187+
"./src/leaflet/overlay/GraphicGroup.js"
195188
]
196189
},
197190

@@ -295,17 +288,13 @@ var deps = {
295288
"GraphicLayer": {
296289
"name": "高效率点图层",
297290
"src": [
298-
"./src/openlayers/overlay/Graphic.js",
299-
"./src/openlayers/overlay/GraphicSource.js"
291+
"./src/openlayers/overlay/Graphic.js"
300292
]
301293
},
302294
"VectorTile": {
303295
"name": "矢量瓦片",
304296
"src": [
305-
"./src/openlayers/overlay/VectorTileSuperMapRest.js",
306-
"./src/openlayers/overlay/VectorTileStyles.js",
307-
"./src/openlayers/overlay/StyleMap.js",
308-
"./src/openlayers/overlay/DeafultCanvasStyle.js"
297+
"./src/openlayers/overlay/VectorTileSuperMapRest.js"
309298
]
310299
}
311300
}

‎dist/iclient9-leaflet.js‎

Lines changed: 8140 additions & 7143 deletions
Large diffs are not rendered by default.

‎examples/js/ace.js‎

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

‎examples/js/editor.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,19 @@ function screenResize() {
3838
//初始化编辑器
3939
function initCodeEditor() {
4040
if (!aceEditor) {
41+
var editorElem = document.getElementById("editor");
42+
editorElem.style.fontSize = "13px";
43+
editorElem.style.lineHeight = "18px";
4144
aceEditor = ace.edit("editor");
4245
aceEditor.setTheme("ace/theme/textmate");
43-
aceEditor.getSession().setMode("ace/mode/javascript");
46+
aceEditor.getSession().setMode("ace/mode/html");
4447
aceEditor.getSession().setUseWrapMode(true);
4548
aceEditor.setShowPrintMargin(false);
4649
}
4750
aceEditor.setValue($('#editor').val());
4851
aceEditor.clearSelection();
4952
aceEditor.moveCursorTo(0, 0);
53+
5054
}
5155

5256
//初始化编辑器以及预览内容
@@ -100,7 +104,7 @@ function run() {
100104
function loadPreview(content) {
101105
var iFrame = document.getElementById("innerPage").contentWindow;
102106
iFrame.document.open();
103-
iFrame.addEventListener('load',mapHeight);
107+
iFrame.addEventListener('load', mapHeight);
104108
iFrame.document.write(content);
105109
iFrame.document.close();
106110
mapHeight();

‎examples/js/mode-javascript.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/js/worker-html.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/leaflet/01_layerService.html‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1010
<div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
11-
</body>
12-
1311
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
1412
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1513
<script type="text/javascript">
@@ -25,18 +23,22 @@
2523
layerService();
2624

2725
function layerService() {
28-
L.supermap.getLayersInfoService(url).getLayersInfo().on("complete", function (serviceResult) {
29-
var innerHTML = "";
30-
serviceResult.result.map(function (layer) {
31-
innerHTML += layer.name + "<br>";
32-
});
33-
infowin = L.popup({maxWidth: 400})
34-
.setLatLng(map.getCenter())
35-
.setContent(innerHTML)
36-
.openOn(map);
37-
});
26+
L.supermap
27+
.layerInfoService(url)
28+
.getLayersInfo(function (serviceResult) {
29+
var result = serviceResult.result;
30+
var innerHTML = "";
31+
result.subLayers.layers.map(function (layer) {
32+
innerHTML += layer.name + "<br>";
33+
});
34+
infowin = L.popup({maxWidth: 400})
35+
.setLatLng(map.getCenter())
36+
.setContent(innerHTML)
37+
.openOn(map);
38+
});
3839
}
3940
</script>
41+
</body>
4042
</html>
4143

4244

‎examples/leaflet/01_mapQueryByBounds.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1010
<div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
11-
</body>
12-
1311
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
1412
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1513
<script type="text/javascript">
@@ -32,9 +30,13 @@
3230
queryParams: {name: "Capitals@World.1"},
3331
bounds: polygon.getBounds()
3432
});
35-
L.supermap.queryService(url).queryByBounds(param).on("complete", function (serviceResult) {
36-
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
37-
});
33+
L.supermap
34+
.queryService(url)
35+
.queryByBounds(param, function (serviceResult) {
36+
var result = serviceResult.result;
37+
resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
38+
});
3839
}
3940
</script>
41+
</body>
4042
</html>

‎examples/leaflet/01_mapQueryByDistance.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1010
<div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
11-
</body>
12-
1311
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
1412
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1513
<script type="text/javascript">
@@ -33,9 +31,13 @@
3331
distance: 10,
3432
geometry: circleMarker
3533
});
36-
L.supermap.queryService(url).queryByDistance(param).on("complete", function (serviceResult) {
37-
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
38-
});
34+
L.supermap
35+
.queryService(url)
36+
.queryByDistance(param, function (serviceResult) {
37+
var result = serviceResult.result;
38+
resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
39+
});
3940
}
4041
</script>
42+
</body>
4143
</html>

‎examples/leaflet/01_mapQueryByGeometry.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
</head>
99
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1010
<div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
11-
</body>
12-
1311
<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
1412
<script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
1513
<script type="text/javascript">
@@ -32,9 +30,13 @@
3230
queryParams: {name: "Capitals@World.1"},
3331
geometry: polygon
3432
});
35-
L.supermap.queryService(url).queryByGeometry(param).on("complete", function (serviceResult) {
36-
resultLayer = L.geoJSON(serviceResult.result).addTo(map);
37-
});
33+
L.supermap
34+
.queryService(url)
35+
.queryByGeometry(param, function (serviceResult) {
36+
var result = serviceResult.result;
37+
resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
38+
});
3839
}
3940
</script>
41+
</body>
4042
</html>

0 commit comments

Comments
 (0)