Merge branch 'master' into security-fixes-master

opensrp · Apr 19, 2023 · 5bb1928 · 5bb1928
2 parents 574eaa7 + 268cd45
commit 5bb1928
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.9-ALPHA-SNAPSHOT</version>
+	<version>3.2.10-ALPHA-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

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
@@ -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]') &lt;= #{radius,jdbcType=DOUBLE}
 
 	</select>

diff --git 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;