Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-04 04:22:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: geo.point has wrong mapping

Browse Source
This commit is contained in:
Thea Schöbl
2024-06-28 14:10:41 +02:00
committed by Rainer Killinger
parent 142079bf0e
commit 67ab1fd613
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/rich-rats-guess.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@openstapps/backend": patch
---
fix for geo.point mapping

2
backend/backend/src/storage/elasticsearch/query/filters/distance.ts
View File

@@ -25,7 +25,7 @@ export function buildDistanceFilter(
): QueryDslSpecificQueryContainer<'geo_distance'> { ): QueryDslSpecificQueryContainer<'geo_distance'> {
const geoObject: QueryDslGeoDistanceQuery = { const geoObject: QueryDslGeoDistanceQuery = {
distance: `${filter.arguments.distance}m`, distance: `${filter.arguments.distance}m`,
[`${filter.arguments.field}.point.coordinates`]: { [`${filter.arguments.field}.point`]: {
lat: filter.arguments.position[1], lat: filter.arguments.position[1],
lon: filter.arguments.position[0], lon: filter.arguments.position[0],
}, },

2
backend/backend/src/storage/elasticsearch/query/sort/distance.ts
View File

@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
mode: 'avg', mode: 'avg',
order: sort.order, order: sort.order,
unit: 'm', unit: 'm',
[`${sort.arguments.field}.point.coordinates`]: { [`${sort.arguments.field}.point`]: {
lat: sort.arguments.position[1], lat: sort.arguments.position[1],
lon: sort.arguments.position[0], lon: sort.arguments.position[0],
}, },

4
backend/backend/test/storage/elasticsearch/query.spec.ts
View File

@@ -466,7 +466,7 @@ describe('Query', function () {
const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = { const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
geo_distance: { geo_distance: {
'distance': '1000m', 'distance': '1000m',
'geo.point.coordinates': { 'geo.point': {
lat: 8.123, lat: 8.123,
lon: 50.123, lon: 50.123,
}, },
@@ -636,7 +636,7 @@ describe('Query', function () {
'mode': 'avg', 'mode': 'avg',
'order': 'desc', 'order': 'desc',
'unit': 'm', 'unit': 'm',
'geo.point.coordinates': { 'geo.point': {
lat: 50.123, lat: 50.123,
lon: 8.123, lon: 8.123,
}, },

10
packages/es-mapping-generator/src/config/premap.ts
View File

@@ -27,15 +27,7 @@ export const premaps: Record<string, MappingProperty> = {
type: 'geo_shape', type: 'geo_shape',
}, },
'Point': { 'Point': {
properties: { type: 'geo_point',
type: {
type: 'keyword',
},
coordinates: {
type: 'geo_point',
},
},
dynamic: 'strict',
}, },
'Polygon': { 'Polygon': {
type: 'geo_shape', type: 'geo_shape',