Skip to content

Commit ded703b

Browse files
【fix】 修复examples 测试出的问题 review by zhurc
1 parent ea0a06d commit ded703b

File tree

8 files changed

+102
-102
lines changed

8 files changed

+102
-102
lines changed

examples/classic/map_3bing.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
1313
<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
1414
<script type="text/javascript">
15-
var map, osmLayer,pointVector,vector,dataAdded=false;
15+
var map, osmLayer, vector;
1616
map = new SuperMap.Map("map",{controls:[
1717
new SuperMap.Control.Navigation() ,
1818
new SuperMap.Control.Zoom(),
19-
new SuperMap.Control.LayerSwitcher(),
19+
2020
new SuperMap.Control.MousePosition()
2121
]});
2222
osmLayer = new SuperMap.Layer.Bing();
23-
vector = new SuperMap.Layer.Vector("vector");
24-
map.addLayers([osmLayer,vector]);
23+
map.addLayers([osmLayer]);
2524
map.setCenter(new SuperMap.LonLat(0, 0), 1);
2625
</script>
2726

examples/classic/others_setlayerstatus.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939

4040
.winContent {
41-
padding: 5px;
41+
padding-left: 25px;
4242
overflow-y: auto;
4343
height: 550px;
4444
}
@@ -47,8 +47,6 @@
4747
right: 20px;
4848
top: 170px;
4949
position: absolute;
50-
width: 400px;
51-
height: 600px;
5250
border: 2px solid #D6E3F1;
5351
background: #FFF;
5452
z-index: 9999;
@@ -254,7 +252,7 @@ <h5 class='panel-title text-center' data-i18n="resources.text_setlayerstatus"></
254252
str += winMessage;
255253
str += '</div>';
256254
$("#popupWin").html(str);
257-
document.getElementById("popupWin").style.width = "250px";
255+
document.getElementById("popupWin").style.width = "260px";
258256
document.getElementById("popupWin").style.height = "432px";
259257
}
260258

examples/classic/query_gridInfosQuery.html

Lines changed: 84 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*********************************************************************-->
44
<!DOCTYPE html>
55
<html>
6+
67
<head>
78
<meta charset="utf-8">
89
<title data-i18n="resources.title_gridInfosQuery"></title>
@@ -35,95 +36,98 @@
3536
}
3637
</style>
3738
</head>
39+
3840
<body>
39-
<div id="map"></div>
40-
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
41-
<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
42-
<div id="queryresult"></div>
43-
<script>
44-
var featuresOrigin = [];
45-
var map, layer, pointLayer, drawPoint,
46-
host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090",
47-
url = host + "/iserver/services/map-jingjin/rest/maps/京津地区地图",
48-
url1 = host + "/iserver/services/data-jingjin/rest/data";
49-
50-
init();
51-
52-
function init() {
53-
map = new SuperMap.Map("map", {
54-
controls: [
55-
new SuperMap.Control.LayerSwitcher()]
56-
});
57-
58-
map.events.on({
59-
"click": mapClicked
60-
});
61-
62-
//新建点矢量图层
63-
pointLayer = new SuperMap.Layer.Vector("pointLayer");
64-
65-
layer = new SuperMap.Layer.TiledDynamicRESTLayer("china", url, {transparent: true, cacheEnabled: true});
66-
layer.events.on({"layerInitialized": addLayer});
67-
}
68-
69-
function addLayer() {
70-
map.addLayers([layer, pointLayer]);
71-
map.setCenter(new SuperMap.LonLat(116.85, 39.79), 2);
72-
}
73-
74-
function query(lonlat) {
75-
if (!!lonlat) {
76-
var gridCellQueryParam = new SuperMap.REST.GetGridCellInfosParameter({
77-
datasetName: 'JingjinTerrain',
78-
dataSourceName: "Jingjin",
79-
X: lonlat.lon,
80-
Y: lonlat.lat
41+
<div id="map"></div>
42+
<script type="text/javascript" include="bootstrap,widgets.alert" src="../js/include-web.js"></script>
43+
<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
44+
<div id="queryresult"></div>
45+
<script>
46+
var featuresOrigin = [];
47+
var map, layer, pointLayer, drawPoint,
48+
host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090",
49+
url = host + "/iserver/services/map-jingjin/rest/maps/京津地区地图",
50+
url1 = host + "/iserver/services/data-jingjin/rest/data";
51+
52+
init();
53+
54+
function init() {
55+
map = new SuperMap.Map("map", {
56+
controls: [
57+
new SuperMap.Control.LayerSwitcher()]
8158
});
82-
var gridCellQueryService = new SuperMap.REST.GetGridCellInfosService(url1, {
83-
'eventListeners': {
84-
'processCompleted': querySuccess,
85-
'processFailed': queryFailed
86-
}
59+
60+
map.events.on({
61+
"click": mapClicked
8762
});
88-
gridCellQueryService.processAsync(gridCellQueryParam);
89-
} else {
90-
widgets.alert.showAlert(resources.msg_geographicPosition, false, 240);
63+
64+
//新建点矢量图层
65+
pointLayer = new SuperMap.Layer.Vector("pointLayer");
66+
67+
layer = new SuperMap.Layer.TiledDynamicRESTLayer("china", url, { transparent: true, cacheEnabled: true });
68+
layer.events.on({ "layerInitialized": addLayer });
9169
}
92-
}
93-
94-
function mapClicked(evt) {
95-
var pixel = new SuperMap.Pixel(evt.clientX, evt.clientY),
96-
lonlat = map.getLonLatFromPixel(pixel);
97-
addFeature(lonlat);
98-
query(lonlat);
99-
}
100-
101-
function addFeature(lonlat) {
102-
pointLayer.removeAllFeatures();
103-
var point = new SuperMap.Geometry.Point(lonlat.lon, lonlat.lat);
104-
var feature = new SuperMap.Feature.Vector(point);
105-
pointLayer.addFeatures([feature]);
106-
}
107-
108-
function querySuccess(evt) {
109-
var str = resources.text_gridQueryResult,
110-
result = evt.result;
111-
for (var objName in result) {
112-
if (result.hasOwnProperty(objName)) {
113-
str += "<span>" + objName + ":" + result[objName] + "</span> ";
70+
71+
function addLayer() {
72+
map.addLayers([layer, pointLayer]);
73+
map.setCenter(new SuperMap.LonLat(116.85, 39.79), 2);
74+
}
75+
76+
function query(lonlat) {
77+
if (!!lonlat) {
78+
var gridCellQueryParam = new SuperMap.REST.GetGridCellInfosParameter({
79+
datasetName: 'JingjinTerrain',
80+
dataSourceName: "Jingjin",
81+
X: lonlat.lon,
82+
Y: lonlat.lat
83+
});
84+
var gridCellQueryService = new SuperMap.REST.GetGridCellInfosService(url1, {
85+
'eventListeners': {
86+
'processCompleted': querySuccess,
87+
'processFailed': queryFailed
88+
}
89+
});
90+
gridCellQueryService.processAsync(gridCellQueryParam);
91+
} else {
92+
widgets.alert.showAlert(resources.msg_geographicPosition, false, 240);
11493
}
11594
}
116-
document.getElementById("queryresult").innerHTML = str;
117-
}
11895

119-
function queryFailed(evt) {
120-
console.log(evt);
121-
document.getElementById("queryresult").innerHTML = evt.originResult.error.errorMsg;
122-
}
96+
function mapClicked(evt) {
97+
var pixel = new SuperMap.Pixel(evt.clientX, evt.clientY),
98+
lonlat = map.getLonLatFromPixel(pixel);
99+
addFeature(lonlat);
100+
query(lonlat);
101+
}
123102

124-
widgets.alert.showAlert(resources.msg_gridQueryNote, true, 400);
103+
function addFeature(lonlat) {
104+
pointLayer.removeAllFeatures();
105+
var point = new SuperMap.Geometry.Point(lonlat.lon, lonlat.lat);
106+
var feature = new SuperMap.Feature.Vector(point);
107+
pointLayer.addFeatures([feature]);
108+
}
125109

126-
</script>
110+
function querySuccess(evt) {
111+
var str = resources.text_gridQueryResult,
112+
result = evt.result;
113+
114+
for (var objName in result) {
115+
if (result.hasOwnProperty(objName)) {
116+
117+
str += `<span>${objName}:${(result[objName] instanceof Object ? [result[objName].x, result[objName].y] : result[objName])}</span>`;
118+
}
119+
}
120+
document.getElementById("queryresult").innerHTML = str;
121+
}
122+
123+
function queryFailed(evt) {
124+
document.getElementById("queryresult").innerHTML = evt.originResult.error.errorMsg;
125+
}
126+
127+
widgets.alert.showAlert(resources.msg_gridQueryNote, true, 400);
128+
129+
</script>
127130

128131
</body>
132+
129133
</html>

examples/classic/theme_themeGraph.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_themeGraph"></h5>
3535
<script type="text/javascript" exclude="iclient-classic" src="../../dist/classic/include-classic.js"></script>
3636
<script type="text/javascript">
3737
var map, local, baseLayer, layersID, themeLayer,
38-
host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090",
38+
host = window.isLocal ? window.server : "http://iclsvr.supermap.io",
3939
url = host + "/iserver/services/map-jingjin/rest/maps/京津地区人口分布图_专题图";
4040
map = new SuperMap.Map("map", {
4141
controls: [

examples/locales/en-US/resources.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ window.examplesResources = {
465465
"title_vectorTileLayerNight": "Night Style of SuperMap REST Vector Layer",
466466
"title_vectorTileLayerNormal": "Vector Layer of SuperMap REST",
467467
"title_iportalWebMap": "SuperMap iPortal Map",
468-
"title_earthquakeHeatMapLayer": "Earthquake occurrences(2005-2016)(Classic)",
468+
"title_earthquakeHeatMapLayer": "Earthquake occurrences(2001-2014)(Classic)",
469469
"title_echartsEarthquake": "Earthquake occurrences(2005-2016)",
470470
"title_l_echartsEarthquake": "Earthquake heat map (2000-2015)",
471471
"title_lianjia": "Beijing house prices of Lianjia(2018.2)",

examples/locales/zh-CN/resources.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,23 +325,23 @@ window.examplesResources = {
325325
"title_tiledMapLayerProj4": "自定义比例尺地图",
326326
"title_interpolationAnalystServiceKriging": "空间分析-普通克吕金插值分析",
327327
"title_interpolationAnalystServiceKrigingUniversal": "空间分析-泛克吕金插值分析",
328-
"title_findMTSPPathsServiceLogistics": "网络分析服务-多旅行商分析(物流配送)",
328+
"title_findMTSPPathsServiceLogistics": "网络分析服务-旅行商分析(物流配送)",
329329
"title_findTSPPathsService": "网络分析服务-多旅行商分析(质检巡查)",
330330
"title_graphicLayer": "高效率点图层-18万纽约出租车点",
331331
"title_mb_graphicLayer": "高效率点图层",
332332
"title_graphicLayer_webgl": "高效率点图层-webgl",
333333
"title_graphicLayerClovers": "高效率点图层-三叶草",
334-
"title_graphicLayerTaxi": "高效率点图层-18万纽约出租车图片绘制",
334+
"title_graphicLayerTaxi": "18万纽约出租车-符号绘制",
335335
"title_heatMap": "热力图",
336336
"title_heatMapNY": "纽约出租车上车点热力图",
337337
"title_markerCluster": "点聚合",
338338
"title_pulse": "闪烁点",
339-
"title_geometryBatchAnalystService": "批量几何空间分析",
340-
"title_geometryOverlayBatchAnalystService": "批量叠加分析",
339+
"title_geometryBatchAnalystService": "几何对象批量空间分析",
340+
"title_geometryOverlayBatchAnalystService": "几何对象批量叠加分析",
341341
"title_tiledMapLayerNoProj": "SuperMap REST 平面投影地图",
342342
"title_AnimationFeature": "动画要素图",
343343
"title_Cluster": "聚点图",
344-
"title_graphiclayerCanvas": "canvas渲染",
344+
"title_graphiclayerCanvas": "纽约出租车18万点-canvas渲染",
345345
"title_graphiclayerWebgl": "webgl渲染",
346346
"title_baiduLayer": "百度地图",
347347
"title_changeTileVersion": "多版本缓存切换",
@@ -409,7 +409,7 @@ window.examplesResources = {
409409
"title_vectorTileLayerNight": "SuperMap REST 月夜风格矢量底图",
410410
"title_vectorTileLayerNormal": "SuperMap REST 矢量瓦片",
411411
"title_iportalWebMap": "SuperMap iPortal地图",
412-
"title_earthquakeHeatMapLayer": "2005-2016地震次数(Classic)",
412+
"title_earthquakeHeatMapLayer": "2001-2014地震次数(Classic)",
413413
"title_echartsEarthquake": "2005到2016年地震发生情况",
414414
"title_l_echartsEarthquake": "2000年到2015年地震热力图",
415415
"title_lianjia": "2018年2月北京房价信息",
@@ -438,6 +438,10 @@ window.examplesResources = {
438438
"title_spatialAnalysis": '客户端计算',
439439
"title_distributeAnalysis": '分布式分析',
440440
"title_dataServiceQuery": '数据服务查询',
441+
"title_planeModel":"飞机模型(gltf格式)",
442+
"title_flyBird":"飞鸟模型",
443+
"title_buildings":"建筑模型",
444+
"title_facility":"设施点(mtl+obj格式)",
441445

442446
"text_code": "正向匹配",
443447
"text_decode": "反向匹配",
@@ -857,7 +861,7 @@ window.examplesResources = {
857861
"text_friday": "周五",
858862
"text_saturday": "周六",
859863
"text_sunday": "周日",
860-
"text_effectScatter": "全国主要城市空气质量",
864+
"text_effectScatter": "全国主要城市空气质量图",
861865
"text_maxTemperature": "最高气温",
862866
"text_minTemperature": "最低气温",
863867
"text_nextWeekTemperature": "未来一周气温变化",

examples/openlayers/mapvQianxi.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@
316316

317317
var timeDataSet = new mapv.DataSet(timeData);
318318

319-
console.log(timeData);
320-
321319
var timeOptions = {
322320
fillStyle: 'rgba(255, 250, 250, 0.5)',
323321
zIndex: 200,

examples/openlayers/mvtvectorlayer_mbstyle_linestyle.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,7 @@
380380
lineColor.push(opacity);
381381
lineColor = "rgba(" + lineColor.join(",") + ")"
382382
var styleOption = getEditOption(jqObject);
383-
console.log(styleOption);
384383
styleOption.style.lineColor = lineColor;
385-
console.log(styleOption);
386384
changeStyle(styleOption);
387385
}
388386
});
@@ -448,7 +446,6 @@
448446

449447
// 获取图层信息
450448
function getLayerInfo(layerName, layerStyle, layerType) {
451-
// console.log(layerStyle);
452449
if (layerType !== "line") {
453450
resetStyle(borderJqObject);
454451
resetStyle(fillJqObject);

0 commit comments

Comments
 (0)