Skip to content

Commit e5e0296

Browse files
author
caoxinke@supermap.com
committed
fix ElasticSearch例子IE下兼容性的问题。
1 parent 38c861f commit e5e0296

File tree

2 files changed

+73
-70
lines changed

2 files changed

+73
-70
lines changed

‎examples/leaflet/ESHeatMap.html‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>热力/格网图</title>
6-
<script type="text/javascript" include="jquery,bootstrap,moment,bootstrap-datetimepicker,bootstrap-select,geohash" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="jquery,bootstrap,moment,bootstrap-datetimepicker,bootstrap-select,geohash"
7+
src="../js/include-web.js"></script>
78
<style>
89
.bootstrap-select {
910
width: 168px !important;
@@ -23,14 +24,14 @@
2324
<script type="text/javascript" include="mapv,elasticsearch" src="../../dist/include-leaflet.js"></script>
2425
<script type="text/javascript">
2526
var map,
26-
timeControl,
27-
liveESService,
28-
liveRenderer,
29-
liveDataSet,
30-
geoFenceLayer,
31-
dataUrl = "http://117.122.248.69:9200",
32-
info = L.control({position: 'bottomleft'}),
33-
layerOptions = getGridOptions();
27+
timeControl,
28+
liveESService,
29+
liveRenderer,
30+
liveDataSet,
31+
geoFenceLayer,
32+
dataUrl = "http://117.122.248.69:9200",
33+
info = L.control({position: 'bottomleft'}),
34+
layerOptions = getGridOptions();
3435

3536
init();
3637

@@ -39,8 +40,8 @@
3940
info.onAdd = function () {
4041
var popup = L.DomUtil.create('div');
4142
popup.innerHTML = "<div class='btn-group' role='group' aria-label='...'>" +
42-
"<button value='grid' type='button' class='btn btn-default'>格网图</button>" +
43-
"<button value='heatmap' type='button' class='btn btn-default'>热力图</button></div>"
43+
"<button value='grid' type='button' class='btn btn-default'>格网图</button>" +
44+
"<button value='heatmap' type='button' class='btn btn-default'>热力图</button></div>"
4445
handleMapEvent(popup, map);
4546
return popup;
4647
};
@@ -298,8 +299,8 @@
298299
function getControlOptions() {
299300
var startTime = $("#startTime").val();
300301
var endTime = $("#endTime").val();
301-
startTime = Date.parse(new Date(startTime));
302-
endTime = Date.parse(new Date(endTime));
302+
startTime = new Date(Date.parse(startTime.replace(/-/g, "/"))).getTime();
303+
endTime = new Date(Date.parse(endTime.replace(/-/g, "/"))).getTime();
303304
var speed = $("#speed").val();
304305
speed = (speed > 0) ? speed : 1000;
305306
speed = parseInt(speed);
@@ -345,7 +346,7 @@
345346
var attr = 'Data © <a href="https://www.elastic.co/products/elasticsearch" target="_blank">Elasticsearch</a> Map Data <span>© <a href="http://support.supermap.com.cn/product/iServer.aspx" target="_blank">SuperMap iServer</a></span> with <span>© <a href="http://iclient.supermap.io" target="_blank">SuperMap iClient</a></span>';
346347
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
347348
var url = host + "/iserver/services/map-china400/rest/maps/ChinaDark";
348-
L.supermap.tiledMapLayer(url,{attribution:attr}).addTo(map);
349+
L.supermap.tiledMapLayer(url, {attribution: attr}).addTo(map);
349350
}
350351

351352
initTimeControlView();
@@ -359,8 +360,8 @@
359360
me._div = L.DomUtil.create('div', 'panel panel-primary controlPane');
360361
me._div.style.width = "300px";
361362
var titleDiv = $("<div class='panel-heading text-center' id='toggle' style='cursor: pointer'>" +
362-
"<span class='panel-title text-center'>控制台</span>&nbsp;" +
363-
"<span class='glyphicon glyphicon-triangle-top' id='toggleIcon' ></span></div>").appendTo(me._div);
363+
"<span class='panel-title text-center'>控制台</span>&nbsp;" +
364+
"<span class='glyphicon glyphicon-triangle-top' id='toggleIcon' ></span></div>").appendTo(me._div);
364365

365366
var contentDiv = $("<div class='panel-body content center-block' style='font-size: 14px'></div>").appendTo(me._div);
366367

@@ -369,30 +370,30 @@
369370
var defaultOption = getDefaultControlOptions();
370371

371372
$("<div class='form-group form-inline'><label class='text-right' for='startTime' >起始时间</label>" +
372-
"<input id='startTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.startTime +
373-
"' value='" + defaultOption.startTime + "'/></div></div>").appendTo(optionsDiv);
373+
"<input id='startTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.startTime +
374+
"' value='" + defaultOption.startTime + "'/></div></div>").appendTo(optionsDiv);
374375

375376
$("<div class='form-group form-inline'><label class='text-right' for='endTime' >终止时间</label>" +
376-
"<input id='endTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.endTime +
377-
"' value='" + defaultOption.endTime + "'/></div></div>").appendTo(optionsDiv);
377+
"<input id='endTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.endTime +
378+
"' value='" + defaultOption.endTime + "'/></div></div>").appendTo(optionsDiv);
378379

379380
$("<div class='form-group form-inline'><label class='text-right' for='speed' >刷新步长(ms)</label>" +
380-
"<input id='speed' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.speed +
381-
"' value='" + defaultOption.speed + "'/></div></div>").appendTo(optionsDiv);
381+
"<input id='speed' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.speed +
382+
"' value='" + defaultOption.speed + "'/></div></div>").appendTo(optionsDiv);
382383

383384
$("<div class='form-group form-inline'><label class='text-right' for='frequency' >刷新频率(ms)</label>" +
384-
"<input id='frequency' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.frequency +
385-
"' value='" + defaultOption.frequency + "'/></div></div>").appendTo(optionsDiv);
385+
"<input id='frequency' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.frequency +
386+
"' value='" + defaultOption.frequency + "'/></div></div>").appendTo(optionsDiv);
386387

387388
var progressDiv = $("<div class='form-group'><div class='form-horizontal text-center'><div class='form-group'>" +
388-
"<label for='progress'>当前时间：</label><span class='form-control-static' id='progress'>未开始</span>" +
389-
"</div></div></div>").appendTo(contentDiv);
389+
"<label for='progress'>当前时间：</label><span class='form-control-static' id='progress'>未开始</span>" +
390+
"</div></div></div>").appendTo(contentDiv);
390391

391392
var controlDiv = $("<section><div class='form-inline text-center'>" +
392-
"<input id='start' type='button' class='btn btn-default text-center' value='开始'/>&nbsp;" +
393-
"<input id='pause' type='button' class='btn btn-default text-center' value='暂停'/>&nbsp;" +
394-
"<input id='stop' type='button' class='btn btn-default text-center' value='停止'/>" +
395-
"</div></section>").appendTo(contentDiv);
393+
"<input id='start' type='button' class='btn btn-default text-center' value='开始'/>&nbsp;" +
394+
"<input id='pause' type='button' class='btn btn-default text-center' value='暂停'/>&nbsp;" +
395+
"<input id='stop' type='button' class='btn btn-default text-center' value='停止'/>" +
396+
"</div></section>").appendTo(contentDiv);
396397

397398

398399
me._div.addEventListener('mouseover', function () {

‎examples/leaflet/PlanesMonitor.html‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>航班监控</title>
6-
<script type="text/javascript" include="jquery,bootstrap,moment,bootstrap-datetimepicker,bootstrap-select,geohash,randomcolor" src="../js/include-web.js"></script>
6+
<script type="text/javascript"
7+
include="jquery,bootstrap,moment,bootstrap-datetimepicker,bootstrap-select,geohash,randomcolor"
8+
src="../js/include-web.js"></script>
79
<style>
810
.bootstrap-select {
911
width: 168px !important;
@@ -24,17 +26,17 @@
2426
<script type="text/javascript">
2527
var map;
2628
var timeControl,
27-
liveESService,//实时点查询的ESService
28-
trackESService,//历史轨迹查询的ESService
29-
liveRenderer,//实时点层
30-
trackRenderer,//历史轨迹层
31-
liveDataSet,//渲染用实时点数据集
32-
trackDataSet,//渲染用历史轨迹线数据集
33-
planeStyles,
34-
planeLabels,//航班信息提示框集合
35-
geoFenceLabels,//地理围栏信息提示框集合
36-
geoFenceLayer,
37-
dataUrl = "http://117.122.248.69:9200";
29+
liveESService,//实时点查询的ESService
30+
trackESService,//历史轨迹查询的ESService
31+
liveRenderer,//实时点层
32+
trackRenderer,//历史轨迹层
33+
liveDataSet,//渲染用实时点数据集
34+
trackDataSet,//渲染用历史轨迹线数据集
35+
planeStyles,
36+
planeLabels,//航班信息提示框集合
37+
geoFenceLabels,//地理围栏信息提示框集合
38+
geoFenceLayer,
39+
dataUrl = "http://117.122.248.69:9200";
3840

3941
var flightIdens = [
4042
'CCA4189', 'CCA4187', 'CBJ5531', 'CSC8747', 'TBA9879',
@@ -262,9 +264,9 @@
262264
var content = data[i].content;
263265
var latlng = L.latLng(content.y, content.x);
264266
var labelContent = "航班： " + content.ident + "<br>" +
265-
"始发地： " + content.origin + "/" + content.originLabel + "<br>" +
266-
"目的地： " + content.destination + "/" + content.destinationLabel + "<br>" +
267-
"时间： " + content.datetime;
267+
"始发地： " + content.origin + "/" + content.originLabel + "<br>" +
268+
"目的地： " + content.destination + "/" + content.destinationLabel + "<br>" +
269+
"时间： " + content.datetime;
268270
if (!planeLabels[content.ident]) {
269271
planeLabels[content.ident] = L.popup({
270272
closeOnClick: false,
@@ -337,8 +339,8 @@
337339
function getControlOptions() {
338340
var startTime = $("#startTime").val();
339341
var endTime = $("#endTime").val();
340-
startTime = Date.parse(new Date(startTime));
341-
endTime = Date.parse(new Date(endTime));
342+
startTime = new Date(Date.parse(startTime.replace(/-/g, "/"))).getTime();
343+
endTime = new Date(Date.parse(endTime.replace(/-/g, "/"))).getTime();
342344
var speed = $("#speed").val();
343345
speed = (speed > 0) ? speed : 1000;
344346
speed = parseInt(speed);
@@ -407,7 +409,7 @@
407409
var attr = 'Data © <a href="https://www.elastic.co/products/elasticsearch" target="_blank">Elasticsearch</a> Map Data <span>© <a href="http://support.supermap.com.cn/product/iServer.aspx" target="_blank">SuperMap iServer</a></span> with <span>© <a href="http://iclient.supermap.io" target="_blank">SuperMap iClient</a></span>';
408410
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
409411
var url = host + "/iserver/services/map-china400/rest/maps/ChinaDark";
410-
L.supermap.tiledMapLayer(url,{attribution:attr}).addTo(map);
412+
L.supermap.tiledMapLayer(url, {attribution: attr}).addTo(map);
411413
}
412414

413415
initTimeControlView();
@@ -422,18 +424,18 @@
422424
me._div = L.DomUtil.create('div', 'panel panel-primary controlPane');
423425
me._div.style.width = "300px";
424426
var titleDiv = $("<div class='panel-heading text-center' id='toggle' style='cursor: pointer'>" +
425-
"<span class='panel-title text-center'>控制台</span>&nbsp;" +
426-
"<span class='glyphicon glyphicon-triangle-top' id='toggleIcon' ></span></div>").appendTo(me._div);
427+
"<span class='panel-title text-center'>控制台</span>&nbsp;" +
428+
"<span class='glyphicon glyphicon-triangle-top' id='toggleIcon' ></span></div>").appendTo(me._div);
427429

428430
var contentDiv = $("<div class='panel-body content center-block' style='font-size: 14px'></div>").appendTo(me._div);
429431

430432
var optionsDiv = $("<div class='' id='options'></div>").appendTo(contentDiv);
431433

432434
$("<div class='form-group'><label class='text-right' for='flightIds' >" +
433-
"航班号<span style='color:red'>*</span></label>" +
434-
"<select class='selectpicker ' id='flightIds' multiple data-actions-box='true' title='请选择'>" +
435-
initSelectOpitons() +
436-
"</select></div><hr/>").appendTo(optionsDiv);
435+
"航班号<span style='color:red'>*</span></label>" +
436+
"<select class='selectpicker ' id='flightIds' multiple data-actions-box='true' title='请选择'>" +
437+
initSelectOpitons() +
438+
"</select></div><hr/>").appendTo(optionsDiv);
437439

438440
function initSelectOpitons() {
439441
var str = '';
@@ -451,34 +453,34 @@
451453
var defaultOption = getDefaultControlOptions();
452454
var defaultGeoFence = getDefaultGeoFence();
453455
$("<div class='form-group form-inline'><label class='text-right' for='geoFence' >地理围栏</label>" +
454-
"<input id='geoFence' type='text' class='form-control input-sm' placeholder='" + JSON.stringify(defaultGeoFence) +
455-
"' value='" + JSON.stringify(defaultGeoFence) + "'/></div></div><hr/>").appendTo(optionsDiv);
456+
"<input id='geoFence' type='text' class='form-control input-sm' placeholder='" + JSON.stringify(defaultGeoFence) +
457+
"' value='" + JSON.stringify(defaultGeoFence) + "'/></div></div><hr/>").appendTo(optionsDiv);
456458

457459
$("<div class='form-group form-inline'><label class='text-right' for='startTime' >起始时间<span style='color:red'>*</span></label>" +
458-
"<input id='startTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.startTime +
459-
"' value='" + defaultOption.startTime + "'/></div></div>").appendTo(optionsDiv);
460+
"<input id='startTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.startTime +
461+
"' value='" + defaultOption.startTime + "'/></div></div>").appendTo(optionsDiv);
460462

461463
$("<div class='form-group form-inline'><label class='text-right' for='endTime' >终止时间<span style='color:red'>*</span></label>" +
462-
"<input id='endTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.endTime +
463-
"' value='" + defaultOption.endTime + "'/></div></div>").appendTo(optionsDiv);
464+
"<input id='endTime' type='text' class='form-control input-sm' placeholder='" + defaultOption.endTime +
465+
"' value='" + defaultOption.endTime + "'/></div></div>").appendTo(optionsDiv);
464466

465467
$("<div class='form-group form-inline'><label class='text-right' for='speed' >刷新步长(ms)</label>" +
466-
"<input id='speed' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.speed +
467-
"' value='" + defaultOption.speed + "'/></div></div>").appendTo(optionsDiv);
468+
"<input id='speed' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.speed +
469+
"' value='" + defaultOption.speed + "'/></div></div>").appendTo(optionsDiv);
468470

469471
$("<div class='form-group form-inline'><label class='text-right' for='frequency' >刷新频率(ms)</label>" +
470-
"<input id='frequency' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.frequency +
471-
"' value='" + defaultOption.frequency + "'/></div></div>").appendTo(optionsDiv);
472+
"<input id='frequency' type='number' min='1' class='form-control input-sm' placeholder='" + defaultOption.frequency +
473+
"' value='" + defaultOption.frequency + "'/></div></div>").appendTo(optionsDiv);
472474

473475
var progressDiv = $("<div class='form-group'><div class='form-horizontal text-center'><div class='form-group'>" +
474-
"<label for='progress'>当前时间：</label><span class='form-control-static' id='progress'>未开始</span>" +
475-
"</div></div></div>").appendTo(contentDiv);
476+
"<label for='progress'>当前时间：</label><span class='form-control-static' id='progress'>未开始</span>" +
477+
"</div></div></div>").appendTo(contentDiv);
476478

477479
var controlDiv = $("<section><div class='form-inline text-center'>" +
478-
"<input id='start' type='button' class='btn btn-default text-center' value='开始'/>&nbsp;" +
479-
"<input id='pause' type='button' class='btn btn-default text-center' value='暂停'/>&nbsp;" +
480-
"<input id='stop' type='button' class='btn btn-default text-center' value='停止'/>" +
481-
"</div></section>").appendTo(contentDiv);
480+
"<input id='start' type='button' class='btn btn-default text-center' value='开始'/>&nbsp;" +
481+
"<input id='pause' type='button' class='btn btn-default text-center' value='暂停'/>&nbsp;" +
482+
"<input id='stop' type='button' class='btn btn-default text-center' value='停止'/>" +
483+
"</div></section>").appendTo(contentDiv);
482484

483485

484486
me._div.addEventListener('mouseover', function () {

0 commit comments

Comments
 (0)