Skip to content

Commit b8c11fa

Browse files
luoxiao-supermapluoxiao-supermap
committed
[fix]ol升级到7.5.2 review by songym
1 parent 86863fa commit b8c11fa

File tree

178 files changed

+396
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+396
-226
lines changed

‎dist/ol/include-ol.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5757
// 在线
5858
if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(excludes, 'ol')) {
59-
inputCSS(libsurl + '/openlayers/6.14.1/ol.css');
60-
inputScript(libsurl + '/openlayers/6.14.1/ol.js');
59+
inputCSS(libsurl + '/openlayers/7.5.2/ol.min.css');
60+
inputScript(libsurl + '/openlayers/7.5.2/ol.js');
6161
}
6262
if (inArray(includes, 'ol@4.6.5')) {
6363
inputCSS(libsurl + '/openlayers/4.6.5/ol.css');
@@ -83,7 +83,10 @@
8383
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
8484
}
8585
if (inArray(includes, 'ol3-echarts')) {
86-
inputScript(libsurl + '/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
86+
inputScript('../../web/libs' + '/openlayers/ol3-echarts/4.0.0/ol-echarts.js');
87+
}
88+
if (inArray(includes, 'ol3-echarts@3.0.0')) {
89+
inputScript(libsurl + '/openlayers/ol3-echarts/3.0.0/ol3Echarts.min.js');
8790
}
8891
if (inArray(includes, 'ol3-echarts@1.3.6')) {
8992
inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
@@ -101,8 +104,12 @@
101104
inputScript(libsurl + '/openlayers/plugins/animatedclusterlayer/animatedclusterlayer.js');
102105
}
103106
if (inArray(includes, 'layerswitcher')) {
104-
inputCSS(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.css');
105-
inputScript(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.js');
107+
inputCSS(libsurl + '/openlayers/plugins/ol-layerswitcher/4.1.1/ol-layerswitcher.min.css');
108+
inputScript(libsurl + '/openlayers/plugins/ol-layerswitcher/4.1.1/ol-layerswitcher.min.js');
109+
}
110+
if (inArray(includes, 'layerswitcher@3.8.3')) {
111+
inputCSS(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.css');
112+
inputScript(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.js');
106113
}
107114
if (inArray(includes, 'jsonsql')) {
108115
inputScript(libsurl + '/jsonsql/0.2.5/jsonsql.min.js');

‎examples/js/tokengenerator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
window.exampleToken = "PisX2NS9DsMKnnNzs6lg5WzjwZqvH2zXcizVYuBG0L0MvPrnBafdbATturwemCbsdUMHvIfItEBVCAcgubl-UNDHMsJU_XJWanQN65xaOUj_xMCsSTkKn26WFWLgvKBy";
2-
window.iportalToken ="YDXLzgADk20EZ4PWXFn7FZ5gtydmT3GdaMt5HiBUNPlZBmafJjoce4KYZMFopVGL3K_P4BbT-MVuq2GJ6YfZJw.."
2+
window.iportalToken ="YDXLzgADk20EZ4PWXFn7FW-TvWJtAQGR4SQk3bXCkyhvv_7NhFJ8AEdyVk4BaYDO39bo4oLEC4bXorZ6qIJDxQ.."

‎examples/openlayers/01_chartService.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,15 @@ <h5 class='panel-title text-center'>
354354
url = host + "/iserver/services/map-Chart9FU/rest/maps/Chart9Fu"
355355
map = new ol.Map({
356356
target: 'map',
357-
controls: ol.control.defaults({
358-
attributionOptions: {
359-
collapsed: false
360-
}
361-
})
362-
.extend([new ol.supermap.control.Logo({
363-
link: "https://iclient.supermap.io"
364-
})]),
357+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
358+
controls: ol.control.defaults.defaults({
359+
attributionOptions: {
360+
collapsed: false
361+
}
362+
})
363+
.extend([new ol.supermap.control.Logo({
364+
link: "https://iclient.supermap.io"
365+
})]),
365366
view: new ol.View({
366367
center: [-94.9, 29.5],
367368
zoom: 13,

‎examples/openlayers/01_layerService.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
var url = (window.isLocal ? window.server : "https://iserver.supermap.io")+"/iserver/services/map-world/rest/maps/World";
6767
map = new ol.Map({
6868
target: 'map',
69-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
69+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
70+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
7071
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
7172
view: new ol.View({
7273
center: [0, 0],

‎examples/openlayers/01_layersLegend.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ <h5 class='panel-title text-center'>
8282
var url = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/map-jingjin/rest/maps/京津地区土地利用现状图";
8383
map = new ol.Map({
8484
target: 'map',
85-
controls: ol.control.defaults({
85+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
86+
controls: ol.control.defaults.defaults({
8687
attributionOptions: {
8788
collapsed: false
8889
}

‎examples/openlayers/01_mapQueryByBounds.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
url = (window.isLocal ? window.server : "https://iserver.supermap.io")+"/iserver/services/map-world/rest/maps/World";
1717
map = new ol.Map({
1818
target: 'map',
19-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
19+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
20+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
2021
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
2122
view: new ol.View({
2223
center: [0, 0],

‎examples/openlayers/01_mapQueryByDistance.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
url = (window.isLocal ? window.server : "https://iserver.supermap.io")+"/iserver/services/map-world/rest/maps/World";
1717
map = new ol.Map({
1818
target: 'map',
19-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
19+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
20+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
2021
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
2122
view: new ol.View({
2223
center: [100, 0],

‎examples/openlayers/01_mapQueryByGeometry.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
url = (window.isLocal ? window.server : "https://iserver.supermap.io")+"/iserver/services/map-world/rest/maps/World";
1717
map = new ol.Map({
1818
target: 'map',
19-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
19+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
20+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
2021
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
2122
view: new ol.View({
2223
center: [0, 0],

‎examples/openlayers/01_mapQueryBySQL.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
url = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/map-world/rest/maps/World";
1717
map = new ol.Map({
1818
target: 'map',
19-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
19+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
20+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
2021
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
2122
view: new ol.View({
2223
center: [0, 0],

‎examples/openlayers/01_mapQueryBySQL_FGB.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
url = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/map-world/rest/maps/World";
1717
map = new ol.Map({
1818
target: 'map',
19-
controls: ol.control.defaults({attributionOptions: {collapsed: false}})
19+
// ol v7版本用法为ol.control.defaults.defaults； v6版本以下用法为ol.control.defaults
20+
controls: ol.control.defaults.defaults({attributionOptions: {collapsed: false}})
2021
.extend([new ol.supermap.control.Logo({ link: "https://iclient.supermap.io" })]),
2122
view: new ol.View({
2223
center: [0, 0],

0 commit comments

Comments
 (0)