some more putway fixes - this actually creates new ways with 0.6 Potlatch now

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 3e6d687b0faac740c10d212c637e4ca9870af9e4..fcf34336f7dbb23d55aa1eb151e8dea967967252 100644 (file)
--- 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);
 }