in memory polygon support

DFE-Digital · Dec 4, 2024 · f28c39f · f28c39f
1 parent cc8ce5b
commit f28c39f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 267 deletions.
diff --git a/app/models/location_polygon.rb b/app/models/location_polygon.rb
@@ -5,9 +5,6 @@ class LocationPolygon < ApplicationRecord
 
   # Scope that expands any polygons returned by subsequent scopes by the provided radius
   # by overriding the `area` attribute with a buffered version of itself
-  #
-  # TODO: This is a "clever" temporary solution to allow us to generate expanded polygons
-  #       to send to Algolia, and should be removed once we search through ActiveRecord.
   scope :buffered, ->(radius_in_miles) { select("*, ST_Buffer(area, #{convert_miles_to_metres(radius_in_miles || 0)}) AS area") }
 
   def self.with_name(location)

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
@@ -87,13 +87,11 @@ def limit_by_location(vacancies, location, radius_in_miles)
       if query.blank? || LocationQuery::NATIONWIDE_LOCATIONS.include?(query)
         vacancies
       else
-        #TODO: add polygon support? 'within?' function for polygons doesn't support distance like ST_Within function does
-        radius_in_metres = convert_miles_to_metres radius_in_miles
-
-        polygon = LocationPolygon.with_name(query)
+        polygon = LocationPolygon.buffered(radius_in_miles).with_name(query)
         if polygon.present?
-          vacancies.select { |v| v.organisations.map(&:geopoint).any? { |point| point.buffer(radius_in_metres).intersects?(polygon.area) } }
+          vacancies.select { |v| v.organisations.map(&:geopoint).any? { |point| polygon.area.contains?(point) } }
         else
+          radius_in_metres = convert_miles_to_metres radius_in_miles
           coordinates = Geocoding.new(query).coordinates
           search_point = RGeo::Geographic.spherical_factory.point(coordinates.second, coordinates.first)
           vacancies.select { |v| v.organisations.map(&:geopoint).any? { |point| search_point.distance(point) < radius_in_metres } }

diff --git a/...es/with_location/with_a_polygon_Basildon_/with_a_large_radius/finds_liverpool_as_well.yml b/...es/with_location/with_a_polygon_Basildon_/with_a_large_radius/finds_liverpool_as_well.yml
diff --git a/...h_location/with_a_polygon_Basildon_/with_a_medium_radius/finds_basildon_and_st_albans.yml b/...h_location/with_a_polygon_Basildon_/with_a_medium_radius/finds_basildon_and_st_albans.yml
diff --git a/...ancies/with_location/with_a_polygon_Basildon_/with_a_small_radius/finds_just_basildon.yml b/...ancies/with_location/with_a_polygon_Basildon_/with_a_small_radius/finds_just_basildon.yml
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
@@ -189,7 +189,7 @@
           end
         end
 
-        context "with a polygon (Basildon)", :geocode, :vcr do
+        context "with a polygon (Basildon)" do
           let(:subscription) { create(:daily_subscription, location: "Basildon", radius: radius) }
 
           context "with a small radius" do