Localisation updates from https://translatewiki.net.

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 280f39fd8c32b597b7cbc13094044e5827033d02..b0552322ed6d808efbf7a82bae2e001eb9b104fc 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,66 +1,102 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site', :except => [:key, :permalink]
-  layout false, :only => [:key, :permalink]
+  layout "site"
+  layout :map_layout, :only => [:index, :export]

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :redirect_map_params, :only => [:index, :edit, :export]
-  before_filter :require_user, :only => [:edit, :welcome]
-  before_filter :require_oauth, :only => [:index]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :redirect_browse_params, :only => :index
+  before_action :redirect_map_params, :only => [:index, :edit, :export]
+  before_action :require_user, :only => [:welcome]
+  before_action :require_oauth, :only => [:index]
+  before_action :update_totp, :only => [:index]

 
   def index
 
   def index

-    unless STATUS == :database_readonly or STATUS == :database_offline
-      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+    unless STATUS == :database_readonly || STATUS == :database_offline
+      session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])

     end
   end
 
   def permalink
     end
   end
 
   def permalink

-    lon, lat, zoom = ShortLink::decode(params[:code])
-    new_params = params.except(:code, :lon, :lat, :zoom)
+    lon, lat, zoom = ShortLink.decode(params[:code])
+    new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)

 
 

-    if new_params.has_key? :m
+    if new_params.key? :m

       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 
       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 

-    new_params[:controller] = 'site'
-    new_params[:action] = 'index'
+    if params.key? :node
+      new_params[:controller] = "browse"
+      new_params[:action] = "node"
+      new_params[:id] = params[:node]
+    elsif params.key? :way
+      new_params[:controller] = "browse"
+      new_params[:action] = "way"
+      new_params[:id] = params[:way]
+    elsif params.key? :relation
+      new_params[:controller] = "browse"
+      new_params[:action] = "relation"
+      new_params[:id] = params[:relation]
+    elsif params.key? :changeset
+      new_params[:controller] = "browse"
+      new_params[:action] = "changeset"
+      new_params[:id] = params[:changeset]
+    else
+      new_params[:controller] = "site"
+      new_params[:action] = "index"
+    end
+

     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"

+    new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers

 
 

-    redirect_to new_params
+    redirect_to Hash[new_params]

   end
 
   def key
     expires_in 7.days, :public => true
   end
 
   def key
     expires_in 7.days, :public => true

+    render :layout => false

   end
 
   def edit
     editor = preferred_editor
 
     if editor == "remote"
   end
 
   def edit
     editor = preferred_editor
 
     if editor == "remote"

-      render :action => :index
+      require_oauth
+      render :action => :index, :layout => map_layout

       return
       return

+    else
+      require_user

     end
 
     end
 

-    @extra_body_class = "site-edit-#{editor}"
+    if editor == "potlatch" || editor == "potlatch2"
+      append_content_security_policy_directives(
+        :object_src => %w(*),
+        :plugin_types => %w(application/x-shockwave-flash),
+        :script_src => %w('unsafe-inline')
+      )
+    end

 
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
 
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+      @zoom = 18

     elsif params[:way]
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     elsif params[:way]
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+      @zoom = 17

     elsif params[:note]
       note = Note.find(params[:note])
       @lat = note.lat
       @lon = note.lon
     elsif params[:note]
       note = Note.find(params[:note])
       @lat = note.lat
       @lon = note.lon

-    elsif params[:gpx]
+      @zoom = 17
+    elsif params[:gpx] && @user

       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude

+      @zoom = 16

     end
   end
 
     end
   end
 


@@ -68,19 +104,46 @@ class SiteController < ApplicationController
     @locale = params[:copyright_locale] || I18n.locale
   end
 
     @locale = params[:copyright_locale] || I18n.locale
   end
 

-  def welcome
-  end
+  def welcome; end
+
+  def help; end
+
+  def about; end
+
+  def export; end
+
+  def offline; end

 
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
 
   def id
 
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
 
   def id

+    append_content_security_policy_directives(
+      :connect_src => %w(taginfo.openstreetmap.org *.mapillary.com),
+      :img_src => %w(*),
+      :script_src => %w(dev.virtualearth.net)
+    )
+

     render "id", :layout => false
   end
 
   private
 
     render "id", :layout => false
   end
 
   private
 

+  def redirect_browse_params
+    if params[:node]
+      redirect_to node_path(params[:node])
+    elsif params[:way]
+      redirect_to way_path(params[:way])
+    elsif params[:relation]
+      redirect_to relation_path(params[:relation])
+    elsif params[:note]
+      redirect_to browse_note_path(params[:note])
+    elsif params[:query]
+      redirect_to search_path(:query => params[:query])
+    end
+  end
+

   def redirect_map_params
     anchor = []
 
   def redirect_map_params
     anchor = []
 


@@ -90,12 +153,12 @@ class SiteController < ApplicationController
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"

-    elsif params.delete(:notes) == 'yes'
+    elsif params.delete(:notes) == "yes"

       anchor << "layers=N"
     end
 
     if anchor.present?
       anchor << "layers=N"
     end
 
     if anchor.present?

-      redirect_to params.merge(:anchor => anchor.join('&'))
+      redirect_to Hash[params].merge(:anchor => anchor.join("&"))

     end
   end
 end
     end
   end
 end