Make sure we always have a base layer

[rails.git] / app / assets / javascripts / osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 4430943d1e359aa54045efe35762a895076d64da..5c555a25ac9e37908bace402cf5673d95387d108 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,7 +1,6 @@
 OSM = {
 OSM = {

-<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,
+<% if defined?(PIWIK) %>
+  PIWIK:                 <%= PIWIK.to_json %>,

 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,


@@ -22,8 +21,8 @@ OSM = {
     return url;
   },
 
     return url;
   },
 

-  mapParams: function (search) {
-    var params = {}, mapParams = {}, bounds, loc;
+  params: function(search) {
+    var params = {};

 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 
 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 


@@ -35,6 +34,12 @@ OSM = {
       params[key] = decodeURIComponent(val);
     }
 
       params[key] = decodeURIComponent(val);
     }
 

+    return params;
+  },
+
+  mapParams: function (search) {
+    var params = OSM.params(search), mapParams = {}, bounds, loc;
+

     if (params.mlon && params.mlat) {
       mapParams.marker = true;
       mapParams.mlon = parseFloat(params.mlon);
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
       mapParams.mlon = parseFloat(params.mlon);


@@ -81,6 +86,8 @@ OSM = {
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
     } else if (bounds) {
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
     } else if (bounds) {

+      mapParams.lon = bounds.getCenter().lng; // Not used by main map, but
+      mapParams.lat = bounds.getCenter().lat; // are used by iD/Potlatch.

       mapParams.bounds = bounds;
       mapParams.object_zoom = false;
     } else if (params.lon && params.lat) {
       mapParams.bounds = bounds;
       mapParams.object_zoom = false;
     } else if (params.lon && params.lat) {