Skip to content

Commit ec7d02b

Browse files
zhurczhurc
committed
统一示例等待加载的样式
1 parent 4849833 commit ec7d02b

File tree

4 files changed

+10
-60
lines changed

4 files changed

+10
-60
lines changed

‎examples/leaflet/12_heatMap_NY.html‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,10 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_heatMapNY"></title>
6-
<script type="text/javascript" include="bootstrap-css,jquery,papaparse" src="../js/include-web.js"></script>
7-
8-
<style>
9-
#loading {
10-
position: absolute;
11-
top: 50%;
12-
left: 50%;
13-
z-index: 800;
14-
margin-left: -130px;
15-
text-align: center;
16-
margin-top: -50px;
17-
width: 290px;
18-
padding: 10px;
19-
background: rgba(0, 0, 0, 0.5);
20-
color: whitesmoke;
21-
font-size: 16px;
22-
}
23-
</style>
6+
<script type="text/javascript" include="bootstrap-css,jquery,papaparse,widgets" src="../js/include-web.js"></script>
247
</head>
258
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
269
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
27-
<div id="loading" data-i18n="resources.text_loadingData"></div>
2810
<script type="text/javascript" include="leaflet.heat" src="../../dist/include-leaflet.js"></script>
2911
<script type="text/javascript">
3012
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
@@ -44,9 +26,10 @@
4426
//145万个点
4527
var radius = 30, opacity = 0.5;
4628
var length = 0;//需要截取示例数据的长度,0表示全部
29+
widgets.loader.showLoader();
4730
$.get('../data/nyc-taxi.csv', function (csvstr) {
31+
widgets.loader.removeLoader();
4832
var result = Papa.parse(csvstr, {skipEmptyLines: true, header: true});
49-
$("#loading").hide();
5033

5134
var heatPoints = processData(result, length);
5235
resultLayer = L.heatLayer(heatPoints, {

‎examples/leaflet/mapVLayerPoint.html‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,10 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_mapvNyvTaxi"></title>
6-
<script type="text/javascript" include="jquery,dat-gui" src="../js/include-web.js"></script>
7-
<style type="text/css">
8-
#loading {
9-
position: absolute;
10-
top: 50%;
11-
left: 50%;
12-
z-index: 800;
13-
margin-left: -130px;
14-
text-align: center;
15-
margin-top: -50px;
16-
width: 290px;
17-
padding: 10px;
18-
background: rgba(0, 0, 0, 0.5);
19-
color: whitesmoke;
20-
font-size: 16px;
21-
}
22-
23-
</style>
6+
<script type="text/javascript" include="jquery,widgets,dat-gui" src="../js/include-web.js"></script>
247
</head>
258
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
269
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
27-
<div id="loading" data-i18n="resources.text_loadingData"></div>
2810
<script type="text/javascript" include="mapv" src="../../dist/include-leaflet.js"></script>
2911
<script type="text/javascript">
3012
var map = L.map('map', {
@@ -38,9 +20,9 @@
3820
loadData();
3921

4022
function loadData() {
41-
23+
widgets.loader.showLoader();
4224
$.get('../data/nyc-taxi.csv', function (csvstr) {
43-
25+
widgets.loader.removeLoader();
4426
var options = {
4527
size: 1.5,
4628
context: 'webgl',
@@ -55,7 +37,6 @@
5537
var layer = L.supermap.mapVLayer(dataSet, options, {attributionPrefix: dataAttr});
5638

5739
layer.on('loaded', function () {
58-
$('#loading').hide();
5940
initDatGUI(layer, options)
6041
});
6142
layer.addTo(map);

‎examples/locales/zh-CN/resources.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ window.resources = {
749749
"text_deleteSuccess": "删除成功",
750750
"text_performanceLayer": "高性能标绘图层：",
751751
"text_performancePlottingLayer": "标绘图层：",
752-
"text_loadingData": "正在加载数据请稍等。。。。。。",
752+
"text_loadingData": "正在加载数据,请稍等......",
753753
"text_keyword": "关键字：",
754754
"text_queryResult": "查询结果: ",
755755
"text_propertyName": "属性名",

‎examples/openlayers/mapvNycTaxi.html‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,6 @@
77
<script type="text/javascript" include="mapv" src="../../dist/include-openlayers.js"></script>
88
<title data-i18n="resources.title_mapvNyvTaxi"></title>
99
<style type="text/css">
10-
#loading {
11-
position: absolute;
12-
top: 50%;
13-
left: 50%;
14-
margin-left: -130px;
15-
text-align: center;
16-
margin-top: -50px;
17-
width: 260px;
18-
padding: 20px;
19-
background: rgba(0, 0, 0, 0.5);
20-
color: yellow;
21-
font-size: 12pt;
22-
}
23-
2410
.ol-popup {
2511
position: absolute;
2612
top: 10px;
@@ -32,8 +18,7 @@
3218
<div id="popup" class="ol-popup" style='width:20%'>
3319
</div>
3420
<div id="map" style="width: 100%;height:100%"></div>
35-
<div id="loading" data-i18n="resources.text_loadingData"></div>
36-
<script type="text/javascript" include="jquery,dat-gui" src="../js/include-web.js"></script>
21+
<script type="text/javascript" include="jquery,widgets,dat-gui" src="../js/include-web.js"></script>
3722
<script type="text/javascript">
3823
var map = new ol.Map({
3924
target: 'map',
@@ -55,7 +40,9 @@
5540
})
5641
})
5742
}));
43+
widgets.loader.showLoader();
5844
$.get('../data/nyc-taxi.csv', function (csvstr) {
45+
widgets.loader.removeLoader();
5946
var dataSet = mapv.csv.getDataSet(csvstr);
6047

6148
dataSet.initGeometry(function (data) {
@@ -82,7 +69,6 @@
8269
var layer = new ol.layer.Image({
8370
source: new ol.source.Mapv(options)
8471
});
85-
$('#loading').hide();
8672
initDatGUI(layer, mapvOptions);
8773
map.addLayer(layer);
8874
});

0 commit comments

Comments
 (0)