From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Jun 2008 23:01:55 +0000 (+0000)
Subject: Refactor to remove some code duplication.
X-Git-Tag: live~8272^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9a7db5d63b12f90b944f4ad151e5299d1745ecfb

Refactor to remove some code duplication.
---

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.rhtml
index 9ca0a163a..ad2d2d307 100644
--- 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 075c1917f..e2db18f62 100644
--- 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 ffa42bef6..5fd3278c9 100644
--- 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 8d4f94bf5..f981938a7 100644
--- 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 f4b3e1faa..60e0ffd17 100644
--- 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 75b333443..2e86e65f2 100644
--- 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 1eaf52ed5..f44405ffa 100644
--- 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>