X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56c972577b9cb4c4e435fe3025752d1cd9b26d56..b823e9fccca6072d92cc4f1ba0d1850488a5f3c4:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 3e6d687b0..fcf34336f 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -13,7 +13,9 @@ var nonamekeys = {
 };
 
 OpenLayers._getScriptLocation = function () {
-   return "openlayers/";
+  // Should really have this file as an erb, so that this can return 
+  // the real rails root
+   return "/openlayers/";
 }
 
 function createMap(divName, options) {
@@ -30,7 +32,8 @@ function createMap(divName, options) {
       ],
       units: "m",
       maxResolution: 156543.0339,
-      numZoomLevels: 20
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
@@ -131,6 +134,8 @@ function getMapCenter(center, zoom) {
 }
 
 function setMapCenter(center, zoom) {
+   var numzoom = map.getNumZoomLevels();
+   if (zoom >= numzoom) zoom = numzoom - 1;
    map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
 }