修改openlayers对接tianditu

songyumeng · songyumeng · commit fcd1b35c0eb8 · 2017-04-21T20:02:04.000+08:00
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -2817,7 +2817,6 @@
 	            html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
 	        });
 
-	    var crossOrigin = options.crossOrigin || 'anonymous';
 	    if (!options.url && !options.urls) {
 	        options.url = "http://t{0-7}.tianditu.com/img_w/wmts"
 	    }
@@ -2831,7 +2830,7 @@
 	        style: options.style || 'default',
 	        attributions: attributions,
 	        cacheSize: options.cacheSize,
-	        crossOrigin: crossOrigin,
+	        crossOrigin: options.crossOrigin,
 	        opaque: options.opaque || true,
 	        maxZoom: options.maxZoom || 19,
 	        reprojectionErrorThreshold: options.reprojectionErrorThreshold,
diff --git a/examples/openlayers/config.js b/examples/openlayers/config.js
@@ -240,8 +240,8 @@ var exampleConfig = {
                 name: "地图",
                 content: [{
                     name: "举办过奥运会的城市",
-                    thumbnail: "ol_iPortalWebmap.png",
-                    fileName: "iPortalWebmap"
+                    thumbnail: "ol_iPortalWebMap.png",
+                    fileName: "iportalWebMap"
                 }]
             }
         }
@@ -253,8 +253,8 @@ var exampleConfig = {
                 name: "地图",
                 content: [{
                     name: "我的大学路线图",
-                    thumbnail: "ol_onlineWebmap.png",
-                    fileName: "onlineWebmap"
+                    thumbnail: "ol_onlineWebMap.png",
+                    fileName: "onlineWebMap"
                 }]
             }
         }
diff --git a/src/openlayers/mapping/Tianditu.js b/src/openlayers/mapping/Tianditu.js
@@ -4,7 +4,6 @@ ol.source.Tianditu = function (opt_options) {
             html: ' with <a href="http://icltest.supermapol.com/">SuperMap iClient</a>'
         });
 
-    var crossOrigin = options.crossOrigin || 'anonymous';
     if (!options.url && !options.urls) {
         options.url = "http://t{0-7}.tianditu.com/img_w/wmts"
     }
@@ -18,7 +17,7 @@ ol.source.Tianditu = function (opt_options) {
         style: options.style || 'default',
         attributions: attributions,
         cacheSize: options.cacheSize,
-        crossOrigin: crossOrigin,
+        crossOrigin: options.crossOrigin,
         opaque: options.opaque || true,
         maxZoom: options.maxZoom || 19,
         reprojectionErrorThreshold: options.reprojectionErrorThreshold,

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ var exampleConfig = {`
`240`	`240`	`name: "地图",`
`241`	`241`	`content: [{`
`242`	`242`	`name: "举办过奥运会的城市",`
`243`		`- thumbnail: "ol_iPortalWebmap.png",`
`244`		`- fileName: "iPortalWebmap"`
	`243`	`+ thumbnail: "ol_iPortalWebMap.png",`
	`244`	`+ fileName: "iportalWebMap"`
`245`	`245`	`}]`
`246`	`246`	`}`
`247`	`247`	`}`
`@@ -253,8 +253,8 @@ var exampleConfig = {`
`253`	`253`	`name: "地图",`
`254`	`254`	`content: [{`
`255`	`255`	`name: "我的大学路线图",`
`256`		`- thumbnail: "ol_onlineWebmap.png",`
`257`		`- fileName: "onlineWebmap"`
	`256`	`+ thumbnail: "ol_onlineWebMap.png",`
	`257`	`+ fileName: "onlineWebMap"`
`258`	`258`	`}]`
`259`	`259`	`}`
`260`	`260`	`}`