Set server_url to test.host in test environments

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index b9bde31abc4df3ecb43938bba5fd728f5d4c2d07..d1af43a724e17ea75778648cf7054a765bccc6ce 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -6,6 +6,7 @@ class GeocoderController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :require_oauth, :only => [:search]
   before_action :authorize_web
   before_action :set_locale
   before_action :require_oauth, :only => [:search]

+  authorize_resource :class => false

 
   def search
     @params = normalize_params
 
   def search
     @params = normalize_params


@@ -14,19 +15,18 @@ class GeocoderController < ApplicationController
     if @params[:lat] && @params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"
     if @params[:lat] && @params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"

-      @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME)
+      @sources.push "geonames_reverse" if Settings.key?(:geonames_username)

     elsif @params[:query]
     elsif @params[:query]

-      if @params[:query] =~ /^\d{5}(-\d{4})?$/
+      if @params[:query].match?(/^\d{5}(-\d{4})?$/)

         @sources.push "osm_nominatim"
         @sources.push "osm_nominatim"

-      elsif @params[:query] =~ /^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i
-        @sources.push "uk_postcode"
+      elsif @params[:query].match?(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)

         @sources.push "osm_nominatim"
         @sources.push "osm_nominatim"

-      elsif @params[:query] =~ /^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i
+      elsif @params[:query].match?(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)

         @sources.push "ca_postcode"
         @sources.push "osm_nominatim"
       else
         @sources.push "osm_nominatim"
         @sources.push "ca_postcode"
         @sources.push "osm_nominatim"
       else
         @sources.push "osm_nominatim"

-        @sources.push "geonames" if defined?(GEONAMES_USERNAME)
+        @sources.push "geonames" if Settings.key?(:geonames_username)

       end
     end
 
       end
     end
 


@@ -40,45 +40,45 @@ class GeocoderController < ApplicationController
   def search_latlon
     lat = params[:lat].to_f
     lon = params[:lon].to_f
   def search_latlon
     lat = params[:lat].to_f
     lon = params[:lon].to_f

-    if lat < -90 || lat > 90
-      @error = "Latitude #{lat} out of range"
-      render :action => "error"
-    elsif lon < -180 || lon > 180
-      @error = "Longitude #{lon} out of range"
-      render :action => "error"
-    else
-      @results = [{ :lat => lat, :lon => lon,
-                    :zoom => params[:zoom],
-                    :name => "#{lat}, #{lon}" }]

 
 

-      render :action => "results"
-    end
-  end
+    if params[:latlon_digits]
+      # We've got two nondescript numbers for a query, which can mean both "lat, lon" or "lon, lat".
+      @results = []

 
 

-  def search_uk_postcode
-    # get query parameters
-    query = params[:query]
+      if lat >= -90 && lat <= 90 && lon >= -180 && lon <= 180
+        @results.push(:lat => lat, :lon => lon,
+                      :zoom => params[:zoom],
+                      :name => "#{lat}, #{lon}")
+      end

 
 

-    # create result array
-    @results = []
+      if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180
+        @results.push(:lat => lon, :lon => lat,
+                      :zoom => params[:zoom],
+                      :name => "#{lon}, #{lat}")
+      end

 
 

-    # ask npemap.org.uk to do a combined npemap + freethepostcode search
-    response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{escape_query(query)}")
+      if @results.empty?
+        @error = "Latitude or longitude are out of range"
+        render :action => "error"
+      else
+        render :action => "results"
+      end
+    else
+      # Coordinates in a query have come with markers for latitude and longitude.
+      if lat < -90 || lat > 90
+        @error = "Latitude #{lat} out of range"
+        render :action => "error"
+      elsif lon < -180 || lon > 180
+        @error = "Longitude #{lon} out of range"
+        render :action => "error"
+      else
+        @results = [{ :lat => lat, :lon => lon,
+                      :zoom => params[:zoom],
+                      :name => "#{lat}, #{lon}" }]

 
 

-    # parse the response
-    unless response =~ /Error/
-      dataline = response.split(/\n/)[1]
-      data = dataline.split(/,/) # easting,northing,postcode,lat,long
-      postcode = data[2].delete("'")
-      zoom = POSTCODE_ZOOM - postcode.count("#")
-      @results.push(:lat => data[3], :lon => data[4], :zoom => zoom,
-                    :name => postcode)
+        render :action => "results"
+      end

     end
     end

-
-    render :action => "results"
-  rescue StandardError => ex
-    @error = "Error contacting www.npemap.org.uk: #{ex}"
-    render :action => "error"

   end
 
   def search_ca_postcode
   end
 
   def search_ca_postcode


@@ -93,13 +93,13 @@ class GeocoderController < ApplicationController
     if response.get_elements("geodata/error").empty?
       @results.push(:lat => response.text("geodata/latt"),
                     :lon => response.text("geodata/longt"),
     if response.get_elements("geodata/error").empty?
       @results.push(:lat => response.text("geodata/latt"),
                     :lon => response.text("geodata/longt"),

-                    :zoom => POSTCODE_ZOOM,
+                    :zoom => Settings.postcode_zoom,

                     :name => query.upcase)
     end
 
     render :action => "results"
                     :name => query.upcase)
     end
 
     render :action => "results"

-  rescue StandardError => ex
-    @error = "Error contacting geocoder.ca: #{ex}"
+  rescue StandardError => e
+    @error = "Error contacting geocoder.ca: #{e}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -112,15 +112,13 @@ class GeocoderController < ApplicationController
     maxlat = params[:maxlat]
 
     # get view box
     maxlat = params[:maxlat]
 
     # get view box

-    if minlon && minlat && maxlon && maxlat
-      viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
-    end
+    viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat

 
     # get objects to excude
     exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude]
 
     # ask nominatim
 
     # get objects to excude
     exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude]
 
     # ask nominatim

-    response = fetch_xml("#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{Settings.nominatim_url}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")

 
     # extract the results from the response
     results =  response.elements["searchresults"]
 
     # extract the results from the response
     results =  response.elements["searchresults"]


@@ -153,9 +151,7 @@ class GeocoderController < ApplicationController
         rank = (place.attributes["place_rank"].to_i + 1) / 2
         prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
         place.elements["extratags"].elements.each("tag") do |extratag|
         rank = (place.attributes["place_rank"].to_i + 1) / 2
         prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name
         place.elements["extratags"].elements.each("tag") do |extratag|

-          if extratag.attributes["key"] == "place"
-            prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name
-          end
+          prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place"

         end
       end
       prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name
         end
       end
       prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name


@@ -170,8 +166,8 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue StandardError => ex
-    @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
+  rescue StandardError => e
+    @error = "Error contacting nominatim.openstreetmap.org: #{e}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -186,7 +182,7 @@ class GeocoderController < ApplicationController
     @results = []
 
     # ask geonames.org
     @results = []
 
     # ask geonames.org

-    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}")
+    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{Settings.geonames_username}")

 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|
 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|


@@ -196,14 +192,14 @@ class GeocoderController < ApplicationController
       country = geoname.text("countryName")
 
       @results.push(:lat => lat, :lon => lon,
       country = geoname.text("countryName")
 
       @results.push(:lat => lat, :lon => lon,

-                    :zoom => GEONAMES_ZOOM,
+                    :zoom => Settings.geonames_zoom,

                     :name => name,
                     :suffix => ", #{country}")
     end
 
     render :action => "results"
                     :name => name,
                     :suffix => ", #{country}")
     end
 
     render :action => "results"

-  rescue StandardError => ex
-    @error = "Error contacting api.geonames.org: #{ex}"
+  rescue StandardError => e
+    @error = "Error contacting api.geonames.org: #{e}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -217,7 +213,7 @@ class GeocoderController < ApplicationController
     @results = []
 
     # ask nominatim
     @results = []
 
     # ask nominatim

-    response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")

 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|
 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|


@@ -234,8 +230,8 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue StandardError => ex
-    @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
+  rescue StandardError => e
+    @error = "Error contacting nominatim.openstreetmap.org: #{e}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -251,7 +247,7 @@ class GeocoderController < ApplicationController
     @results = []
 
     # ask geonames.org
     @results = []
 
     # ask geonames.org

-    response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}")
+    response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{Settings.geonames_username}")

 
     # parse the response
     response.elements.each("geonames/countrySubdivision") do |geoname|
 
     # parse the response
     response.elements.each("geonames/countrySubdivision") do |geoname|


@@ -259,14 +255,14 @@ class GeocoderController < ApplicationController
       country = geoname.text("countryName")
 
       @results.push(:lat => lat, :lon => lon,
       country = geoname.text("countryName")
 
       @results.push(:lat => lat, :lon => lon,

-                    :zoom => GEONAMES_ZOOM,
+                    :zoom => Settings.geonames_zoom,

                     :name => name,
                     :suffix => ", #{country}")
     end
 
     render :action => "results"
                     :name => name,
                     :suffix => ", #{country}")
     end
 
     render :action => "results"

-  rescue StandardError => ex
-    @error = "Error contacting api.geonames.org: #{ex}"
+  rescue StandardError => e
+    @error = "Error contacting api.geonames.org: #{e}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -311,10 +307,12 @@ class GeocoderController < ApplicationController
 
       elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/)
         params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query)
 
       elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/)
         params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query)

+
+        params[:latlon_digits] = true unless params[:whereami]

       end
     end
 
       end
     end
 

-    params.permit(:query, :lat, :lon, :zoom, :minlat, :minlon, :maxlat, :maxlon)
+    params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon)

   end
 
   def nsew_to_decdeg(captures)
   end
 
   def nsew_to_decdeg(captures)