Update Potlatch 2 to 2.3-534-g63a3364 build

[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..39d995c46243398fff9b4bf5b901f48f9b88b3ca 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -8,10 +8,22 @@ OSM = {
   SERVER_URL:       <%= SERVER_URL.to_json %>,
   API_VERSION:      <%= API_VERSION.to_json %>,
 
   SERVER_URL:       <%= SERVER_URL.to_json %>,
   API_VERSION:      <%= API_VERSION.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;
 
   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],
 
     for (var i = 0; i < search.length; ++i) {
       var pair = search[i],


@@ -32,18 +44,14 @@ OSM = {
     }
 
     if (params.node || params.way || params.relation) {
     }
 
     if (params.node || params.way || params.relation) {

-      mapParams.object = true;

       mapParams.object_zoom = true;
 
       if (params.node) {
       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) {
       } 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) {
       } else if (params.relation) {

-        mapParams.object_type = 'relation';
-        mapParams.object_id = parseInt(params.relation);
+        mapParams.object = {type: 'relation', id: parseInt(params.relation)};

       }
     }
 
       }
     }