From 8e29c117259920af5c0828e205ca30a2a9994193 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 31 Mar 2025 01:27:33 +0300 Subject: [PATCH] Remove RuboCop AssignmentInCondition exclusion for search --- .rubocop_todo.yml | 1 - app/controllers/geocoder_controller.rb | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a60cd9442..e94c16398 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -38,7 +38,6 @@ Lint/AssignmentInCondition: - 'app/controllers/accounts_controller.rb' - 'app/controllers/api/traces_controller.rb' - 'app/controllers/api/user_preferences_controller.rb' - - 'app/controllers/geocoder_controller.rb' - 'app/controllers/traces_controller.rb' - 'app/controllers/users_controller.rb' - 'app/helpers/application_helper.rb' diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 81c179a67..c2d35ba77 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -213,14 +213,14 @@ class GeocoderController < ApplicationController end def normalize_params - if query = params[:query] + if (query = params[:query]) query.strip! - if latlon = query.match(/^(?[NS])\s*#{dms_regexp('ns')}\W*(?[EW])\s*#{dms_regexp('ew')}$/) || - query.match(/^#{dms_regexp('ns')}\s*(?[NS])\W*#{dms_regexp('ew')}\s*(?[EW])$/) + if (latlon = query.match(/^(?[NS])\s*#{dms_regexp('ns')}\W*(?[EW])\s*#{dms_regexp('ew')}$/) || + query.match(/^#{dms_regexp('ns')}\s*(?[NS])\W*#{dms_regexp('ew')}\s*(?[EW])$/)) params.merge!(to_decdeg(latlon.named_captures.compact)).delete(:query) - elsif latlon = query.match(%r{^(?[+-]?\d+(?:\.\d+)?)(?:\s+|\s*[,/]\s*)(?[+-]?\d+(?:\.\d+)?)$}) + elsif (latlon = query.match(%r{^(?[+-]?\d+(?:\.\d+)?)(?:\s+|\s*[,/]\s*)(?[+-]?\d+(?:\.\d+)?)$})) params.merge!(:lat => latlon["lat"], :lon => latlon["lon"]).delete(:query) params[:latlon_digits] = true -- 2.39.5