Refactor mapParams to compose better with apiUrl

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 75b3fa1a80163dbf2d6a41143d5c1e87d90a5f2e..21d5366f3923f5371c8239fc32f4c7231dc1c385 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -33,7 +33,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
   }
 
   if (params.object) {

-    addObjectToMap({type: params.object_type, id: params.object_id}, params.object_zoom);
+    addObjectToMap(params.object, params.object_zoom);

   }
 
   handleResize();
   }
 
   handleResize();


@@ -73,7 +73,7 @@ $(document).ready(function () {
     var extents = unproj(map.getExtent());
     var expiry = new Date();
 
     var extents = unproj(map.getExtent());
     var expiry = new Date();
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object.type, params.object.id);

 
     expiry.setYear(expiry.getFullYear() + 10);
     $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
 
     expiry.setYear(expiry.getFullYear() + 10);
     $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 22a1023b41c4b1fbebee423f464f51389a31dc6a..75562ad485fc05f4dbe427b034d60bc9a8136399 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -44,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)};

       }
     }
 
       }
     }