Skip to content

Commit 0ae6e67

Browse files
Yuki-ZhaoYuki-Zhao
committed
2 parents c9e98f2 + 1ece4b1 commit 0ae6e67

File tree

85 files changed

+788
-422
lines changed

Some content is hidden

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

85 files changed

+788
-422
lines changed

‎examples/classic/addressMatchService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%">
2323
<div id="map" style="width: 100%;height:100%"></div>
24-
<div id="control" class="control" style='width:20%'>
24+
<div id="control" class="control" style='width:350px'>
2525
<div class="panel panel-default">
2626
<div class="panel-body">
2727
<ul class="nav nav-tabs nav-justified">

‎examples/classic/controler_drawGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h5 class='panel-title text-center' data-i18n="resources.text_drawGeometry"></h5
7272
new SuperMap.Control.LayerSwitcher()
7373
, drawPoint, drawLine, drawPolygon, selectCtrl, modifyCtrl]
7474
});
75-
layer = new SuperMap.Layer.CloudLayer();
75+
layer = new SuperMap.Layer.OSM("OSM");
7676
addLayer();
7777
//layer.events.on({"layerInitialized":addLayer});
7878
vecotrLayer.style = {

‎examples/classic/map_cloudLayer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
})]
2626
});
2727

28-
layer = new SuperMap.Layer.CloudLayer();
28+
layer = new SuperMap.Layer.OSM("OSM");
2929
map.addLayers([layer]);
3030
map.setCenter(new SuperMap.LonLat(11339634.286396, 4588716.5813769), 4);
3131
</script>

‎examples/classic/others_contextMenu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141
</style>
4242
</head>
43-
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;;">
43+
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
4444

4545
<div id="map" style="margin:0 auto;width: 100%;height: 100%;"></div>
4646
<div id="myMenu">

‎examples/classic/others_d3_zoomablePacking.html

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

2020
#box > div {
2121
overflow: hidden;
22-
overflow: hidden;;
22+
overflow: hidden;
2323
text-align: center;
2424
opacity: 0.7;
2525
}

‎examples/classic/others_echart_graphBar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
control = new SuperMap.Control.UTFGrid({
9595
layers: [utfgrid],
9696
callback: callback,
97-
handlerMode: "move"
97+
handlerMode: "hover"
9898
});
9999
map.addControl(control);
100100
}

‎examples/classic/vizLayer_animatorBase.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_animatorBase"></h
7373
})]
7474
});
7575
map.addControl(new SuperMap.Control.LayerSwitcher(), new SuperMap.Pixel(42, 80));
76-
layer = new SuperMap.Layer.CloudLayer();
76+
layer = new SuperMap.Layer.OSM("OSM");
7777

7878
map.addLayers([layer]);
7979

‎examples/classic/vizLayer_animatorLine.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_animatorLine"></h
101101
})],
102102
projection: "EPSG:3857"
103103
});
104-
layer = new SuperMap.Layer.CloudLayer();
104+
layer = new SuperMap.Layer.OSM("OSM");
105105
//初始化动画矢量图层
106106
animatorVector = new SuperMap.Layer.AnimatorVector("Train", {}, {
107107
//设置速度为每帧播放0.01小时的数据

‎examples/classic/vizLayer_animatorMetro.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_animatorMetro"></
174174
})],
175175
projection: "EPSG:3857"
176176
});
177-
layer = new SuperMap.Layer.CloudLayer();
177+
layer = new SuperMap.Layer.OSM("OSM");
178178
addLayer();
179179
}
180180

‎examples/classic/vizLayer_animatorMetro2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_animatorMetro2"><
183183
})],
184184
projection: "EPSG:3857"
185185
});
186-
layer = new SuperMap.Layer.CloudLayer();
186+
layer = new SuperMap.Layer.OSM("OSM");
187187
addLayer();
188188
map.events.on({"zoomend": showLayer});
189189
}

‎examples/classic/vizLayer_animatorPoint.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_animatorPoint"></
7373
});
7474
map.addControl(new SuperMap.Control.LayerSwitcher(), new SuperMap.Pixel(42, 80));
7575

76-
layer = new SuperMap.Layer.CloudLayer();
76+
layer = new SuperMap.Layer.OSM("OSM");
7777

7878
map.addLayers([layer]);
7979

‎examples/classic/vizLayer_cartoCSS_point.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242

4343
#lastInput {
44-
margin-left: 16px;;
44+
margin-left: 16px;
4545
}
4646
</style>
4747
</head>

‎examples/mapboxgl/addressMatchService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.panel-default {
29-
width: 20%;
29+
width: 350px;
3030
float: right;
3131
margin: 15px 15px 0 0;
3232
position: relative;

‎examples/mapboxgl/js/ThreeApplication.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ var SceneBuilder = {
151151
is3DDataLoaded = false;
152152
SceneBuilder.viewBuilder(app).build();
153153
clearInterval(slowLoopIntervalId);
154+
app.threeLayer.renderScene();
154155
}
155156
}, 500);
156157
}

‎examples/mapboxgl/threejsLayer_buildings.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,13 @@
9393
.setTargetLayer(threeLayer)
9494
.setPosition([104.071092, 30.560304])
9595
.start();
96-
setTimeout(function() {
97-
threeLayer.renderScene();
98-
}, 1000);
9996
}
10097

10198
//均匀光照，与相机位置同步
10299
threeLayer.on("render", function () {
103100
// threeLayer.light.position.copy(threeLayer.renderer.camera.position);
104101
threeLayer.light.position.set(0, 0, 0);
105102
});
106-
107103
}
108104

109105
</script>

‎examples/maplibregl/addressMatchService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.panel-default {
29-
width: 20%;
29+
width: 350px;
3030
float: right;
3131
margin: 15px 15px 0 0;
3232
position: relative;

‎examples/maplibregl/js/ThreeApplication.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ var SceneBuilder = {
151151
is3DDataLoaded = false;
152152
SceneBuilder.viewBuilder(app).build();
153153
clearInterval(slowLoopIntervalId);
154+
app.threeLayer.renderScene();
154155
}
155156
}, 500);
156157
}

‎examples/maplibregl/threejsLayer_buildings.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
.setTargetLayer(threeLayer)
9595
.setPosition([104.071092, 30.560304])
9696
.start();
97-
setTimeout(function() {
98-
threeLayer.renderScene();
99-
}, 1000);
10097
}
10198

10299
//均匀光照，与相机位置同步

‎examples/openlayers/addressMatchService.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</head>
5858
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%; position: absolute;top: 0;">
5959
<div id="map" style="width: 100%;height:100%"></div>
60-
<div id="control" class="control" style='width:20%'>
60+
<div id="control" class="control" style='width: 350px'>
6161
<div class="panel panel-default">
6262
<div class="panel-body">
6363
<ul class="nav nav-tabs nav-justified">

‎src/common/iServer/AddressMatchService.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,15 @@ export class AddressMatchService extends CommonServiceBase {
7171
if (eventId === result.result.eventId && callback) {
7272
delete result.result.eventId;
7373
callback(result);
74+
this.events.un(eventListeners);
75+
return false;
7476
}
7577
},
7678
processFailed: function(result) {
7779
if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
7880
callback(result);
81+
this.events.un(eventListeners);
82+
return false;
7983
}
8084
}
8185
}
@@ -85,16 +89,16 @@ export class AddressMatchService extends CommonServiceBase {
8589
url,
8690
params,
8791
scope: this,
88-
success(result) {
92+
success(result, options) {
8993
result.eventId = eventId;
90-
this.serviceProcessCompleted(result);
94+
this.serviceProcessCompleted(result, options);
9195
},
92-
failure(result) {
96+
failure(result, options) {
9397
if (result.error) {
9498
result.error.eventId = eventId;
9599
}
96100
result.eventId = eventId;
97-
this.serviceProcessFailed(result);
101+
this.serviceProcessFailed(result, options);
98102
}
99103
});
100104
}
@@ -103,20 +107,20 @@ export class AddressMatchService extends CommonServiceBase {
103107
* @param {Object} result - 服务器返回的结果对象。
104108
* @description 服务流程是否完成
105109
*/
106-
serviceProcessCompleted(result) {
110+
serviceProcessCompleted(result, options) {
107111
if (result.succeed) {
108112
delete result.succeed;
109113
}
110-
super.serviceProcessCompleted(result);
114+
super.serviceProcessCompleted(result, options);
111115
}
112116

113117
/**
114118
* @function AddressMatchService.prototype.serviceProcessCompleted
115119
* @param {Object} result - 服务器返回的结果对象。
116120
* @description 服务流程是否失败
117121
*/
118-
serviceProcessFailed(result) {
119-
super.serviceProcessFailed(result);
122+
serviceProcessFailed(result, options) {
123+
super.serviceProcessFailed(result, options);
120124
}
121125
}
122126

‎src/common/iServer/ChartQueryService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class ChartQueryService extends CommonServiceBase {
128128
* @description 查询完成，执行此方法。
129129
* @param {Object} result - 服务器返回的结果对象。
130130
*/
131-
serviceProcessCompleted(result) {
131+
serviceProcessCompleted(result, options) {
132132
var me = this;
133133
result = Util.transformResult(result);
134134
if (result && result.recordsets && me.format === DataFormat.GEOJSON) {
@@ -140,7 +140,7 @@ export class ChartQueryService extends CommonServiceBase {
140140
}
141141

142142
}
143-
me.events.triggerEvent("processCompleted", {result: result});
143+
me.events.triggerEvent("processCompleted", {result: result, options});
144144
}
145145

146146
/**

0 commit comments

Comments
 (0)