Fix issue matching locations to positions

This fixes an issue where locations don't match as we're using the wrong
projection to fetch latitude and longitude values.

Jira-Issue: MAV-6707
Jira-Issue: MAV-6379

Author: thomasleese

app/lib/location_position_updater.rb

@@ -28,10 +28,10 @@ def self.call(...) = new(...).call
 
   private
 
-  def full_address = location.address_parts.join(", ")
+  def query = [location.name, location.address_parts].join(", ")
 
   def position
-    response = OrdnanceSurvey::PlacesAPI.find(full_address)
+    response = OrdnanceSurvey::PlacesAPI.find(query)
 
     results = response[:results]
     raise NoResults if results.blank?

app/lib/ordnance_survey/places_api.rb

@@ -9,8 +9,8 @@ def initialize
       @base_url = "https://api.os.uk"
     end
 
-    def find(query)
-      params = { query:, format: "json" }
+    def find(query, max_results: 1, output_srs: "EPSG:4326")
+      params = { query:, maxresults: max_results, output_srs:, format: "json" }
       response = connection.get("/search/places/v1/find", params)
       response.body.deep_transform_keys(&:downcase).deep_symbolize_keys
     end

spec/lib/location_position_updater_spec.rb

@@ -7,6 +7,7 @@
     let(:location) do
       create(
         :community_clinic,
+        name: "Westminster Clinic",
         address_line_1: "1 High Street",
         address_town: "London",
         address_postcode: "SW1A 1AA",
@@ -49,7 +50,7 @@
 
       it "calls the API with the address" do
         expect(OrdnanceSurvey::PlacesAPI).to receive(:find).with(
-          "1 High Street, London, SW1A 1AA"
+          "Westminster Clinic, 1 High Street, London, SW1A 1AA"
         )
         call
       end
@@ -93,6 +94,7 @@
       let(:location) do
         create(
           :community_clinic,
+          name: "Westminster Clinic",
           address_line_1: "1 High Street",
           address_town: nil,
           address_postcode: "SW1A 1AA",
@@ -115,7 +117,7 @@
 
       it "calls the API with partial address" do
         expect(OrdnanceSurvey::PlacesAPI).to receive(:find).with(
-          "1 High Street, SW1A 1AA"
+          "Westminster Clinic, 1 High Street, SW1A 1AA"
         )
         call
       end

spec/lib/ordnance_survey/places_api_spec.rb

@@ -72,7 +72,12 @@
 
       before do
         stub_request(:get, "#{api_url}/search/places/v1/find").with(
-          query: hash_including(query:, format: "json"),
+          query: {
+            query:,
+            format: "json",
+            maxresults: 1,
+            output_srs: "EPSG:4326"
+          },
           headers: {
             "Key" => api_key
           }
@@ -103,7 +108,12 @@
     context "when the request is invalid" do
       before do
         stub_request(:get, "#{api_url}/search/places/v1/find").with(
-          query: hash_including(query:, format: "json"),
+          query: {
+            query:,
+            format: "json",
+            maxresults: 1,
+            output_srs: "EPSG:4326"
+          },
           headers: {
             "Key" => api_key
           }
@@ -123,7 +133,12 @@
     context "when rate limit is exceeded" do
       before do
         stub_request(:get, "#{api_url}/search/places/v1/find").with(
-          query: hash_including(query:, format: "json"),
+          query: {
+            query:,
+            format: "json",
+            maxresults: 1,
+            output_srs: "EPSG:4326"
+          },
           headers: {
             "Key" => api_key
           }
@@ -138,7 +153,12 @@
     context "when there is an unexpected error" do
       before do
         stub_request(:get, "#{api_url}/search/places/v1/find").with(
-          query: hash_including(query:, format: "json"),
+          query: {
+            query:,
+            format: "json",
+            maxresults: 1,
+            output_srs: "EPSG:4326"
+          },
           headers: {
             "Key" => api_key
           }