diff --git a/pom.xml b/pom.xml index 95e14bc79..7d897442e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ opensrp-server-core jar - 3.2.8-SNAPSHOT + 3.2.9-SNAPSHOT opensrp-server-core OpenSRP Server Core module https://github.com/OpenSRP/opensrp-server-core diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomStructureMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomStructureMapper.xml index 92acd29d9..734612634 100644 --- a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomStructureMapper.xml +++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomStructureMapper.xml @@ -44,7 +44,7 @@ ,c.base_entity_id ,c.relational_id ,c.last_name from core.structure s left join core.client_metadata c on c.residence=json->>'id' - where ST_DistanceSpheroid(ST_GeomFromGeoJSON(json->>'geometry'), ST_MakePoint(#{longitude,jdbcType=DOUBLE}, #{latitude,jdbcType=DOUBLE}), + where ST_DistanceSpheroid(ST_SetSRID(ST_GeomFromGeoJSON(json->>'geometry'),4326), ST_SetSRID(ST_MakePoint(#{longitude,jdbcType=DOUBLE}, #{latitude,jdbcType=DOUBLE}),4326), 'SPHEROID["WGS 84",6378137,298.257223563]') <= #{radius,jdbcType=DOUBLE} diff --git a/src/test/java/org/opensrp/TestPostgresInstance.java b/src/test/java/org/opensrp/TestPostgresInstance.java index 48e1c6ef9..4aef82761 100644 --- a/src/test/java/org/opensrp/TestPostgresInstance.java +++ b/src/test/java/org/opensrp/TestPostgresInstance.java @@ -13,7 +13,7 @@ public abstract class TestPostgresInstance { protected static final String POSTGRES_DB_CONFIG = "POSTGRES_DB"; protected static final String POSTGRES_DB = "opensrp_test"; - private static final String DOCKER_IMAGE_NAME = "postgis/postgis:12-2.5-alpine"; + private static final String DOCKER_IMAGE_NAME = "postgis/postgis:14-3.3-alpine"; protected static final int DOCKER_EXPOSE_PORT = 5432;