Bounding boxes are sanitised on creation now

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 301d4a96641bb6d8557536c8ebf3de00baa600c1..36f57d6c27d26a5003f95e4b66aa0584e6654d4e 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -34,7 +34,7 @@ class SiteController < ApplicationController
   def edit
     editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
 
   def edit
     editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
 

-    if editor == "josm"
+    if editor == "remote"

       render :action => :index
     else
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       render :action => :index
     else
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this


@@ -48,6 +48,19 @@ class SiteController < ApplicationController
         @lat = params['mlat'].to_f
         @zoom = params['zoom'].to_i
 
         @lat = params['mlat'].to_f
         @zoom = params['zoom'].to_i
 

+      elsif params['bbox']
+        bbox = BoundingBox.from_bbox_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+      elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+        bbox = BoundingBox.from_lon_lat_params(params)
+
+        @lon = bbox.centre_lon
+        @lat = bbox.centre_lat
+        @zoom = 16
+

       elsif params['gpx']
         @lon = Trace.find(params['gpx']).longitude
         @lat = Trace.find(params['gpx']).latitude
       elsif params['gpx']
         @lon = Trace.find(params['gpx']).longitude
         @lat = Trace.find(params['gpx']).latitude


@@ -64,7 +77,7 @@ class SiteController < ApplicationController
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 

-      @zoom = '14' if @zoom.nil?
+      @zoom = '17' if @zoom.nil?

     end
   end
 end
     end
   end
 end