8000 【update】 ol 回退到 6.5.0; review by luox · SuperMap/iClient-JavaScript@9958d33 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9958d33

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【update】 ol 回退到 6.5.0; review by luox
1 parent 3713742 commit 9958d33

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
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.6.1/css/ol.css');
58-
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/build/ol.js');
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');
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.6.1/css/ol.css');
58-
inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.6.1/build/ol.js');
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');
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: 8 additions & 2 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.6.1",
130+
"ol": "6.5.0",
131131
"pbf": "3.2.1",
132132
"proj4": "2.7.5",
133133
"promise-polyfill": "8.2.0",

‎src/openlayers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@turf/turf": "6.5.0",
1818
"echarts": "4.9.0",
1919
"mapv": "2.0.62",
20-
"ol": "6.6.1",
20+
"ol": "6.5.0",
2121
"@supermap/iclient-common": "10.2.0",
2222
"proj4": "2.7.5",
2323
"xlsx": "0.17.2",

‎test/openlayers/core/StyleUtilsSpec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,12 @@ describe('openlayers_StyleUtils', () => {
311311
expect(imageStyle.getImage()).not.toBeNull();
312312
var size = imageStyle.getSize();
313313
expect(size).not.toBeNull();
314-
expect(size[0]).toBe(7);
315-
expect(size[1]).toBe(7);
314+
expect(size[0]).toBe(9);
315+
expect(size[1]).toBe(9);
316316
var anchor = imageStyle.getAnchor();
317317
expect(anchor).not.toBeNull();
318-
expect(anchor[0]).toBe(3.5);
319-
expect(anchor[1]).toBe(3.5);
318+
expect(anchor[0]).toBe(4.5);
319+
expect(anchor[1]).toBe(4.5);
320320
var stroke = imageStyle.getStroke();
321321
expect(stroke).not.toBeNull();
322322
expect(stroke.getColor()).toBe("#c33");
@@ -512,4 +512,4 @@ var requestFeature = (url) => {
512512
features = tileFormat.readFeatures(Util.toGeoJSON(features));
513513
return features;
514514
});
515-
}
515+
}

0 commit comments

Comments
 (0)
0