Skip to content

Commit

Permalink
Adjust tests to changed function signatures.
Browse files Browse the repository at this point in the history 
Signed-off-by: Maximilian Chrzan <[email protected]>
Signed-off-by: mchrza <[email protected]>
  • Loading branch information
@mchrza
mchrza committed Feb 6, 2025
1 parent 0ac3ce2 commit 411d0c3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
12 changes: 6 additions & 6 deletions xyz-util/src/main/resources/sql/geo.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ $$ LANGUAGE sql IMMUTABLE PARALLEL SAFE;
-- select here_quad(13.4050::FLOAT, 52.5200::FLOAT, 14);
-- select here_quad_crl('377894440')
-- select here_quad_crl(13.4050::FLOAT, 52.5200::FLOAT, 14)
-- select ST_AsGeojson(here_quad_base4_to_bbox(405,550,10))
-- select ST_AsGeojson(here_quad_to_bbox(405,550,10))
-- --- Base4
-- select here_quad_crl('12201203120220',true);
-- select here_quad_base4_to_base10('12201203120220');
-- select ST_AsGeojson(here_quad_base4_to_bbox('12201203120220'))
-- select ST_AsGeojson(here_quad_to_bbox('12201203120220'))

-----------------------------------------------------------------------------------------------
CREATE OR REPLACE FUNCTION here_quad(lonX DOUBLE PRECISION, latY DOUBLE PRECISION, level INT)
Expand Down Expand Up @@ -214,7 +214,7 @@ BEGIN
END;
$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
-----------------------------------------------------------------------------------------------
CREATE OR REPLACE FUNCTION here_quad_base4_to_bbox(colX INTEGER, rowY INTEGER, level INTEGER)
CREATE OR REPLACE FUNCTION here_quad_to_bbox(colX INTEGER, rowY INTEGER, level INTEGER)
RETURNS GEOMETRY AS $$
DECLARE
height float;
Expand All @@ -240,9 +240,9 @@ BEGIN
END
$$ LANGUAGE plpgsql IMMUTABLE STRICT PARALLEL SAFE;
-----------------------------------------------------------------------------------------------
CREATE OR REPLACE FUNCTION here_quad_base4_to_bbox(qk TEXT)
CREATE OR REPLACE FUNCTION here_quad_to_bbox(qk TEXT)
RETURNS GEOMETRY AS $$
SELECT here_quad_base4_to_bbox(colX,rowY, level) FROM here_quad_crl( qk,true );
SELECT here_quad_to_bbox(colX,rowY, level) FROM here_quad_crl( qk,true );
$$ LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE;
-----------------------------------------------------------------------------------------------
CREATE OR REPLACE FUNCTION here_quad_base4_to_base10(qk TEXT)
Expand Down Expand Up @@ -367,7 +367,7 @@ BEGIN
IF quad_type = 'MERCATOR_QUAD' THEN
RETURN mercator_quad_to_bbox(colX,rowY,level);
ELSE
RETURN here_quad_base4_to_bbox( colX, rowY, level);
RETURN here_quad_to_bbox( colX, rowY, level);
END IF;
END;
$$ LANGUAGE plpgsql IMMUTABLE PARALLEL SAFE;
Expand Down
33 changes: 17 additions & 16 deletions xyz-util/src/test/java/com/here/xyz/test/SQLGeoQuadFunctions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@ public class SQLGeoQuadFunctions extends SQLITBase{
@Test
public void mercator_quad_lrc_to_qk() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT mercator_quad(335,550,10);");
SQLQuery query = new SQLQuery("SELECT mercator_quad(550,335,10);");
Assertions.assertEquals("1202102332", query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
}
}

@Test
public void mercator_quad_point_to_qk() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT mercator_quad(ST_SetSRID(ST_MakePoint(13.4050, 52.5200), 4326), 10);");
SQLQuery query = new SQLQuery("SELECT mercator_quad(13.4050, 52.5200, 10);");
Assertions.assertEquals("1202102332", query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
}
}

@Test
public void mercator_quad_point_to_lrc() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT rowY, colX, level FROM " +
"mercator_quad_to_lrc(ST_SetSRID(ST_MakePoint(13.4050, 52.5200), 4326), 10);");
Assertions.assertEquals("335,550,10", query.run(dsp, rs -> rs.next() ? rs.getInt(1)
SQLQuery query = new SQLQuery("SELECT colX, rowY, level FROM " +
"mercator_quad_crl(3.4050, 52.5200, 10);");
Assertions.assertEquals("521,335,10", query.run(dsp, rs -> rs.next() ? rs.getInt(1)
+ "," + rs.getInt(2) + "," + rs.getInt(3) : null));
}
}

@Test
public void mercator_quad_qk_to_lrc() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT rowY, colX, level FROM mercator_quad_to_lrc(mercator_quad(335,550,10));");
SQLQuery query = new SQLQuery("SELECT colX, rowY, level FROM mercator_quad_crl(mercator_quad(335,550,10));");
Assertions.assertEquals("335,550,10", query.run(dsp, rs -> rs.next() ? rs.getInt(1)
+ "," + rs.getInt(2) + "," + rs.getInt(3) : null));
}
Expand All @@ -46,7 +46,7 @@ public void mercator_quad_qk_to_lrc() throws Exception {
@Test
public void mercator_quad_to_bbox() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(mercator_quad_to_bbox(335,550,10));");
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(mercator_quad_to_bbox(550,335,10));");
Assertions.assertEquals("{\"type\":\"Polygon\",\"coordinates\":[[[13.359375,52.482780222]," +
"[13.359375,52.696361078],[13.7109375,52.696361078],[13.7109375,52.482780222],[13.359375,52.482780222]]]}",
query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
Expand All @@ -56,7 +56,7 @@ public void mercator_quad_to_bbox() throws Exception {
@Test
public void mercator_quad_qk_to_bbox() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(mercator_quad_to_bbox(mercator_quad(335,550,10)));");
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(mercator_quad_to_bbox(mercator_quad(550,335,10)));");
Assertions.assertEquals("{\"type\":\"Polygon\",\"coordinates\":[[[13.359375,52.482780222],[13.359375,52.696361078]," +
"[13.7109375,52.696361078],[13.7109375,52.482780222],[13.359375,52.482780222]]]}",
query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
Expand Down Expand Up @@ -93,15 +93,16 @@ public void here_quad_point_base10() throws Exception {
@Test
public void here_quad_to_lrc_base10() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT rowY, colX, lev, hkey FROM here_quad_to_lrc('377894440', false);");
Assertions.assertEquals("6486,8800,14,377894440", query.run(dsp, rs -> rs.next() ? rs.getInt(1) + "," + rs.getInt(2) + "," + rs.getInt(3) + "," + rs.getLong(4) : null));
SQLQuery query = new SQLQuery("SELECT rowY, colX, level, hkey FROM here_quad_crl('377894440');");
Assertions.assertEquals("6486,8800,14,377894440", query.run(dsp,
rs -> rs.next() ? rs.getInt(1) + "," + rs.getInt(2) + "," + rs.getInt(3) + "," + rs.getLong(4) : null));
}
}

@Test
public void here_quad_to_bbox_base10() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(here_quad_to_bbox(405,550,10));");
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(here_quad_to_bbox(550,405,10));");
Assertions.assertEquals("{\"type\":\"Polygon\",\"coordinates\":[[[13.359375,52.3828125]," +
"[13.359375,52.734375],[13.7109375,52.734375],[13.7109375,52.3828125],[13.359375,52.3828125]]]}",
query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
Expand All @@ -112,17 +113,17 @@ public void here_quad_to_bbox_base10() throws Exception {
@Test
public void here_quad_to_long_key_base4() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT here_quad_to_long_key('12201203120220');");
SQLQuery query = new SQLQuery("SELECT here_quad_base4_to_base10('12201203120220');");
Assertions.assertEquals("377894440", query.run(dsp, rs -> rs.next() ? rs.getString(1) : null));
}
}

@Test
public void here_quad_to_lrc_base4() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT rowY, colX, lev, hkey FROM " +
"here_quad_to_lrc('12201203120220', true);");
Assertions.assertEquals("6486,8800,14,377894440",
SQLQuery query = new SQLQuery("SELECT colX, rowY, level, hkey FROM " +
"here_quad_crl('12201203120220', true);");
Assertions.assertEquals("8800,6486,14,377894440",
query.run(dsp, rs -> rs.next() ? rs.getInt(1)
+ "," + rs.getInt(2) + "," + rs.getInt(3) + "," + rs.getLong(4) : null));
}
Expand All @@ -131,7 +132,7 @@ public void here_quad_to_lrc_base4() throws Exception {
@Test
public void here_quad_to_bbox_base4() throws Exception {
try (DataSourceProvider dsp = getDataSourceProvider()) {
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(here_quad_to_bbox('12201203120220'));");
SQLQuery query = new SQLQuery("SELECT ST_AsGeojson(here_quad_base4_to_bbox('12201203120220'));");
Assertions.assertEquals("{\"type\":\"Polygon\",\"coordinates\":[[[13.359375,52.514648438]," +
"[13.359375,52.536621094],[13.381347656,52.536621094],[13.381347656,52.514648438]," +
"[13.359375,52.514648438]]]}",
Expand Down

0 comments on commit 411d0c3

Please sign in to comment.