Merged 8899:9136 and 9145 from trunk.

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

diff --git a/public/openlayers/OpenStreetMap.js b/public/openlayers/OpenStreetMap.js
index 379e2d1cc4c93e0687749c71dfe888988f19e27b..1e65f5c76e7b779361aba4d7be148d23d08b59e5 100644 (file)
--- a/public/openlayers/OpenStreetMap.js
+++ b/public/openlayers/OpenStreetMap.js
@@ -48,10 +48,11 @@ 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>",
     initialize: function(name, url, options) {
         options = OpenLayers.Util.extend({
             attribution: "Data by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",

-            maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-            maxResolution: 156543,
+            maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
+            maxResolution: 156543.0339,

             units: "m",
             units: "m",

-            projection: "EPSG:41001"
+            projection: "EPSG:900913",
+            transitionEffect: "resize"

         }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.TMS.prototype.initialize.apply(this, newArguments);
         }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.TMS.prototype.initialize.apply(this, newArguments);


@@ -142,9 +143,9 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://a.tah.openstreetmap.org/Tiles/tile.php/",
-            "http://b.tah.openstreetmap.org/Tiles/tile.php/",
-            "http://c.tah.openstreetmap.org/Tiles/tile.php/"
+            "http://a.tah.openstreetmap.org/Tiles/tile/",
+            "http://b.tah.openstreetmap.org/Tiles/tile/",
+            "http://c.tah.openstreetmap.org/Tiles/tile/"

         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18 }, options);
         var newArguments = [name, url, options];
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18 }, options);
         var newArguments = [name, url, options];


@@ -154,6 +155,34 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
     CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender"
 });
 
     CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender"
 });
 

+/**
+ * Class: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    /**
+     * Constructor: OpenLayers.Layer.OSM.CycleMap
+     *
+     * Parameters:
+     * name - {String}
+     * options - {Object} Hashtable of extra options to tag onto the layer
+     */
+    initialize: function(name, options) {
+        var url = [
+            "http://a.thunderflames.org/tiles/cycle/",
+            "http://b.thunderflames.org/tiles/cycle/",
+            "http://c.thunderflames.org/tiles/cycle/"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 17 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap"
+});
+

 /**
  * Class: OpenLayers.Layer.OSM.Maplint
  *
 /**
  * Class: OpenLayers.Layer.OSM.Maplint
  *


@@ -170,9 +199,9 @@ OpenLayers.Layer.OSM.Maplint = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://d.tah.openstreetmap.org/Tiles/maplint.php/",
-            "http://e.tah.openstreetmap.org/Tiles/maplint.php/",
-            "http://f.tah.openstreetmap.org/Tiles/maplint.php/"
+            "http://d.tah.openstreetmap.org/Tiles/maplint/",
+            "http://e.tah.openstreetmap.org/Tiles/maplint/",
+            "http://f.tah.openstreetmap.org/Tiles/maplint/"

         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18, isBaseLayer: false, visibility: false }, options);
         var newArguments = [name, url, options];
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 18, isBaseLayer: false, visibility: false }, options);
         var newArguments = [name, url, options];