Skip to content

Commit 0285f15

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【update】ol 升级到 6.9.0; review by luox
1 parent 1347dce commit 0285f15

File tree

10 files changed

+50
-51
lines changed

10 files changed

+50
-51
lines changed

‎dist/ol/include-ol.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5555
// 在线
5656
if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
57-
inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css');
58-
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js');
57+
inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.9.0/css/ol.css');
58+
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.9.0/build/ol.js');
5959
}
6060
if (inArray(includes, 'ol@4.6.5')) {
6161
inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');

‎dist/openlayers/include-openlayers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5555
// 在线
5656
if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
57-
inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css');
58-
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js');
57+
inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.9.0/css/ol.css');
58+
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.9.0/build/ol.js');
5959
}
6060
if (inArray(includes, 'ol@4.6.5')) {
6161
inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');

‎libs/openlayers/ol.css‎

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

‎libs/openlayers/ol.js‎

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"lodash.topairs": "4.3.0",
128128
"mapbox-gl": "1.13.1",
129129
"mapv": "2.0.62",
130-
"ol": "6.5.0",
130+
"ol": "6.9.0",
131131
"pbf": "3.2.1",
132132
"proj4": "2.7.5",
133133
"promise-polyfill": "8.2.0",

‎src/openlayers/mapping/WebMap.js‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ import WMSCapabilities from 'ol/format/WMSCapabilities';
3939
import TileGrid from 'ol/tilegrid/TileGrid';
4040
import WMTSTileGrid from 'ol/tilegrid/WMTS';
4141
import * as olGeometry from 'ol/geom';
42-
import * as olSource from 'ol/source';
42+
import Vector from 'ol/source/Vector';
43+
import XYZ from 'ol/source/XYZ';
44+
import WMTS from 'ol/source/WMTS';
45+
import TileWMS from 'ol/source/TileWMS';
4346
import Feature from 'ol/Feature';
4447
import olRenderFeature from 'ol/render/Feature';
4548
import Style from 'ol/style/Style';
@@ -1226,7 +1229,7 @@ export class WebMap extends Observable {
12261229
*/
12271230
createBingSource(layerInfo, projection) {
12281231
let url = 'https://dynamic.t0.tiles.ditu.live.com/comp/ch/{quadKey}?it=G,TW,L,LA&mkt=zh-cn&og=109&cstl=w4c&ur=CN&n=z';
1229-
return new olSource.XYZ({
1232+
return new XYZ({
12301233
wrapX: false,
12311234
projection: projection,
12321235
crossOrigin: 'anonymous',
@@ -1258,7 +1261,7 @@ export class WebMap extends Observable {
12581261
* @returns {ol/source/XYZ} xyz的source
12591262
*/
12601263
createXYZSource(layerInfo) {
1261-
return new olSource.XYZ({
1264+
return new XYZ({
12621265
url: layerInfo.url,
12631266
wrapX: false,
12641267
crossOrigin: 'anonymous'
@@ -1274,7 +1277,7 @@ export class WebMap extends Observable {
12741277
*/
12751278
createWMSSource(layerInfo) {
12761279
let that = this;
1277-
return new olSource.TileWMS({
1280+
return new TileWMS({
12781281
url: layerInfo.url,
12791282
wrapX: false,
12801283
params: {
@@ -1579,7 +1582,7 @@ export class WebMap extends Observable {
15791582
layerInfo.extent = bbox;
15801583
}
15811584
break;
1582-
}
1585+
}
15831586
}
15841587
}
15851588
}
@@ -1629,7 +1632,7 @@ export class WebMap extends Observable {
16291632

16301633
// 单位通过坐标系获取 （PS: 以前代码非4326 都默认是米）
16311634
let unit = olProj.get(this.baseProjection).getUnits();
1632-
return new olSource.WMTS({
1635+
return new WMTS({
16331636
url: layerInfo.tileUrl || layerInfo.url,
16341637
layer: layerInfo.layer,
16351638
format: layerInfo.layerFormat,
@@ -2847,7 +2850,7 @@ export class WebMap extends Observable {
28472850
let style = StyleUtils.getSymbolStyle(layerInfo.style);
28482851
return new olLayer.Vector({
28492852
style: style,
2850-
source: new olSource.Vector({
2853+
source: new Vector({
28512854
features: layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features,
28522855
wrapX: false
28532856
}),
@@ -2870,7 +2873,7 @@ export class WebMap extends Observable {
28702873
declutter: true,
28712874
styleOL: style,
28722875
labelField: labelStyle.labelField,
2873-
source: new olSource.Vector({
2876+
source: new Vector({
28742877
features: features,
28752878
wrapX: false
28762879
})
@@ -2984,7 +2987,7 @@ export class WebMap extends Observable {
29842987
}
29852988
return new olLayer.Vector({
29862989
style: newStyle,
2987-
source: new olSource.Vector({
2990+
source: new Vector({
29882991
features: layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features,
29892992
wrapX: false
29902993
})
@@ -3002,7 +3005,7 @@ export class WebMap extends Observable {
30023005
createHeatLayer(layerInfo, features) {
30033006
//因为热力图，随着过滤，需要重新计算权重
30043007
features = layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features;
3005-
let source = new olSource.Vector({
3008+
let source = new Vector({
30063009
features: features,
30073010
wrapX: false
30083011
});
@@ -3083,7 +3086,7 @@ export class WebMap extends Observable {
30833086
let styleSource = this.createUniqueSource(layerInfo, features);
30843087
let layer = new olLayer.Vector({
30853088
styleSource: styleSource,
3086-
source: new olSource.Vector({
3089+
source: new Vector({
30873090
features: layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features,
30883091
wrapX: false
30893092
})
@@ -3163,14 +3166,14 @@ export class WebMap extends Observable {
31633166
let custom = customSettings[key];
31643167
if(Util.isString(custom)) {
31653168
//兼容之前自定义只存储一个color
3166-
custom = this.getCustomSetting(style, custom, featureType);
3167-
customSettings[key] = custom;
3168-
}
3169-
3169+
custom = this.getCustomSetting(style, custom, featureType);
3170+
customSettings[key] = custom;
3171+
}
3172+
31703173
// 转化成 ol 样式
31713174
let olStyle, type = custom.type;
31723175
if(type === 'SYMBOL_POINT') {
3173-
olStyle = StyleUtils.getSymbolStyle(custom);
3176+
olStyle = StyleUtils.getSymbolStyle(custom);
31743177
} else if(type === 'SVG_POINT') {
31753178
olStyle = StyleUtils.getSVGStyle(custom);
31763179
} else if(type === 'IMAGE_POINT') {
@@ -3218,7 +3221,7 @@ export class WebMap extends Observable {
32183221
let styleSource = this.createRangeSource(layerInfo, features);
32193222
let layer = new olLayer.Vector({
32203223
styleSource: styleSource,
3221-
source: new olSource.Vector({
3224+
source: new Vector({
32223225
features: layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features,
32233226
wrapX: false
32243227
})
@@ -3398,7 +3401,7 @@ export class WebMap extends Observable {
33983401
createMarkerLayer(features) {
33993402
features && this.setEachFeatureDefaultStyle(features);
34003403
return new olLayer.Vector({
3401-
source: new olSource.Vector({
3404+
source: new Vector({
34023405
features: features,
34033406
wrapX: false
34043407
})
@@ -3418,7 +3421,7 @@ export class WebMap extends Observable {
34183421
//获取样式
34193422
style = StyleUtils.getOpenlayersStyle(layerStyle, layerInfo.featureType);
34203423

3421-
let source = new olSource.Vector({
3424+
let source = new Vector({
34223425
wrapX: false
34233426
}), labelLayer, labelSource, pathLayer, pathSource;
34243427
let layer = new olLayer.Vector({
@@ -3594,7 +3597,7 @@ export class WebMap extends Observable {
35943597
*/
35953598
createDataflowHeatSource(layerInfo) {
35963599
let that = this,
3597-
source = new olSource.Vector({
3600+
source = new Vector({
35983601
wrapX: false
35993602
});
36003603
let featureCache = {};
@@ -3751,7 +3754,7 @@ export class WebMap extends Observable {
37513754
let styleSource = this.createRankStyleSource(layerInfo, features, layerInfo.featureType);
37523755
let layer = new olLayer.Vector({
37533756
styleSource,
3754-
source: new olSource.Vector({
3757+
source: new Vector({
37553758
features: layerInfo.filterCondition ? this.getFiterFeatures(layerInfo.filterCondition, features) : features,
37563759
wrapX: false
37573760
}),
@@ -4895,7 +4898,7 @@ export class WebMap extends Observable {
48954898
version = userAgent.match(/chrome\/([\d.]+)/);
48964899
return +version[1];
48974900
}
4898-
4901+
48994902
/**
49004903
* @private
49014904
* @function ol.supermap.WebMap.prototype.addGraticule
@@ -4910,7 +4913,7 @@ export class WebMap extends Observable {
49104913
this.sendMapToUser(lens);
49114914
}
49124915
}
4913-
4916+
49144917
/**
49154918
* @private
49164919
* @function ol.supermap.WebMap.prototype.createGraticuleLayer
@@ -5032,7 +5035,7 @@ export class WebMap extends Observable {
50325035
break;
50335036
case 'el':
50345037
lang = 'el-GR';
5035-
break;
5038+
break;
50365039
case 'es':
50375040
lang = 'es-ES';
50385041
break;
@@ -5050,7 +5053,7 @@ export class WebMap extends Observable {
50505053
break;
50515054
case 'he':
50525055
lang = 'he-IL';
5053-
break;
5056+
break;
50545057
case 'hu':
50555058
lang = 'hu-HU';
50565059
break;
@@ -5071,7 +5074,7 @@ export class WebMap extends Observable {
50715074
break;
50725075
case 'ku':
50735076
lang = 'ku-IQ';
5074-
break;
5077+
break;
50755078
case 'mn':
50765079
lang = 'mn-MN';
50775080
break;
@@ -5089,10 +5092,10 @@ export class WebMap extends Observable {
50895092
break;
50905093
case 'pt':
50915094
lang = 'pt-PT';
5092-
break;
5095+
break;
50935096
case 'ru':
50945097
lang = 'ru-RU';
5095-
break;
5098+
break;
50965099
case 'sk':
50975100
lang = 'sk-SK';
50985101
break;
@@ -5110,7 +5113,7 @@ export class WebMap extends Observable {
51105113
break;
51115114
case 'tr':
51125115
lang = 'tr-TR';
5113-
break;
5116+
break;
51145117
case 'uk':
51155118
lang = 'uk-UA';
51165119
break;
@@ -5119,7 +5122,7 @@ export class WebMap extends Observable {
51195122
break;
51205123
default:
51215124
lang = 'en-US';
5122-
break;
5125+
break;
51235126
}
51245127
return lang;
51255128
}

0 commit comments

Comments
 (0)