X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..657ed03d8b2e262bc965cc38e8af190624c3295b:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index a877fc092..d1af43a72 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -17,11 +17,11 @@ class GeocoderController < ApplicationController @sources.push "osm_nominatim_reverse" @sources.push "geonames_reverse" if Settings.key?(:geonames_username) elsif @params[:query] - if @params[:query] =~ /^\d{5}(-\d{4})?$/ + if @params[:query].match?(/^\d{5}(-\d{4})?$/) @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 + 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" - 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 @@ -98,8 +98,8 @@ class GeocoderController < ApplicationController 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 @@ -166,8 +166,8 @@ class GeocoderController < ApplicationController 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 @@ -198,8 +198,8 @@ class GeocoderController < ApplicationController 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 @@ -230,8 +230,8 @@ class GeocoderController < ApplicationController 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 @@ -261,8 +261,8 @@ class GeocoderController < ApplicationController 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