Refactor to remove some code duplication.

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.rhtml
index 9ca0a163af6941489c82fd85295f81ce865e70d6..ad2d2d3071b309d3236d8b7257f2a5503070ab6c 100644 (file)
--- a/app/views/browse/_map.rhtml
+++ b/app/views/browse/_map.rhtml
@@ -1,15 +1,21 @@
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
-<div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
-</div>
-<span id="loading">Loading...</span>
-<a id="larger_map" href=""></a>
+<td align="right">
+  <% if map.visible %>
+    <div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
+    </div>
+    <span id="loading">Loading...</span>
+    <a id="larger_map" href=""></a>
+  <% else %>
+    Deleted
+  <% end %>
+</td>
 <script type="text/javascript">
   function init() {
-    var obj_type = "<%= type %>";
-    var obj_id = <%= id %>;
-    var url = "/api/<%= "#{API_VERSION}" %>/<%= type %>/<%= id %>";
+    var obj_type = "<%= map.class.name.downcase %>";
+    var obj_id = <%= map.id %>;
+    var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
 
     if (obj_type != "node") {
       url += "/full";

diff --git a/app/views/browse/node.rhtml b/app/views/browse/node.rhtml
index 075c1917f3367dd324e9ee2281bcdbbbc82299b5..e2db18f624852105681eb98c1816d35346153c70 100644 (file)
--- a/app/views/browse/node.rhtml
+++ b/app/views/browse/node.rhtml
@@ -15,12 +15,6 @@
       or
       <%= link_to "view history", :action => "node_history" %>
     </td>
-    <td align="right">
-      <% if @node.visible %>
-        <%= render :partial => "map", :locals => { :type => "node", :id => @node.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @node %>
   </tr>
 </table>

diff --git a/app/views/browse/node_history.rhtml b/app/views/browse/node_history.rhtml
index ffa42bef657989e5f7056518187b2971e14527c3..5fd3278c938c163df18e8b3f42b83342a75e14d7 100644 (file)
--- a/app/views/browse/node_history.rhtml
+++ b/app/views/browse/node_history.rhtml
@@ -11,12 +11,6 @@
       or
       <%= link_to "view details", :action => "node" %>
     </td>
-    <td align="right">
-      <% if @node.visible %>
-        <%= render :partial => "map", :locals => { :type => "node", :id => @node.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @node %>
   </tr>
 </table>

diff --git a/app/views/browse/relation.rhtml b/app/views/browse/relation.rhtml
index 8d4f94bf5a040f470aa8f4fdfe41a025db693974..f981938a7230a586869e02acbfeb2eeab4f06148 100644 (file)
--- a/app/views/browse/relation.rhtml
+++ b/app/views/browse/relation.rhtml
@@ -15,12 +15,6 @@
       or
       <%= link_to "view history", :action => "relation_history" %>
     </td>
-    <td align="right">
-      <% if @relation.visible %>
-        <%= render :partial => "map", :locals => { :type => "relation", :id => @relation.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @relation %>
   </tr>
 </table>

diff --git a/app/views/browse/relation_history.rhtml b/app/views/browse/relation_history.rhtml
index f4b3e1faacf353acd019c97f1a6cfdfedbd70cec..60e0ffd17ad792e6c68970114e833702dce569ff 100644 (file)
--- a/app/views/browse/relation_history.rhtml
+++ b/app/views/browse/relation_history.rhtml
@@ -11,12 +11,6 @@
       or
       <%= link_to "view details", :action => "relation" %>
     </td>
-    <td align="right">
-      <% if @relation.visible %>
-        <%= render :partial => "map", :locals => { :type => "relation", :id => @relation.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @relation %>
   </tr>
 </table>

diff --git a/app/views/browse/way.rhtml b/app/views/browse/way.rhtml
index 75b333443196e8040d7b9cace58f3fbe74d58e97..2e86e65f2ea29dbd4717ab4d7b99d9ef4a5ddb7d 100644 (file)
--- a/app/views/browse/way.rhtml
+++ b/app/views/browse/way.rhtml
@@ -15,12 +15,6 @@
       or
       <%= link_to "view history", :action => "way_history" %>
     </td>
-    <td align="right">
-      <% if @way.visible %>
-        <%= render :partial => "map", :locals => { :type => "way", :id => @way.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @way %>
   </tr>
 </table>

diff --git a/app/views/browse/way_history.rhtml b/app/views/browse/way_history.rhtml
index 1eaf52ed532a50cc9fbe35239effd1029ce46a12..f44405ffaac8c6e80adfc7961494212aa6493941 100644 (file)
--- a/app/views/browse/way_history.rhtml
+++ b/app/views/browse/way_history.rhtml
@@ -11,12 +11,6 @@
       or
       <%= link_to "view details", :action => "way" %>
     </td>
-    <td align="right">
-      <% if @way.visible %>
-        <%= render :partial => "map", :locals => { :type => "way", :id => @way.id } %>
-      <% else %>
-        Deleted
-      <% end %>
-    </td>
+    <%= render :partial => "map", :object => @way %>
   </tr>
 </table>