Commit 2db93af

committed

Merge branch 'master' of github.com:SuperMap/iClient-JavaScript

2 parents b06b911 + b815c5f commit 2db93afCopy full SHA for 2db93af

File tree

137 files changed

+164

-145

lines changed

dist
- mapboxgl
  - include-mapboxgl.js
- ol
  - include-ol.js
- openlayers
  - include-openlayers.js
examples
src
- mapboxgl/mapping
  - WebMap.js
- openlayers/overlay/vectortile
  - MapboxStyles.js

Some content is hidden

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

137 files changed

+164

-145

lines changed

`‎dist/mapboxgl/include-mapboxgl.js`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@`
`59`	`59`	`inputScript(libsurl + '/mapbox-gl-js/1.13.2/mapbox-gl.js');`
`60`	`60`	`}`
`61`	`61`	`if (inArray(includes, 'mapbox-gl-enhance')) {`
`62`		`- inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.css');`
`63`		`- inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js');`
	`62`	`+ inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.css');`
	`63`	`+ inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js');`
`64`	`64`	`}`
`65`	`65`	`if (inArray(includes, 'L7')) {`
`66`	`66`	`inputScript(libsurl + '/mapboxgl-l7-render/0.0.3/mapboxgl-l7-render.js');`

`‎dist/ol/include-ol.js`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,19 @@`
`55`	`55`	`var includes = (targetScript.getAttribute('include') \|\| '').split(',');`
`56`	`56`	`var excludes = (targetScript.getAttribute('exclude') \|\| '').split(',');`
`57`	`57`	`// 在线`
`58`		`- if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(excludes, 'ol')) {`
	`58`	`+ if (!inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5') && !inArray(includes,'ol-enhance')&&!inArray(excludes, 'ol')) {`
`59`	`59`	`inputCSS(libsurl + '/openlayers/10.5.0/ol.min.css');`
`60`	`60`	`inputScript(libsurl + '/openlayers/10.5.0/ol.min.js');`
`61`	`61`	`}`
`62`		`- if (inArray(includes, 'ol@4.6.5')) {`
	`62`	`+ if (!inArray(includes,'ol-enhance')&&inArray(includes, 'ol@4.6.5')) {`
`63`	`63`	`inputCSS(libsurl + '/openlayers/4.6.5/ol.css');`
`64`	`64`	`inputScript(libsurl + '/openlayers/4.6.5/ol.js');`
`65`	`65`	`}`
`66`		`- if (inArray(includes, 'ol-debug')) {`
	`66`	`+ if (inArray(includes, 'ol-enhance')) {`
	`67`	`+ inputCSS(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.min.css');`
	`68`	`+ inputScript(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.js');`
	`69`	`+ }`
	`70`	`+ if (!inArray(includes, 'ol-enhance') && inArray(includes, 'ol-debug')) {`
`67`	`71`	`inputCSS(libsurl + '/openlayers/4.6.5/ol-debug.css');`
`68`	`72`	`inputScript(libsurl + '/openlayers/4.6.5/ol-debug.js');`
`69`	`73`	`}`
`@@ -89,7 +93,7 @@`
`89`	`93`	`inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');`
`90`	`94`	`}`
`91`	`95`	`if (inArray(includes, 'ol-mapbox-style')) {`
`92`		`- inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');`
	`96`	`+ inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-7/olms.js');`
`93`	`97`	`}`
`94`	`98`	`if (inArray(includes, 'deck')) {`
`95`	`99`	`inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');`