Skip to content

Commit a15478d

Browse files
committed
1 parent 505e72b commit a15478d

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

app/controllers/search_controller.rb

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
class SearchController < ApplicationController
22
before_action :validate_q!, only: %i[results]
33

4-
if Feature.enabled?(:geodata)
5-
before_action :validate_geobox_presence!, only: %i[results]
6-
before_action :validate_geobox_range!, only: %i[results]
7-
before_action :validate_geobox_values!, only: %i[results]
8-
before_action :validate_geodistance_presence!, only: %i[results]
9-
before_action :validate_geodistance_range!, only: %i[results]
10-
before_action :validate_geodistance_value!, only: %i[results]
11-
before_action :validate_geodistance_units!, only: %i[results]
12-
end
4+
before_action :validate_geobox_presence!, only: %i[results]
5+
before_action :validate_geobox_range!, only: %i[results]
6+
before_action :validate_geobox_values!, only: %i[results]
7+
before_action :validate_geodistance_presence!, only: %i[results]
8+
before_action :validate_geodistance_range!, only: %i[results]
9+
before_action :validate_geodistance_value!, only: %i[results]
10+
before_action :validate_geodistance_units!, only: %i[results]
1311

1412
def results
1513
# inject session preference for boolean type if it is present
@@ -185,6 +183,8 @@ def validate_q!
185183
end
186184

187185
def validate_geodistance_presence!
186+
return unless Feature.enabled?(:geodata)
187+
188188
return unless params[:geodistance]&.strip == 'true'
189189

190190
geodistance_params = [params[:geodistanceLatitude]&.strip, params[:geodistanceLongitude]&.strip,
@@ -196,6 +196,8 @@ def validate_geodistance_presence!
196196
end
197197

198198
def validate_geobox_presence!
199+
return unless Feature.enabled?(:geodata)
200+
199201
return unless params[:geobox]&.strip == 'true'
200202

201203
geobox_params = [params[:geoboxMinLatitude]&.strip, params[:geoboxMinLongitude]&.strip,
@@ -207,6 +209,8 @@ def validate_geobox_presence!
207209
end
208210

209211
def validate_geodistance_range!
212+
return unless Feature.enabled?(:geodata)
213+
210214
return unless params[:geodistance]&.strip == 'true'
211215

212216
invalid_range = false
@@ -222,6 +226,8 @@ def validate_geodistance_range!
222226
end
223227

224228
def validate_geobox_range!
229+
return unless Feature.enabled?(:geodata)
230+
225231
return unless params[:geobox]&.strip == 'true'
226232

227233
invalid_range = false
@@ -237,6 +243,8 @@ def validate_geobox_range!
237243
end
238244

239245
def validate_geodistance_value!
246+
return unless Feature.enabled?(:geodata)
247+
240248
return unless params[:geodistance]&.strip == 'true'
241249

242250
distance = params[:geodistanceDistance]&.strip.to_i
@@ -247,6 +255,8 @@ def validate_geodistance_value!
247255
end
248256

249257
def validate_geodistance_units!
258+
return unless Feature.enabled?(:geodata)
259+
250260
return unless params[:geodistance]&.strip == 'true'
251261

252262
distance = params[:geodistanceDistance]&.strip
@@ -265,6 +275,8 @@ def validate_geodistance_units!
265275
end
266276

267277
def validate_geobox_values!
278+
return unless Feature.enabled?(:geodata)
279+
268280
return unless params[:geobox]&.strip == 'true'
269281

270282
geobox_lat = [params[:geoboxMinLatitude]&.strip.to_f, params[:geoboxMaxLatitude]&.strip.to_f]

0 commit comments

Comments
 (0)