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 3c3378f98b0c558ecc0c2130f97c8f0f3f31cf75..f3c1c3607a834ddb8b5e6879e677ee63f3d46880 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -7,11 +7,24 @@ 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;
+
+    if (object.type != "node") {
+      url += "/full";
+    } else if (object.version) {
+      url += "/" + object.version;
+    }
+
+    return url;
+  },
 
   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],
@@ -32,18 +45,14 @@ OSM = {
     }
 
     if (params.node || params.way || params.relation) {
-      mapParams.object = true;
       mapParams.object_zoom = true;
 
       if (params.node) {
-        mapParams.object_type = 'node';
-        mapParams.object_id = parseInt(params.node);
+        mapParams.object = {type: 'node', id: parseInt(params.node)};
       } else if (params.way) {
-        mapParams.object_type = 'way';
-        mapParams.object_id = parseInt(params.way);
+        mapParams.object = {type: 'way', id: parseInt(params.way)};
       } else if (params.relation) {
-        mapParams.object_type = 'relation';
-        mapParams.object_id = parseInt(params.relation);
+        mapParams.object = {type: 'relation', id: parseInt(params.relation)};
       }
     }