Skip to content

Commit 89e47a9

Browse files
Yuki-ZhaoYuki-Zhao
committed
# Conflicts: # dist/openlayers/iclient9-openlayers-es6.js # dist/openlayers/iclient9-openlayers.js # dist/openlayers/iclient9-openlayers.min.js
2 parents 1c25f22 + 80e6335 commit 89e47a9

19 files changed

+102
-33
lines changed

‎examples/leaflet/ESHeatMap.html‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<script type="text/javascript" include="mapv,elasticsearch" src="../../dist/leaflet/include-leaflet.js"></script>
2929
<script type="text/javascript">
3030
var map,
31+
stopRender,
3132
timeControl,
3233
liveESService,
3334
liveRenderer,
@@ -78,16 +79,18 @@
7879
timeControl.updateOptions(options);
7980
}
8081
timeControl.start();
82+
stopRender = false;
8183
}
8284

8385
//暂停播放
8486
function pause() {
85-
timeControl.pause();
87+
timeControl && timeControl.pause();
8688
}
8789

8890
//停止播放
8991
function stop() {
90-
timeControl.stop();
92+
stopRender = true;
93+
timeControl && timeControl.stop();
9194
clearAll();
9295
}
9396

@@ -109,7 +112,9 @@
109112
if (startT > endT) {
110113
return;
111114
}
115+
112116
var coords = wrapLatLngBounds(extent), prec;
117+
113118
if (level <= 2) {
114119
prec = 2;
115120
} else if (level > 2 && level <= 5) {
@@ -174,7 +179,7 @@
174179
console.log(error.body);
175180
return;
176181
}
177-
renderLive(response.aggregations.zoomedInView.geohash.buckets);
182+
!stopRender && renderLive(response.aggregations.zoomedInView.geohash.buckets);
178183
});
179184
}
180185

‎examples/locales/en-US/resources.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,9 @@ window.examplesResources = {
337337
"title_tiledMapLayer": "3857 Coordinate System",
338338
"title_tiledMapLayer_4326": "4326Map",
339339
"title_tiledMapLayer_4326WGS84": "Map WGS84",
340+
"title_tiledMapLayer_China2000": "Map China2000",
341+
"title_tiledMapLayer_Beijing54": "Map Beijing54",
342+
"title_tiledMapLayer_Xian80": "Map Xian80",
340343
"title_fieldService": "SuperMap Field Service",
341344
"title_fieldStatistics": "Dataset Field Statistics Service",
342345
"title_getGridCellInfos": "Data Grid Cell Query",
@@ -434,6 +437,7 @@ window.examplesResources = {
434437
"title_labelThemeLayer": "Client Label Thematic Map",
435438
"title_mapvNyvTaxi": "NY Taxi Car Points",
436439
"title_modifyFeatures": "Modify Features",
440+
"title_mvtVectorLayer_vectortilerest": "iServer REST VectorTile",
437441
"title_mvtVectorLayer": "iServer MVT VectorTile",
438442
"title_mvtVectorLayer4326": "iServer MVT VectorTile (WGS84)",
439443
"title_mvtVectorLayer_mapboxStyle": "Style Switch",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ window.examplesResources = {
280280
"title_tiledMapLayer": "3857底图",
281281
"title_tiledMapLayer_4326": "4326底图",
282282
"title_tiledMapLayer_4326WGS84": "地图_WGS84",
283+
"title_tiledMapLayer_China2000": "地图_China2000",
284+
"title_tiledMapLayer_Beijing54": "地图_Beijing54",
285+
"title_tiledMapLayer_Xian80": "地图_Xian80",
283286
"title_fieldService": "SuperMap 字段信息",
284287
"title_fieldStatistics": "字段查询统计",
285288
"title_getGridCellInfos": "栅格查询",
@@ -378,6 +381,7 @@ window.examplesResources = {
378381
"title_mapvNyvTaxi": "纽约出租车上车点",
379382
"title_modifyFeatures": "修改图形",
380383
"title_mvtVectorLayer": "iServer MVT矢量瓦片",
384+
"title_mvtVectorLayer_vectortilerest": "iServer 矢量瓦片服务",
381385
"title_mvtVectorLayer4326": "iServer MVT矢量瓦片(WGS84)",
382386
"title_mvtVectorLayer_mapboxStyle": "OSM风格(MVT WGS84)",
383387
"title_mvtVectorLayer_mapboxStyle_4326": "风格动态切换",

‎examples/mapboxgl/01_tiledMapLayer_4326.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"maxzoom": 22
6666
}]
6767
},
68-
units:'degree',
6968
crs:'EPSG:4326',// 或者 mapboxgl.CRS.EPSG4326 或者 new mapboxgl.CRS('EPSG:4326',[-180,-90,180,90]);
7069
center: [0, 0],
7170
zoom: 2

‎examples/mapboxgl/config.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,24 @@ var exampleConfig = {
867867
version: "9.1.1",
868868
thumbnail: "01_tiledMapLayer_4326.png",
869869
fileName: "01_tiledMapLayer_4326"
870+
},{
871+
name: "地图_China2000",
872+
name_en: "Map China2000",
873+
version: "9.1.1",
874+
thumbnail: "01_tiledMapLayer.png",
875+
fileName: "01_tiledMapLayer_4490"
876+
},{
877+
name: "地图_Beijing54",
878+
name_en: "Map Beijing54",
879+
version: "9.1.1",
880+
thumbnail: "01_tiledMapLayer.png",
881+
fileName: "01_tiledMapLayer_4214"
882+
},{
883+
name: "地图_Xian80",
884+
name_en: "Map Xian80",
885+
version: "9.1.1",
886+
thumbnail: "01_tiledMapLayer.png",
887+
fileName: "01_tiledMapLayer_4610"
870888
},{
871889
name: "绘图控件_WGS84",
872890
name_en: "Draw control WGS84",

‎examples/openlayers/config.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,13 @@ var exampleConfig = {
854854
localIgnore: true,
855855
thumbnail: "mvtvectorlayer_mbstyle_landuse.png",
856856
fileName: "mvtvectorlayer_mbstyle_landuse"
857+
},
858+
{
859+
name: "iServer 矢量瓦片服务",
860+
name_en: "iServer REST Vectortile",
861+
version: "9.1.1",
862+
thumbnail: "mvtvectorlayer_vectortilerest.png",
863+
fileName: "mvtvectorlayer_vectortilerest"
857864
}
858865

859866

‎examples/openlayers/iportalWebMap.html‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,44 @@
22
* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
33
*********************************************************************-->
44
<!DOCTYPE html>
5-
<html>
5+
<html style=" width: 100%;height: 100%;">
66
<head>
77
<meta charset="UTF-8">
88
<title data-i18n="resources.title_iportalWebMap"></title>
9-
<script type="text/javascript" src="../js/include-web.js"></script>
10-
<script type="text/javascript" src="../../dist/openlayers/include-openlayers.js"></script>
9+
<!-- 字体图标 -->
10+
<link rel="stylesheet" href="../../libs/openlayers/ol.css" type="text/css">
11+
<link rel="stylesheet" href="../../dist/openlayers/iclient9-openlayers.css" type="text/css">
12+
<script type="text/javascript" src="../../libs/openlayers/ol-debug.js"></script>
13+
<script type="text/javascript" src="../../dist/openlayers/iclient9-openlayers.js"></script>
14+
<script type="text/javascript" src="./webmap/geostats.js"></script>
15+
<script type="text/javascript" src="./webmap/jsonsql.js"></script>
16+
<script type="text/javascript" src="./webmap/canvg.min.js"></script>
1117
</head>
1218
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%">
1319
<div id="map" style="width: 100%;height:100%"></div>
20+
<div class="supermapol-icons-Shape-27"></div>
1421
<script type="text/javascript">
15-
new ol.supermap.WebMap(44, {server: 'http://support.supermap.com.cn:8092'});
22+
new ol.supermap.WebMap(1154664842, {
23+
server: 'http://127.0.0.1:8090/iportal/apps/viewer/1154664842',
24+
successCallback: function (map, mapInfo) {
25+
<!-- map是地图对象， mapInfo是地图的名字以及地图描述等信息 -->
26+
window.map = map;
27+
},
28+
errorCallback: function(error, tips) {
29+
//tips: getMapFaild：获取地图信息失败；getWmtsFaild：获取wmts信息失败；getLayerFaild: 获取图层信息失败；getFeatureFaild:获取feature失败
30+
console.log(error);
31+
}
32+
/* <!-- 关于地图的配置 -->
33+
mapSetting: {
34+
overlays: [
35+
],
36+
controls: ol.control.defaults({
37+
}),
38+
mapClickCallback: function (evt) {
39+
<!-- 地图点击事件回调函数 -->
40+
}
41+
}*/
42+
});
1643
</script>
1744
</body>
18-
</html>
45+

‎package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SuperMapiClient9",
33
"description": "SuperMap iClient JavaScript 是一套由 JavaScript 语言编写的 GIS 客户端应用开发包， 支持多源数据地图，支持多终端，跨浏览器， 通过本产品可快速实现浏览器上美观、流畅的地图呈现。",
4-
"version": "9.1.1",
4+
"version": "9.1.0",
55
"directories": {
66
"doc": "doc",
77
"example": "examples",
@@ -65,6 +65,8 @@
6565
"browserify": "^14.3.0",
6666
"browserify-css": "^0.11.1",
6767
"browserify-imgify": "^0.0.1",
68+
"canvg": "^1.5.3",
69+
"jsonsql": "^0.2.5",
6870
"chromedriver": "^2.32.1",
6971
"clean-css-cli": "^4.1.6",
7072
"commander": "^2.15.1",
@@ -77,6 +79,7 @@
7779
"express": "^4.16.3",
7880
"extract-text-webpack-plugin": "^4.0.0-beta.0",
7981
"file-loader": "^1.1.11",
82+
"geostats": "^1.5.0",
8083
"get-pixels": "^3.3.0",
8184
"image-size": "^0.6.1",
8285
"imports-loader": "^0.8.0",
@@ -90,7 +93,7 @@
9093
"karma-coverage": "^1.1.1",
9194
"karma-jasmine": "^1.1.0",
9295
"karma-teamcity-reporter": "^1.0.0",
93-
"mock-socket": "^8.0.5",
96+
"leaflet.pm": "^0.25.0",
9497
"nightwatch": "^0.9.5",
9598
"open": "0.0.5",
9699
"pngjs": "^3.3.0",
@@ -103,10 +106,9 @@
103106
"url-loader": "^1.0.1",
104107
"watchify": "^3.9.0",
105108
"webpack": "^4.1.1",
106-
"webpack-cli": "^2.0.12",
109+
"webpack-cli": "^3.1.2",
107110
"webpack-dev-middleware": "^3.2.0",
108-
"webpack-node-externals": "^1.6.0",
109-
"leaflet.pm": "^0.25.0"
111+
"webpack-node-externals": "^1.6.0"
110112
},
111113
"dependencies": {
112114
"@mapbox/vector-tile": "1.3.0",
@@ -116,7 +118,6 @@
116118
"elasticsearch": "13.0.1",
117119
"fetch-ie8": "1.5.0",
118120
"fetch-jsonp": "1.0.6",
119-
"jsonsql": "0.2.5",
120121
"leaflet": "1.3.1",
121122
"lodash.topairs": "4.3.0",
122123
"mapbox-gl": "0.45.0",
@@ -126,6 +127,6 @@
126127
"proj4": "2.3.15",
127128
"promise-polyfill": "6.0.2",
128129
"three": "0.92.0",
129-
"xlsx": "0.12.13"
130+
"xlsx": "^0.12.13"
130131
}
131132
}

‎src/classic/libs/SuperMap-8.1.1-16520.js‎

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

‎src/classic/libs/SuperMap.Include.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
}
2323
//加载类库资源文件
2424
function loadSMLibs() {
25-
inputScript(baseurl+'SuperMap-8.1.1-16520.js');
26-
inputScript(baseurl+'SuperMap_Plot-8.1.1-16520.js');
25+
inputScript(baseurl+'SuperMap-8.1.1-16820.js');
26+
if(!window.excludePlot){
27+
inputScript(baseurl+'SuperMap_Plot-8.1.1-16820.js');
28+
}
2729
loadLocalization();
2830
inputCSS('style.css');
2931
inputCSS('google.css');

0 commit comments

Comments
 (0)