Skip to content

Commit c9fff9d

Browse files
Yuki-ZhaoYuki-Zhao
committed
2 parents d6053bc + 19334ab commit c9fff9d

Some content is hidden

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

54 files changed

+70
-64
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- iClient for MapboxGL新增支持WGS84、China2000、Xian80、Beijing54等标准地理坐标系，覆盖MVT矢量瓦片、栅格瓦片、可视化图层、标绘等功能
88

99
- 需单独引用iClient对Mapbox GL JS的增强库（基于2018年10月版本v0.51.0）
10-
http://iclient.supermap.io/web/libs/mapbox-gl-js/enhancement/mapbox-gl-enhance.js
10+
http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
1111

1212
### 新增多款功能微件
1313

@@ -38,7 +38,7 @@
3838
### for MapboxGL
3939

4040
- 支持WGS84、China2000、Xian80、Beijing54等标准地理坐标系，需单独引用iClient对MapboxGL的增强库：
41-
http://iclient.supermap.io/web/libs/mapbox-gl-js/enhancement/mapbox-gl-enhance.js
41+
http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js
4242

4343
## Fixed
4444

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
function load() {
5050
var includes = (targetScript.getAttribute('include') || "").split(",");
5151
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
52-
if (!inArray(excludes, 'mapbox-gl') && !inArray(includes, 'mapbox-gl-enhance')) {
52+
if (!inArray(includes, 'mapbox-gl-enhance') && !inArray(excludes, 'mapbox-gl')) {
5353
inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.css");
5454
inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.js");
5555
}
5656
if (inArray(includes, 'mapbox-gl-enhance')) {
5757
inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/0.48.0/mapbox-gl.css");
58-
inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js/enhancement/mapbox-gl-enhance.js");
58+
inputScript("http://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/mapbox-gl-enhance.js");
5959
}
6060
if (inArray(includes, 'draw')) {
6161
inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.0.9/mapbox-gl-draw.css");

‎examples/classic/config.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var exampleConfig = {
7070
fileName: "map_3baidu"
7171

7272
}, {
73-
name: "google layer",
73+
name: "谷歌地图",
7474
name_en: "google layer",
7575
thumbnail: "map_3googlelayer.png",
7676
fileName: "map_3googlelayer"
@@ -82,7 +82,7 @@ var exampleConfig = {
8282
fileName: "map_3bing"
8383

8484
}, {
85-
name: "OSM",
85+
name: "OSM地图",
8686
name_en: "OSM layer",
8787
thumbnail: "map_3osm.png",
8888
fileName: "map_3osm"
@@ -231,7 +231,7 @@ var exampleConfig = {
231231
thumbnail: "controler_navigation.png",
232232
fileName: "controler_navigation"
233233
}, {
234-
name: "layerswitcher",
234+
name: "图层管理器",
235235
name_en: "layer switch control",
236236
thumbnail: "controler_layerswitcher.png",
237237
fileName: "controler_layerswitcher"
@@ -797,7 +797,7 @@ var exampleConfig = {
797797
thumbnail: "vizLayer_gois.png",
798798
fileName: "vizLayer_gois"
799799
}, {
800-
name: "Elements Layer 扩展",
800+
name: "要素图层扩展",
801801
name_en: "elements layer extension",
802802
thumbnail: "vizLayer_elements.png",
803803
fileName: "vizLayer_elements"

‎examples/classic/map_3bing.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>Bing Map</title>
8+
<title data-i18n="resources.title_binglayer"></title>
99
<script type="text/javascript" src="../js/include-web.js"></script>
1010
</head>
1111
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">

‎examples/classic/map_3googlelayer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>google layer</title>
8+
<title data-i18n="resources.title_googlelayer"></title>
99
</head>
1010
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1111
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>

‎examples/classic/map_3osm.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<html>
66
<head>
77
<meta charset="utf-8">
8-
<title>OSM</title>
8+
<title data-i18n="resources.title_osmlayer"></title>
99
</head>
1010
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1111
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>

‎examples/classic/plot_addfile.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_addfile"></h5></d
5858
<script>
5959
var map, local, layer, vectorLayer, control, queryBounds, markerLayer, drawFeature;
6060
var plottingLayer, plottingEdit, sitManager, ListFile, plotting;
61-
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
61+
var host = window.isLocal ? window.server : "http://iclsvr.supermap.io";
6262
var mapurl = host + "/iserver/services/map-china400/rest/maps/China_4326";
6363
var serverUrl = host + "/iserver/services/plot-jingyong/rest/plot/";
6464

‎examples/classic/plot_defaultStyle.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_defaultStyle"></h
8989
<script type="text/javascript" exclude="iclient-classic" include="iclient8c-plot" src="../../dist/classic/include-classic.js"></script>
9090
<script>
9191
var map, baseLayer, plottingLayer, drawFeature, plotting, plottingEdit;
92-
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
92+
var host = window.isLocal ? window.server : "http://iclsvr.supermap.io";
9393
var mapurl = host + "/iserver/services/map-world/rest/maps/World";
9494
var serverUrl = host + "/iserver/services/plot-jingyong/rest/plot/";
9595
init();

‎examples/classic/plot_drawGeoGraphicObject.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGeoGraphicObj
4949
<script>
5050
var map, layer, plottingEdit, lineLayer, plottingLayer,
5151
drawFeature;
52-
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
52+
var host = window.isLocal ? window.server : "http://iclsvr.supermap.io";
5353
var mapurl = host + "/iserver/services/map-world/rest/maps/World";
5454
var plotUrl = host + "/iserver/services/plot-jingyong/rest/plot/";
5555
init();

‎examples/classic/plot_drawGraphics.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_drawGraphics"></h
205205
<script>
206206
var map, plottingLayer, layer, menu1, menu2, menu3;
207207
var stylePanel;
208-
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
208+
var host = window.isLocal ? window.server : "http://iclsvr.supermap.io";
209209
var mapurl = host + "/iserver/services/map-china400/rest/maps/China_4326";
210210
var serverUrl = host + "/iserver/services/plot-jingyong/rest/plot/";
211211
var plotting;

0 commit comments

Comments
 (0)