adjust SRID and use native ST_GEOMFROMGEOJSON

CartoDB · Dec 29, 2023 · 992dfb9 · 992dfb9
1 parent 745a99e
commit 992dfb9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 38 deletions.
diff --git a/clouds/redshift/modules/sql/constructors/ST_BEZIERSPLINE.sql b/clouds/redshift/modules/sql/constructors/ST_BEZIERSPLINE.sql
@@ -40,10 +40,8 @@ $$ LANGUAGE sql;
 CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_BEZIERSPLINE
 (GEOMETRY, INT, FLOAT8)
 -- (linestring, resolution, sharpness)
-RETURNS VARCHAR(MAX)
--- RETURNS GEOMETRY
+RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT @@RS_SCHEMA@@.__BEZIERSPLINE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3)
-    -- SELECT ST_GEOMFROMGEOJSON(@@RS_SCHEMA@@.__BEZIERSPLINE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3))
+    SELECT ST_GEOMFROMGEOJSON(@@RS_SCHEMA@@.__BEZIERSPLINE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3))
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/constructors/ST_MAKEELLIPSE.sql b/clouds/redshift/modules/sql/constructors/ST_MAKEELLIPSE.sql
@@ -67,10 +67,8 @@ $$ LANGUAGE sql;
 CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_MAKEELLIPSE
 (GEOMETRY, FLOAT8, FLOAT8, FLOAT8, VARCHAR(10), INT)
 -- (center, xSemiAxis, ySemiAxis, angle, units, steps)
-RETURNS VARCHAR(MAX)
--- RETURNS GEOMETRY
+RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT @@RS_SCHEMA@@.__MAKEELLIPSE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, $4, $5, $6)
-    -- SELECT ST_GEOMFROMGEOJSON(@@RS_SCHEMA@@.__MAKEELLIPSE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, $4, $5, $6))
+    SELECT ST_GEOMFROMGEOJSON(@@RS_SCHEMA@@.__MAKEELLIPSE(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, $4, $5, $6))
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/constructors/ST_MAKEENVELOPE.sql b/clouds/redshift/modules/sql/constructors/ST_MAKEENVELOPE.sql
@@ -8,5 +8,5 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_MAKEENVELOPE
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT('POLYGON((' || $1 || ' ' || $2 || ',' || $1 || ' ' || $4 || ',' || $3 || ' ' || $4 || ',' || $3 || ' ' || $2 || ',' || $1 || ' ' || $2 || '))')
+    SELECT ST_GEOMFROMTEXT('POLYGON((' || $1 || ' ' || $2 || ',' || $1 || ' ' || $4 || ',' || $3 || ' ' || $4 || ',' || $3 || ' ' || $2 || ',' || $1 || ' ' || $2 || '))', 4326)
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/helpers/__ST_GEOMFROMGEOJSON.sql b/clouds/redshift/modules/sql/helpers/__ST_GEOMFROMGEOJSON.sql
diff --git a/clouds/redshift/modules/sql/transformations/ST_CENTERMEAN.sql b/clouds/redshift/modules/sql/transformations/ST_CENTERMEAN.sql
@@ -31,6 +31,6 @@ RETURNS GEOMETRY
 STABLE
 AS $$
 
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTERMEAN(ST_ASGEOJSON($1)::VARCHAR(MAX)))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTERMEAN(ST_ASGEOJSON($1)::VARCHAR(MAX)), 4326)
 
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/transformations/ST_CENTERMEDIAN.sql b/clouds/redshift/modules/sql/transformations/ST_CENTERMEDIAN.sql
@@ -29,5 +29,5 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_CENTERMEDIAN
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTERMEDIAN(ST_ASGEOJSON($1)::VARCHAR(MAX), 100))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTERMEDIAN(ST_ASGEOJSON($1)::VARCHAR(MAX), 100), 4326)
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/transformations/ST_CENTROID.sql b/clouds/redshift/modules/sql/transformations/ST_CENTROID.sql
@@ -30,5 +30,5 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_CENTROID
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTROID(ST_ASGEOJSON($1)::VARCHAR(MAX)))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__CENTROID(ST_ASGEOJSON($1)::VARCHAR(MAX)), 4326)
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/transformations/ST_DESTINATION.sql b/clouds/redshift/modules/sql/transformations/ST_DESTINATION.sql
@@ -31,7 +31,7 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_DESTINATION
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__DESTINATION(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, 'kilometers'))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__DESTINATION(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, 'kilometers'), 4326)
 $$ LANGUAGE sql;
 
 
@@ -41,5 +41,5 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_DESTINATION
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__DESTINATION(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, $4))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__DESTINATION(ST_ASGEOJSON($1)::VARCHAR(MAX), $2, $3, $4), 4326)
 $$ LANGUAGE sql;
diff --git a/clouds/redshift/modules/sql/transformations/ST_GREATCIRCLE.sql b/clouds/redshift/modules/sql/transformations/ST_GREATCIRCLE.sql
@@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_GREATCIRCLE
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__GREATCIRCLE(ST_ASGEOJSON($1)::VARCHAR(MAX), ST_ASGEOJSON($2)::VARCHAR(MAX), 100))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__GREATCIRCLE(ST_ASGEOJSON($1)::VARCHAR(MAX), ST_ASGEOJSON($2)::VARCHAR(MAX), 100), 4326)
 $$ LANGUAGE sql;
 
 CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_GREATCIRCLE
@@ -44,5 +44,5 @@ CREATE OR REPLACE FUNCTION @@RS_SCHEMA@@.ST_GREATCIRCLE
 RETURNS GEOMETRY
 STABLE
 AS $$
-    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__GREATCIRCLE(ST_ASGEOJSON($1)::VARCHAR(MAX), ST_ASGEOJSON($2)::VARCHAR(MAX), $3))
+    SELECT ST_GEOMFROMTEXT(@@RS_SCHEMA@@.__GREATCIRCLE(ST_ASGEOJSON($1)::VARCHAR(MAX), ST_ASGEOJSON($2)::VARCHAR(MAX), $3), 4326)
 $$ LANGUAGE sql;