Skip to content

Commit 83880ab

Browse files
liqian7liqian7
committed
【fix】 fix UT review by songym
1 parent 026f833 commit 83880ab

File tree

6 files changed

+51
-30
lines changed

6 files changed

+51
-30
lines changed

‎dist/mapboxgl/iclient9-mapboxgl-es6.js‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74596,8 +74596,8 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7459674596
* @description 登陆窗口后添加地图图层。
7459774597
*/
7459874598
_createWebMap() {
74599-
let urlArr =this.server.split('');
74600-
if(urlArr[urlArr.length-1] !== '/'){
74599+
let urlArr = this.server.split('');
74600+
if (urlArr[urlArr.length - 1] !== '/') {
7460174601
this.server += '/';
7460274602
}
7460374603
let mapUrl = this.server + 'web/maps/' + this.mapId + '/map';
@@ -74780,7 +74780,7 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7478074780
let layerType = mapInfo.baseLayer.layerType;
7478174781
let isLabel = Boolean(mapInfo.baseLayer.labelLayerVisible);
7478274782
let labelUrl = tiandituUrls['labelUrl'];
74783-
let tiandituUrl = tiandituUrls.slice(0, -1);
74783+
let tiandituUrl = tiandituUrls['tiandituUrl'];
7478474784
this._addBaselayer(tiandituUrl, 'tianditu-layers-' + layerType)
7478574785
isLabel && this._addBaselayer([labelUrl], 'tianditu-label-layers-' + layerType)
7478674786
}
@@ -74998,18 +74998,25 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7499874998

7499974999
url += this._getParamString(options, url) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
7500075000
let tiandituUrl = url.replace("{layer}", layerType).replace("{proj}", tilematrixSet);
75001-
tiandituUrls.push(tiandituUrl);
75002-
for (let i = 1; i < 8; i++) {
75003-
tiandituUrls.push(tiandituUrl.replace(re, `t${i}`))
75001+
let tiandituUrlArr = [];
75002+
for (let i = 0; i < 8; i++) {
75003+
tiandituUrlArr.push(tiandituUrl.replace(re, `t${i}`));
7500475004
}
75005+
tiandituUrls['tiandituUrl'] = tiandituUrlArr;
75006+
7500575007
// 如果有 label 图层
7500675008
if (isLabel) {
7500775009
let labelLayer = layerLabelMap[layerType];
7500875010
options.layer = labelLayer;
7500975011
labelUrl += this._getParamString(options, labelUrl) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
7501075012
labelUrl = labelUrl.replace("{layer}", labelLayer).replace("{proj}", tilematrixSet);
75011-
tiandituUrls['labelUrl'] = labelUrl;
75013+
let labelUrlArr = [];
75014+
for (let i = 0; i < 8; i++) {
75015+
labelUrlArr.push(labelUrl.replace(re, `t${i}`));
75016+
}
75017+
tiandituUrls['labelUrl'] = labelUrlArr;
7501275018
}
75019+
7501375020
return tiandituUrls;
7501475021
}
7501575022

@@ -75632,12 +75639,12 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7563275639
}
7563375640
if (features[0].weight && features.length >= 4) {
7563475641
let weight = [];
75635-
features.forEach(item=>{
75642+
features.forEach(item => {
7563675643
weight.push(item.weight);
7563775644
})
7563875645
let max = ArrayStatistic.getMax(weight);
7563975646
let min = ArrayStatistic.getMin(weight);
75640-
paint["heatmap-weight"] = ["interpolate", ["linear"], ["get", 'weight'],min,0,max,1];
75647+
paint["heatmap-weight"] = ["interpolate", ["linear"], ["get", 'weight'], min, 0, max, 1];
7564175648
}
7564275649

7564375650
this.map.addLayer({

‎dist/mapboxgl/iclient9-mapboxgl-es6.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/iclient9-mapboxgl.js‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54054,7 +54054,7 @@ var WebMap = exports.WebMap = function (_mapboxgl$Evented) {
5405454054
var layerType = mapInfo.baseLayer.layerType;
5405554055
var isLabel = Boolean(mapInfo.baseLayer.labelLayerVisible);
5405654056
var labelUrl = tiandituUrls['labelUrl'];
54057-
var tiandituUrl = tiandituUrls.slice(0, -1);
54057+
var tiandituUrl = tiandituUrls['tiandituUrl'];
5405854058
this._addBaselayer(tiandituUrl, 'tianditu-layers-' + layerType);
5405954059
isLabel && this._addBaselayer([labelUrl], 'tianditu-label-layers-' + layerType);
5406054060
}
@@ -54297,18 +54297,25 @@ var WebMap = exports.WebMap = function (_mapboxgl$Evented) {
5429754297

5429854298
url += this._getParamString(options, url) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
5429954299
var tiandituUrl = url.replace("{layer}", layerType).replace("{proj}", tilematrixSet);
54300-
tiandituUrls.push(tiandituUrl);
54301-
for (var i = 1; i < 8; i++) {
54302-
tiandituUrls.push(tiandituUrl.replace(re, 't' + i));
54300+
var tiandituUrlArr = [];
54301+
for (var i = 0; i < 8; i++) {
54302+
tiandituUrlArr.push(tiandituUrl.replace(re, 't' + i));
5430354303
}
54304+
tiandituUrls['tiandituUrl'] = tiandituUrlArr;
54305+
5430454306
// 如果有 label 图层
5430554307
if (isLabel) {
5430654308
var labelLayer = layerLabelMap[layerType];
5430754309
options.layer = labelLayer;
5430854310
labelUrl += this._getParamString(options, labelUrl) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
5430954311
labelUrl = labelUrl.replace("{layer}", labelLayer).replace("{proj}", tilematrixSet);
54310-
tiandituUrls['labelUrl'] = labelUrl;
54312+
var labelUrlArr = [];
54313+
for (var _i3 = 0; _i3 < 8; _i3++) {
54314+
labelUrlArr.push(labelUrl.replace(re, 't' + _i3));
54315+
}
54316+
tiandituUrls['labelUrl'] = labelUrlArr;
5431154317
}
54318+
5431254319
return tiandituUrls;
5431354320
}
5431454321

@@ -55302,8 +55309,8 @@ var WebMap = exports.WebMap = function (_mapboxgl$Evented) {
5530255309
// feature 构建后期支持坐标系 4326/3857
5530355310
var features = [];
5530455311

55305-
for (var _i3 = 0, _len = dataContent.rows.length; _i3 < _len; _i3++) {
55306-
var row = dataContent.rows[_i3];
55312+
for (var _i4 = 0, _len = dataContent.rows.length; _i4 < _len; _i4++) {
55313+
var row = dataContent.rows[_i4];
5530755314

5530855315
var x = Number(row[xfieldIndex]),
5530955316
y = Number(row[yfieldIndex]);
@@ -55325,9 +55332,9 @@ var WebMap = exports.WebMap = function (_mapboxgl$Evented) {
5532555332
var attributes = {};
5532655333
for (var index in dataContent.colTitles) {
5532755334
var key = dataContent.colTitles[index];
55328-
attributes[key] = dataContent.rows[_i3][index];
55335+
attributes[key] = dataContent.rows[_i4][index];
5532955336
}
55330-
attributes['index'] = _i3 + '';
55337+
attributes['index'] = _i4 + '';
5533155338
//目前csv 只支持处理点，所以先生成点类型的 geojson
5533255339
var feature = {
5533355340
"type": "Feature",

‎dist/mapboxgl/iclient9-mapboxgl.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/mapboxgl/mapping/WebMap.js‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export class WebMap extends mapboxgl.Evented {
7474
* @description 登陆窗口后添加地图图层。
7575
*/
7676
_createWebMap() {
77-
let urlArr =this.server.split('');
78-
if(urlArr[urlArr.length-1] !== '/'){
77+
let urlArr = this.server.split('');
78+
if (urlArr[urlArr.length - 1] !== '/') {
7979
this.server += '/';
8080
}
8181
let mapUrl = this.server + 'web/maps/' + this.mapId + '/map';
@@ -258,7 +258,7 @@ export class WebMap extends mapboxgl.Evented {
258258
let layerType = mapInfo.baseLayer.layerType;
259259
let isLabel = Boolean(mapInfo.baseLayer.labelLayerVisible);
260260
let labelUrl = tiandituUrls['labelUrl'];
261-
let tiandituUrl = tiandituUrls.slice(0, -1);
261+
let tiandituUrl = tiandituUrls['tiandituUrl'];
262262
this._addBaselayer(tiandituUrl, 'tianditu-layers-' + layerType)
263263
isLabel && this._addBaselayer([labelUrl], 'tianditu-label-layers-' + layerType)
264264
}
@@ -476,18 +476,25 @@ export class WebMap extends mapboxgl.Evented {
476476

477477
url += this._getParamString(options, url) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
478478
let tiandituUrl = url.replace("{layer}", layerType).replace("{proj}", tilematrixSet);
479-
tiandituUrls.push(tiandituUrl);
480-
for (let i = 1; i < 8; i++) {
481-
tiandituUrls.push(tiandituUrl.replace(re, `t${i}`))
479+
let tiandituUrlArr = [];
480+
for (let i = 0; i < 8; i++) {
481+
tiandituUrlArr.push(tiandituUrl.replace(re, `t${i}`));
482482
}
483+
tiandituUrls['tiandituUrl'] = tiandituUrlArr;
484+
483485
// 如果有 label 图层
484486
if (isLabel) {
485487
let labelLayer = layerLabelMap[layerType];
486488
options.layer = labelLayer;
487489
labelUrl += this._getParamString(options, labelUrl) + '&tilematrix={z}&tilerow={y}&tilecol={x}';
488490
labelUrl = labelUrl.replace("{layer}", labelLayer).replace("{proj}", tilematrixSet);
489-
tiandituUrls['labelUrl'] = labelUrl;
491+
let labelUrlArr = [];
492+
for (let i = 0; i < 8; i++) {
493+
labelUrlArr.push(labelUrl.replace(re, `t${i}`));
494+
}
495+
tiandituUrls['labelUrl'] = labelUrlArr;
490496
}
497+
491498
return tiandituUrls;
492499
}
493500

@@ -1110,12 +1117,12 @@ export class WebMap extends mapboxgl.Evented {
11101117
}
11111118
if (features[0].weight && features.length >= 4) {
11121119
let weight = [];
1113-
features.forEach(item=>{
1120+
features.forEach(item => {
11141121
weight.push(item.weight);
11151122
})
11161123
let max = ArrayStatistic.getMax(weight);
11171124
let min = ArrayStatistic.getMin(weight);
1118-
paint["heatmap-weight"] = ["interpolate", ["linear"], ["get", 'weight'],min,0,max,1];
1125+
paint["heatmap-weight"] = ["interpolate", ["linear"], ["get", 'weight'], min, 0, max, 1];
11191126
}
11201127

11211128
this.map.addLayer({

‎test/common/widgets/chart/ChartViewModelSpec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ChartViewModel } from '../../../../src/common/widgets/chart/ChartView';
1+
import { ChartViewModel } from '../../../../src/common/widgets/chart/ChartViewModel';
22
import '../../../resources/FeatureService';
33

44
describe('ChartViewModel', () => {

0 commit comments

Comments
 (0)