Commit 9db57b5081a32ccc7288b9ccc2fdae3ed8299311
1 parent
585ace7d
Exists in
master
and in
7 other branches
-
Showing
3 changed files
with
24 additions
and
12 deletions
Show diff stats
admin/admin.db
No preview for this file type
interface/black_osm.htm
@@ -182,28 +182,32 @@ | @@ -182,28 +182,32 @@ | ||
182 | "http://tile.stamen.com/watercolor/${z}/${x}/${y}.jpg", { | 182 | "http://tile.stamen.com/watercolor/${z}/${x}/${y}.jpg", { |
183 | isBaseLayer : true, | 183 | isBaseLayer : true, |
184 | visibility : false, | 184 | visibility : false, |
185 | - attribution: attribStamen | 185 | + attribution: attribStamen, |
186 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
186 | }); | 187 | }); |
187 | 188 | ||
188 | var toner = new OpenLayers.Layer.OSM("Toner", | 189 | var toner = new OpenLayers.Layer.OSM("Toner", |
189 | "http://tile.stamen.com/toner/${z}/${x}/${y}.jpg", { | 190 | "http://tile.stamen.com/toner/${z}/${x}/${y}.jpg", { |
190 | isBaseLayer : true, | 191 | isBaseLayer : true, |
191 | visibility : false, | 192 | visibility : false, |
192 | - attribution: attribStamen | 193 | + attribution: attribStamen, |
194 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
193 | }); | 195 | }); |
194 | 196 | ||
195 | var tonerlite = new OpenLayers.Layer.OSM("Toner lite", | 197 | var tonerlite = new OpenLayers.Layer.OSM("Toner lite", |
196 | "http://tile.stamen.com/toner-lite/${z}/${x}/${y}.jpg", { | 198 | "http://tile.stamen.com/toner-lite/${z}/${x}/${y}.jpg", { |
197 | isBaseLayer : true, | 199 | isBaseLayer : true, |
198 | visibility : false, | 200 | visibility : false, |
199 | - attribution: attribStamen | 201 | + attribution: attribStamen, |
202 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
200 | }); | 203 | }); |
201 | 204 | ||
202 | var osm = new OpenLayers.Layer.OSM("OSM", | 205 | var osm = new OpenLayers.Layer.OSM("OSM", |
203 | "http://tile.openstreetmap.org/${z}/${x}/${y}.png", { | 206 | "http://tile.openstreetmap.org/${z}/${x}/${y}.png", { |
204 | isBaseLayer : true, | 207 | isBaseLayer : true, |
205 | visibility : true, | 208 | visibility : true, |
206 | - attribution: attribOSMData | 209 | + attribution: attribOSMData, |
210 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
207 | }); | 211 | }); |
208 | 212 | ||
209 | var arrayMapQuestAerial = ["http://oatile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg", | 213 | var arrayMapQuestAerial = ["http://oatile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg", |
@@ -216,7 +220,8 @@ | @@ -216,7 +220,8 @@ | ||
216 | displayOutsideMaxExtent: true, | 220 | displayOutsideMaxExtent: true, |
217 | attribution: attribMapQuestAerial, | 221 | attribution: attribMapQuestAerial, |
218 | isBaseLayer : true, | 222 | isBaseLayer : true, |
219 | - visibility : false | 223 | + visibility : false, |
224 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
220 | }); | 225 | }); |
221 | 226 | ||
222 | i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ osm, aquarela, toner, tonerlite, layMapQuestAerial ]; | 227 | i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ osm, aquarela, toner, tonerlite, layMapQuestAerial ]; |
interface/osmdebug.htm
@@ -206,28 +206,32 @@ | @@ -206,28 +206,32 @@ | ||
206 | "http://tile.stamen.com/watercolor/${z}/${x}/${y}.jpg", { | 206 | "http://tile.stamen.com/watercolor/${z}/${x}/${y}.jpg", { |
207 | isBaseLayer : true, | 207 | isBaseLayer : true, |
208 | visibility : false, | 208 | visibility : false, |
209 | - attribution: attribStamen | 209 | + attribution: attribStamen, |
210 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
210 | }); | 211 | }); |
211 | 212 | ||
212 | var toner = new OpenLayers.Layer.OSM("Toner", | 213 | var toner = new OpenLayers.Layer.OSM("Toner", |
213 | "http://tile.stamen.com/toner/${z}/${x}/${y}.jpg", { | 214 | "http://tile.stamen.com/toner/${z}/${x}/${y}.jpg", { |
214 | isBaseLayer : true, | 215 | isBaseLayer : true, |
215 | visibility : false, | 216 | visibility : false, |
216 | - attribution: attribStamen | 217 | + attribution: attribStamen, |
218 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
217 | }); | 219 | }); |
218 | 220 | ||
219 | var tonerlite = new OpenLayers.Layer.OSM("Toner lite", | 221 | var tonerlite = new OpenLayers.Layer.OSM("Toner lite", |
220 | "http://tile.stamen.com/toner-lite/${z}/${x}/${y}.jpg", { | 222 | "http://tile.stamen.com/toner-lite/${z}/${x}/${y}.jpg", { |
221 | isBaseLayer : true, | 223 | isBaseLayer : true, |
222 | visibility : false, | 224 | visibility : false, |
223 | - attribution: attribStamen | 225 | + attribution: attribStamen, |
226 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
224 | }); | 227 | }); |
225 | 228 | ||
226 | var osm = new OpenLayers.Layer.OSM("OSM", | 229 | var osm = new OpenLayers.Layer.OSM("OSM", |
227 | "http://tile.openstreetmap.org/${z}/${x}/${y}.png", { | 230 | "http://tile.openstreetmap.org/${z}/${x}/${y}.png", { |
228 | isBaseLayer : true, | 231 | isBaseLayer : true, |
229 | visibility : true, | 232 | visibility : true, |
230 | - attribution: attribOSMData | 233 | + attribution: attribOSMData, |
234 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
231 | }); | 235 | }); |
232 | 236 | ||
233 | var arrayMapQuestAerial = ["http://oatile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg", | 237 | var arrayMapQuestAerial = ["http://oatile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.jpg", |
@@ -240,7 +244,8 @@ | @@ -240,7 +244,8 @@ | ||
240 | displayOutsideMaxExtent: true, | 244 | displayOutsideMaxExtent: true, |
241 | attribution: attribMapQuestAerial, | 245 | attribution: attribMapQuestAerial, |
242 | isBaseLayer : true, | 246 | isBaseLayer : true, |
243 | - visibility : false | 247 | + visibility : false, |
248 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
244 | }); | 249 | }); |
245 | 250 | ||
246 | var layMSNOsmRoad = new OpenLayers.Layer.OSM("OSM Roads", ["http://korona.geog.uni-heidelberg.de/tiles/roads/x=${x}&y=${y}&z=${z}"], { | 251 | var layMSNOsmRoad = new OpenLayers.Layer.OSM("OSM Roads", ["http://korona.geog.uni-heidelberg.de/tiles/roads/x=${x}&y=${y}&z=${z}"], { |
@@ -249,7 +254,8 @@ | @@ -249,7 +254,8 @@ | ||
249 | //getURL : getTileURL, | 254 | //getURL : getTileURL, |
250 | isBaseLayer : true, | 255 | isBaseLayer : true, |
251 | visibility : false, | 256 | visibility : false, |
252 | - attribution : mapSurfer | 257 | + attribution : mapSurfer, |
258 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
253 | }); | 259 | }); |
254 | 260 | ||
255 | var layMSNOsmRoadsGray = | 261 | var layMSNOsmRoadsGray = |
@@ -276,7 +282,8 @@ | @@ -276,7 +282,8 @@ | ||
276 | displayOutsideMaxExtent: true, | 282 | displayOutsideMaxExtent: true, |
277 | visibility : false, | 283 | visibility : false, |
278 | isBaseLayer : true, | 284 | isBaseLayer : true, |
279 | - attribution : mapSurfer | 285 | + attribution : mapSurfer, |
286 | + tileOptions: {crossOriginKeyword: "anonymous"} | ||
280 | }); | 287 | }); |
281 | 288 | ||
282 | var layMSNAsterHillshade = | 289 | var layMSNAsterHillshade = |