【update】 ol 回退到 6.5.0; review by luox · SuperMap/iClient-JavaScript@9958d33 · GitHub

SuperMap / iClient-JavaScript Public

• Notifications You must be signed in to change notification settings
• Fork 288
• Star 906

• Code
• Issues 5
• Pull requests 14
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 9958d33

Browse filesBrowse the repository at this point in the historyBrowse files

xiongjiaojiao

committed

【update】 ol 回退到 6.5.0; review by luox

1 parent 3713742 commit 9958d33
Copy full SHA for 9958d33

7 files changed

+20-14Lines changed: 20 additions & 14 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• dist
  • ol
    • include-ol.js
  • openlayers
    • include-openlayers.js
• libs/openlayers
  • ol.css
  • ol.js
• package.json
• src/openlayers
  • package.json
• test/openlayers/core
  • StyleUtilsSpec.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎dist/ol/include-ol.js‎

Copy file name to clipboardExpand all lines: dist/ol/include-ol.js

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -54,8 +54,8 @@
54	54	var excludes = (targetScript.getAttribute('exclude') || '').split(',');
55	55	// 在线
56	56	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');
59	59	}
60	60	if (inArray(includes, 'ol@4.6.5')) {
61	61	inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');

Collapse file

‎dist/openlayers/include-openlayers.js‎

Copy file name to clipboardExpand all lines: dist/openlayers/include-openlayers.js

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -54,8 +54,8 @@
54	54	var excludes = (targetScript.getAttribute('exclude') || '').split(',');
55	55	// 在线
56	56	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');
59	59	}
60	60	if (inArray(includes, 'ol@4.6.5')) {
61	61	inputCSS('https://cdn.bootcdn.net/ajax/libs/openlayers/4.6.5/ol.css');

Collapse file

‎libs/openlayers/ol.css‎

Copy file name to clipboardExpand all lines: libs/openlayers/ol.css

+1-1Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

‎libs/openlayers/ol.js‎

Copy file name to clipboardExpand all lines: libs/openlayers/ol.js

+8-2Lines changed: 8 additions & 2 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

‎package.json‎

Copy file name to clipboardExpand all lines: package.json

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -127,7 +127,7 @@
127	127	"lodash.topairs": "4.3.0",
128	128	"mapbox-gl": "1.13.1",
129	129	"mapv": "2.0.62",
130		- "ol": "6.6.1",
	130	+ "ol": "6.5.0",
131	131	"pbf": "3.2.1",
132	132	"proj4": "2.7.5",
133	133	"promise-polyfill": "8.2.0",

Collapse file

‎src/openlayers/package.json‎

Copy file name to clipboardExpand all lines: src/openlayers/package.json

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@
17	17	"@turf/turf": "6.5.0",
18	18	"echarts": "4.9.0",
19	19	"mapv": "2.0.62",
20		- "ol": "6.6.1",
	20	+ "ol": "6.5.0",
21	21	"@supermap/iclient-common": "10.2.0",
22	22	"proj4": "2.7.5",
23	23	"xlsx": "0.17.2",

Collapse file

‎test/openlayers/core/StyleUtilsSpec.js‎

Copy file name to clipboardExpand all lines: test/openlayers/core/StyleUtilsSpec.js

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -311,12 +311,12 @@ describe('openlayers_StyleUtils', () => {
311	311	expect(imageStyle.getImage()).not.toBeNull();
312	312	var size = imageStyle.getSize();
313	313	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);
316	316	var anchor = imageStyle.getAnchor();
317	317	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);
320	320	var stroke = imageStyle.getStroke();
321	321	expect(stroke).not.toBeNull();
322	322	expect(stroke.getColor()).toBe("#c33");
@@ -512,4 +512,4 @@ var requestFeature = (url) => {
512	512	features = tileFormat.readFeatures(Util.toGeoJSON(features));
513	513	return features;
514	514	});
515		- }
	515	+ }

0 commit comments

Comments

0 (0)