Move "Browse Map Data" to layers control

[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 75562ad485fc05f4dbe427b034d60bc9a8136399..f3c1c3607a834ddb8b5e6879e677ee63f3d46880 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -7,6 +7,7 @@ OSM = {
   MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
   SERVER_URL:       <%= SERVER_URL.to_json %>,
   API_VERSION:      <%= API_VERSION.to_json %>,
+  STATUS:           <%= STATUS.to_json %>,
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
@@ -23,7 +24,7 @@ OSM = {
   mapParams: function (search) {
     var params = {}, mapParams = {}, loc;
 
-    search = (search || window.location.search).replace('?', '').split('&');
+    search = (search || window.location.search).replace('?', '').split(/&|;/);
 
     for (var i = 0; i < search.length; ++i) {
       var pair = search[i],