cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer String#match? over butt ugly Regexp#match?

Browse source
This commit is contained in:
Tom Hughes 2019-03-26 19:12:18 +00:00
parent 5a5aa5f880
commit 9afcf14dfa
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/geocoder_controller.rb
View file

@ -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 /^\d{5}(-\d{4})?$/.match?(@params[:query])
if @params[:query].match?(/^\d{5}(-\d{4})?$/)
@sources.push "osm_nominatim"
elsif /^(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.match?(@params[:query])
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 /^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i.match?(@params[:query])
elsif @params[:query].match?(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
@sources.push "ca_postcode"
@sources.push "osm_nominatim"
else