label changesets as (big) based on their bbox area

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index a1162b3234be9dc0531cc9e85aa25115b77951c9..5c961a06470c1999d74df7565707559956811135 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -89,6 +89,16 @@ class Changeset < ActiveRecord::Base
   def has_valid_bbox?
     not bbox.include? nil
   end
+  
+  ##
+  # returns area of the changset bbox as a rough comparitive quantity for use of changset displays
+  def area
+     if has_valid_bbox?
+            (max_lon - min_lon) * (max_lat - min_lat)
+     else
+            0
+     end
+  end
 
   ##
   # expand the bounding box to include the given bounding box. also, 

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index c5b3c7a88bb9ca9407445ccff00c3711987e67d0..2a53564507f894e8b0918cb2fbdf950ffc7669cd 100644 (file)
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -38,8 +38,14 @@
       maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
       maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
     %>
-      (<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>) 
-  <% end %>
+      <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
+      <!--<%=changeset.area%>-->
+    <%   if changeset.area > 1500000000000 %>
+      (big)
+    <%
+         end
+       end
+    %>
   </td>
 
   <td class="<%= cl %>">

diff --git a/config/database.yml b/config/database.yml
index c6fe06fdd937ddb1af23b5097a5620fd0cbeb8c2..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -11,10 +11,10 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: postgresql
+  adapter: mysql
   database: openstreetmap
-#  username: openstreetmap
-#  password: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
   encoding: utf8
 
@@ -22,17 +22,17 @@ development:
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: postgresql
+  adapter: mysql
   database: osm_test
-#  username: osm_test
-#  password: osm_test
+  username: osm_test
+  password: osm_test
   host: localhost
   encoding: utf8
 
 production:
-  adapter: postgresql
+  adapter: mysql
   database: osm
-#  username: osm
-#  password: osm
+  username: osm
+  password: osm
   host: localhost
   encoding: utf8