Add has_valid_bbox? method to Changeset model to tidy checking for bbox, and fix...

[rails.git] / app / views / browse / _changeset_details.rhtml

diff --git a/app/views/browse/_changeset_details.rhtml b/app/views/browse/_changeset_details.rhtml
index 2b711611bf0b676fafdf052dab73ca783e772a47..12d4dfb25b84e616d8d0c9423bbdd0c9a92fba88 100644 (file)
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.rhtml
@@ -17,40 +17,35 @@
     </tr>
   <% end %>
   
-  <% unless changeset_details.tags_as_hash.empty? %>
-    <tr valign="top">
-      <th>Tags:</th>
+  <%= render :partial => "tag_details", :object => changeset_details %>
+
+  <tr>
+    <th>Bounding box:</th>
+    <% unless changeset_details.has_valid_bbox? %>
+      <td>No bounding box has been stored for this changeset.</td>
+    <% else
+          minlon = changeset_details.min_lon/GeoRecord::SCALE.to_f
+          minlat = changeset_details.min_lat/GeoRecord::SCALE.to_f
+          maxlon = changeset_details.max_lon/GeoRecord::SCALE.to_f
+          maxlat = changeset_details.max_lat/GeoRecord::SCALE.to_f
+    %>
       <td>
-        <table padding="0">
-          <%= render :partial => "tag", :collection => changeset_details.tags_as_hash %>
+        <table>
+          <tr>
+            <td colspan="3" style="text-align:center"><%=maxlat -%></td>
+          </tr>
+          <tr>
+            <td><%=minlon -%></td>
+            <td>(<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'>box</a>)</td>
+            <td><%=maxlon -%></td>
+          </tr>
+          <tr>
+            <td colspan="3" style="text-align:center"><%= minlon -%></td>
+          </tr>
         </table>
       </td>
-    </tr>
-  <% else %>
-    <tr>
-      <th>Tags</th>
-      <td>There are no tags for this changeset</td>
-    </tr>
-  <% end %>
-
-  <% if changeset_details.max_lat.nil? or changeset_details.min_lat.nil? or changeset_details.max_lon.nil? or changeset_details.min_lon.nil? %>
-    <tr>
-      <td>No bounding box has been stored for this changeset.</td>
-    </tr>
-  <% else %>
-    <table>
-      <tr>
-        <td colspan="2" style="text-align:center"><b>Max Latitude: </b><%= changeset_details.max_lat/GeoRecord::SCALE.to_f -%></td>
-      </tr>
-      <tr>
-        <td><b>Min Longitude: </b><%= changeset_details.min_lon/GeoRecord::SCALE.to_f -%></td>
-        <td><b>Max Longitude: </b><%= changeset_details.max_lon/GeoRecord::SCALE.to_f -%></td>
-      </tr>
-      <tr>
-        <td colspan="2" style="text-align:center"><b>Min Latitude: </b><%= changeset_details.min_lon/GeoRecord::SCALE.to_f -%></td>
-      </tr>
-    </table>
-  <% end %>
+    <% end %>
+  </tr>
 
   <% unless @nodes.empty? %>
     <tr valign="top">