From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Apr 2008 23:52:32 +0000 (+0000)
Subject: Merged 7296:7388 from rails_port trunk.
X-Git-Tag: live~7857^2~15
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4cc400de436a5dc33b66bc735b5fb6257e066a5a

Merged 7296:7388 from rails_port trunk.
---

4cc400de436a5dc33b66bc735b5fb6257e066a5a
diff --cc public/javascripts/map.js
index 9858d4576,d8765fe1a..51cd9f6a5
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@@ -5,29 -6,36 +6,37 @@@ var popup
  OpenLayers._getScriptLocation = function () {
     return "/openlayers/";
  }
-    
+ 
  function createMap(divName) {
     map = new OpenLayers.Map(divName, {
-       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-       maxResolution: 156543,
-       units: "m",
-       projection: "EPSG:900913",
        controls: [
-          new OpenLayers.Control.ArgParser(), 
+          new OpenLayers.Control.ArgParser(),
           new OpenLayers.Control.Attribution(),
           new OpenLayers.Control.LayerSwitcher(),
-          new OpenLayers.Control.Navigation(), 
-          new OpenLayers.Control.PanZoomBar()
-       ]
+          new OpenLayers.Control.Navigation(),
+          new OpenLayers.Control.PanZoomBar(),
+          new OpenLayers.Control.ScaleLine()
+       ],
++      maxResolution: 156543,
+       units: "m"
     });
  
-    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
+    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
+       displayOutsideMaxExtent: true,
+       wrapDateLine: true
+    });
     map.addLayer(mapnik);
  
-    var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
+    var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+       displayOutsideMaxExtent: true,
+       wrapDateLine: true
+    });
     map.addLayer(osmarender);
  
-    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
+       displayOutsideMaxExtent: true,
+       wrapDateLine: true
+    });
     map.addLayer(maplint);
  
     var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);