Include the event type in the JSON output of a note

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 73f38f78c6b0ccf4eee941270940a701e3936eaa..cf4465b9c5b185bcdd3b760073083b51c1b842aa 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,5 +1,6 @@
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]

+  layout false, :only => [:key, :permalink]

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale


@@ -48,6 +49,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 +78,11 @@ 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

+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end

 end
 end