Merge #567

567: Partial fix of geo search in full dezoom r=bidoubiwa a=bidoubiwa

![Large GIF (542x524)](https://user-images.githubusercontent.com/33010418/138096055-68691c7d-49b6-4910-b097-5bd0fe3b72b3.gif)

Fixes partially #551 . It now works great until you decide to slide to the east or the west! 

Thanks `@ManyTheFish` :) 

Co-authored-by: Charlotte Vermandel <[email protected]>

Author: bors[bot]

playgrounds/geo-javascript/setup/settings.json

@@ -1,12 +1,4 @@
 {
-  "rankingRules": [
-    "words",
-    "typo",
-    "proximity",
-    "attribute",
-    "sort",
-    "exactness"
-  ],
   "filterableAttributes": [
     "_geo"
   ],

src/adapter/search-request-adapter/__tests__/geo-rules.tests.ts

@@ -10,16 +10,14 @@ test('Adapt geoPoints rules with same 0 lat and 0 lng geo points', () => {
     insideBoundingBox: '0,0,0,0',
   })
 
-  expect(rules?.filter).toBe('_geoRadius(0, 0, 0)')
+  expect(rules?.filter).toBe('_geoRadius(0.00000, 0.00000, 0)')
 })
 
 test('Adapt geoPoints rules with integer geo points', () => {
   const rules = adaptGeoPointsRules({
     insideBoundingBox: '1,2,3,4',
   })
-  expect(rules?.filter).toBe(
-    '_geoRadius(2.0003044085023727, 2.999390393801055, 157201.47551181243)'
-  )
+  expect(rules?.filter).toBe('_geoRadius(3.17650, 3.19394, 157201.47551181243)')
 })
 
 test('Try geoContext with only a radius', () => {
@@ -41,15 +39,15 @@ test('Try geoContext with an aroundLatLng and a radius', () => {
     aroundLatLng: '51.1241999, 9.662499900000057',
     aroundRadius: 1,
   })
-  expect(rules?.filter).toBe('_geoRadius(51.1241999,  9.662499900000057, 1)')
+  expect(rules?.filter).toBe('_geoRadius(51.12420, 9.66250, 1)')
 })
 
 test('Try geoContext with an aroundLatLng and a 0 radius', () => {
   const rules = adaptGeoPointsRules({
     aroundLatLng: '51.1241999, 9.662499900000057',
     aroundRadius: 0,
   })
-  expect(rules?.filter).toBe('_geoRadius(51.1241999,  9.662499900000057, 0)')
+  expect(rules?.filter).toBe('_geoRadius(51.12420, 9.66250, 0)')
 })
 
 test('Try geoContext with aroundLatLng, radius and insideBoundingBox', () => {
@@ -58,25 +56,19 @@ test('Try geoContext with aroundLatLng, radius and insideBoundingBox', () => {
     aroundRadius: 1,
     insideBoundingBox: '1,2,3,4',
   })
-  expect(rules?.filter).toBe(
-    '_geoRadius(2.0003044085023727, 2.999390393801055, 157201.47551181243)'
-  )
+  expect(rules?.filter).toBe('_geoRadius(3.17650, 3.19394, 157201.47551181243)')
 })
 test('Try geoContext with a radius and insideBoundingBox', () => {
   const rules = adaptGeoPointsRules({
     aroundRadius: 1,
     insideBoundingBox: '1,2,3,4',
   })
-  expect(rules?.filter).toBe(
-    '_geoRadius(2.0003044085023727, 2.999390393801055, 157201.47551181243)'
-  )
+  expect(rules?.filter).toBe('_geoRadius(3.17650, 3.19394, 157201.47551181243)')
 })
 test('Try geoContext with aroundLatLng and insideBoundingBox', () => {
   const rules = adaptGeoPointsRules({
     aroundLatLng: '51.1241999, 9.662499900000057',
     insideBoundingBox: '1,2,3,4',
   })
-  expect(rules?.filter).toBe(
-    '_geoRadius(2.0003044085023727, 2.999390393801055, 157201.47551181243)'
-  )
+  expect(rules?.filter).toBe('_geoRadius(3.17650, 3.19394, 157201.47551181243)')
 })

src/adapter/search-request-adapter/__tests__/search-params.tests.ts

@@ -36,7 +36,7 @@ test('Adapt SearchContext with filters, sort and geo rules ', () => {
   })
 
   expect(searchParams.filter).toStrictEqual([
-    '_geoRadius(0, 0, 0)',
+    '_geoRadius(0.00000, 0.00000, 0)',
     ['genres="Drama"', 'genres="Thriller"'],
     ['title="Ariel"'],
   ])
@@ -54,7 +54,7 @@ test('Adapt SearchContext with only facetFilters and geo rules ', () => {
   })
 
   expect(searchParams.filter).toEqual([
-    '_geoRadius(0, 0, 0)',
+    '_geoRadius(0.00000, 0.00000, 0)',
     ['genres="Drama"', 'genres="Thriller"'],
     ['title="Ariel"'],
   ])
@@ -70,7 +70,7 @@ test('Adapt SearchContext with only sort and geo rules ', () => {
     sort: 'id < 1',
   })
 
-  expect(searchParams.filter).toEqual(['_geoRadius(0, 0, 0)'])
+  expect(searchParams.filter).toEqual(['_geoRadius(0.00000, 0.00000, 0)'])
   expect(searchParams.sort).toStrictEqual(['id < 1'])
   expect(searchParams.attributesToHighlight).toContain('*')
   expect(searchParams.attributesToHighlight?.length).toBe(1)
@@ -83,7 +83,7 @@ test('Adapt SearchContext with no sort abd no filters and geo rules ', () => {
     insideBoundingBox: '0,0,0,0',
   })
 
-  expect(searchParams.filter).toEqual(['_geoRadius(0, 0, 0)'])
+  expect(searchParams.filter).toEqual(['_geoRadius(0.00000, 0.00000, 0)'])
   expect(searchParams.attributesToHighlight).toContain('*')
   expect(searchParams.attributesToHighlight?.length).toBe(1)
 })

src/adapter/search-request-adapter/geo-rules-adapter.ts

@@ -40,8 +40,9 @@ export function adaptGeoPointsRules(
   }
 
   if (middlePoint != null && radius != null) {
-    const [lat3, lng3] = middlePoint.split(',')
-
+    let [lat3, lng3] = middlePoint.split(',')
+    lat3 = Number.parseFloat(lat3).toFixed(5)
+    lng3 = Number.parseFloat(lng3).toFixed(5)
     const filter = `_geoRadius(${lat3}, ${lng3}, ${radius})`
 
     return { filter }

src/utils/geographic.ts

@@ -51,8 +51,13 @@ export function middleGeoPoints(
   let lng3 = Math.atan2(y, x)
   let lat3 = Math.atan2(z, Hyp)
 
-  lat3 = rad2degr(lat3)
-  lng3 = rad2degr(lng3)
+  if (lng1 < lng2 || (lng1 > lng2 && lng1 > Math.PI && lng2 < -Math.PI)) {
+    lat3 = lat3 + Math.PI
+    lng3 = lng3 + Math.PI
+  } else {
+    lat3 = rad2degr(lat3)
+    lng3 = rad2degr(lng3)
+  }
 
   if (
     Math.abs(x) < Math.pow(10, -9) &&