Merge 15722:15806 from head and adjust new views to rails 2 style names.

[rails.git] / public / openlayers / OpenStreetMap.js

diff --git a/public/openlayers/OpenStreetMap.js b/public/openlayers/OpenStreetMap.js
index 1e65f5c76e7b779361aba4d7be148d23d08b59e5..4f2b0d4d714a6ae7207b549dcd067e14f1592d3f 100644 (file)
--- a/public/openlayers/OpenStreetMap.js
+++ b/public/openlayers/OpenStreetMap.js
@@ -47,7 +47,7 @@ OpenLayers.Layer.OSM = OpenLayers.Class(OpenLayers.Layer.TMS, {
      */
     initialize: function(name, url, options) {
         options = OpenLayers.Util.extend({
-            attribution: "Data by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",
+            attribution: "Data by <a href='http://openstreetmap.org/'>OpenStreetMap</a> under <a href='http://creativecommons.org/licenses/by-sa/2.0/'>CC-BY-SA</a>",
             maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
             maxResolution: 156543.0339,
             units: "m",
@@ -171,11 +171,11 @@ OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://a.thunderflames.org/tiles/cycle/",
-            "http://b.thunderflames.org/tiles/cycle/",
-            "http://c.thunderflames.org/tiles/cycle/"
+            "http://a.andy.sandbox.cloudmade.com/tiles/cycle/",
+            "http://b.andy.sandbox.cloudmade.com/tiles/cycle/",
+            "http://c.andy.sandbox.cloudmade.com/tiles/cycle/"
         ];
-        options = OpenLayers.Util.extend({ numZoomLevels: 17 }, options);
+        options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
     },