Skip to content

Commit 2efdd3f

Browse files
yuchao-xieyuchao-xie
committed
Merge branch 'dev' of github.com:MapGIS/WebClient-JavaScript into dev
2 parents d6ee8ae + 9780343 commit 2efdd3f

File tree

10 files changed

+26
-15
lines changed

10 files changed

+26
-15
lines changed

‎.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// 'extends': ['airbnb', 'plugin:prettier/recommended'],
1414

1515
{
16-
"extends": ["airbnb", "plugin:prettier/recommended"],
16+
/* "extends": ["airbnb", "plugin:prettier/recommended"], */
1717
// 默认情况下，ESLint 会在所有父级目录里寻找配置文件，一直到根目录。如果你想要你所有项目都遵循一个特定的约定时，这将会很有用，
1818
// 但有时候会导致意想不到的结果。为了将 ESLint 限制到一个特定的项目，在你项目根目录下的 package.json 文件或者 .eslintrc.* 文件里的
1919
// eslintConfig 字段下设置 "root": true。ESLint 一旦发现配置文件中有 "root": true，它就会停止在父级目录中寻找。

‎src/mapboxgl/theme/GeoFeatureThemeLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class GeoFeatureThemeLayer extends ThemeLayer {
106106
attrs['FID'] = feature.FID;
107107
}
108108
feature.attributes = attrs;
109-
feature.LabelDot = LabelDots[i];
109+
LabelDots && LabelDots[j] && (feature.LabelDot = LabelDots[j]);
110110
me.features.push(feature);
111111
}
112112
}

‎src/mapboxgl/theme/GraphThemeLayer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class GraphThemeLayer extends ThemeLayer {
6969

7070
if (features instanceof FeatureSet) {
7171
var attrs = null;
72-
72+
var LabelDots = features.LabelDots;
7373
var attstruct = features.AttStruct;
7474
var feaArr = features.SFEleArray;
7575
if (feaArr != null && feaArr.length > 0) {
@@ -83,6 +83,7 @@ class GraphThemeLayer extends ThemeLayer {
8383
attrs["FID"] = feature.FID;
8484
}
8585
feature.attributes = attrs;
86+
LabelDots && LabelDots[j] && (feature.LabelDot = LabelDots[j]);
8687
me.features.push(feature);
8788
}
8889
}

‎src/mapboxgl/theme/Theme3DLayer.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,11 @@ class Theme3DLayer {
205205
var ring = rings[j];
206206
if (ring != null && ring.length > 0) {
207207
for (var k = 0; k < ring.length; k++) {
208+
let coordinate = new mapboxgl.LngLat(ring[k][0], ring[k][1]);
209+
let tempPoint = map.project(coordinate);
208210
data.features[i].geometry.coordinates[j][
209211
k
210-
] = this.WebMercator2lonLat(ring[k][0], ring[k][1]);
212+
] = [tempPoint.x, tempPoint.y];
211213
}
212214
}
213215
}
@@ -220,9 +222,11 @@ class Theme3DLayer {
220222
var ring = polygon[j];
221223
if (ring != null && ring.length > 0) {
222224
for (var k = 0; k < ring.length; k++) {
225+
let coordinate = new mapboxgl.LngLat(ring[k][0], ring[k][1]);
226+
let tempPoint = map.project(coordinate);
223227
data.features[i].geometry.coordinates[m][j][
224228
k
225-
] = this.WebMercator2lonLat(ring[k][0], ring[k][1]);
229+
] = [tempPoint.x, tempPoint.y];
226230
}
227231
}
228232
}

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/grade-symbol.htm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
var { protocol, ip, port } = window.webclient;
2121
var ip = `${ip}`;
2222
var port = `${port}`;
23-
var docName = 'Hubei3857';
23+
var docName = 'Hubei4326';
2424

2525
/** 初始化地图显示*/
2626
function init() {
2727
map = new mapboxgl.Map({
2828
//地图容器div的id
29+
crs: "EPSG:4326",
2930
container: 'map',
3031
center: [112.247175, 30.152892],
3132
zoom: 6,

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/graphic.htm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,14 @@
111111
var { protocol, ip, port } = window.webclient;
112112
var ip = `${ip}`;
113113
var port = `${port}`;
114-
var docName = 'Hubei3857';
114+
var docName = 'Hubei4326';
115115

116116
/** 初始化地图显示*/
117117
function init() {
118118
//地图容器
119119
map = new mapboxgl.Map({
120120
//地图容器div的id
121+
crs: "EPSG:4326",
121122
container: 'map',
122123
center: [112.247175, 30.152892],
123124
zoom: 6,

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/random.htm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@
6767
var { protocol, ip, port } = window.webclient;
6868
var ip = `${ip}`;
6969
var port = `${port}`;
70-
var docName = 'Hubei3857';
70+
var docName = 'Hubei4326';
7171
var legendView, infoView;
7272

7373
/** 初始化地图显示*/
7474
function init() {
7575
//地图容器
7676
map = new mapboxgl.Map({
7777
//地图容器div的id
78+
crs: "EPSG:4326",
7879
container: 'map',
7980
center: [112.247175, 30.152892],
8081
zoom: 6,

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/range.htm‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
var { protocol, ip, port } = window.webclient;
6868
var ip = `${ip}`;
6969
var port = `${port}`;
70-
var docName = 'Hubei3857';
70+
var docName = 'Hubei4326';
7171
var legendView, infoView;
7272

7373
/** 初始化地图显示*/
@@ -76,6 +76,7 @@
7676
//地图容器
7777
map = new mapboxgl.Map({
7878
//地图容器div的id
79+
crs: "EPSG:4326",
7980
container: 'map',
8081
center: [112.247175, 30.152892],
8182
zoom: 6,
@@ -92,7 +93,7 @@
9293

9394
function appendMapDoc() {
9495
if (map != null) {
95-
mapDocLayer = new mapboxgl.Zondy.Map.MapDocLayer('Hubei3857', {
96+
mapDocLayer = new mapboxgl.Zondy.Map.MapDocLayer(docName, {
9697
//IP地址
9798
ip: `${ip}`,
9899
//端口号
@@ -223,7 +224,7 @@
223224
document.getElementById("infoContent").innerHTML = "";
224225
document.getElementById("infoContent").innerHTML += "FID: " + fea.attributes.FID + "<br/>";
225226
document.getElementById("infoContent").innerHTML += '行政区: ' +
226-
fea.attributes['省名'] + "<br/>";
227+
fea.attributes['NAME'] + "<br/>";
227228
document.getElementById("infoContent").innerHTML += 'GDP_2011：' +
228229
parseInt(fea.attributes['GDP_2011']) + "<br/>";
229230
}

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/simple.htm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@
6767
var { protocol, ip, port } = window.webclient;
6868
var ip = `${ip}`;
6969
var port = `${port}`;
70-
var docName = 'Hubei3857';
70+
var docName = 'Hubei4326';
7171
var legendView, infoView;
7272

7373
/** 初始化地图显示*/
7474
function init() {
7575
//地图容器
7676
map = new mapboxgl.Map({
7777
//地图容器div的id
78+
crs: "EPSG:4326",
7879
container: 'map',
7980
center: [112.247175, 30.152892],
8081
zoom: 6,

‎website/public/static/demo/mapboxgl/example/client-view/clienttheme/unique.htm‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
var { protocol, ip, port } = window.webclient;
6363
var ip = `${ip}`;
6464
var port = `${port}`;
65-
var docName = 'Hubei3857';
65+
var docName = 'Hubei4326';
6666
var legendView, infoView;
6767
var tiandituKey = 'f5347cab4b28410a6e8ba5143e3d5a35';
6868

@@ -71,6 +71,7 @@
7171
//地图容器
7272
map = new mapboxgl.Map({
7373
//地图容器div的id
74+
crs: "EPSG:4326",
7475
container: 'map',
7576
center: [112.247175, 30.152892],
7677
zoom: 6,
@@ -87,7 +88,7 @@
8788

8889
function appendMapDoc() {
8990
if (map != null) {
90-
mapDocLayer = new mapboxgl.Zondy.Map.MapDocLayer('Hubei3857', {
91+
mapDocLayer = new mapboxgl.Zondy.Map.MapDocLayer(docName, {
9192
//IP地址
9293
ip: `${ip}`,
9394
//端口号
@@ -222,7 +223,7 @@
222223
if (fea) {
223224
document.getElementById('infoContent').innerHTML = '';
224225
document.getElementById('infoContent').innerHTML += 'FID: ' + fea.attributes.FID + '<br/>';
225-
document.getElementById('infoContent').innerHTML += '行政区: ' + fea.attributes['省名'] + '<br/>';
226+
document.getElementById('infoContent').innerHTML += '行政区: ' + fea.attributes['NAME'] + '<br/>';
226227
document.getElementById('infoContent').innerHTML += '分类索引：' + parseInt(fea.attributes['分类索引']) + '<br/>';
227228
}
228229
} else {

0 commit comments

Comments
 (0)