[ISSUE #22] Created spoint_deg, scircle_deg functions.

stepan-neretin7 · stepan-neretin7 · commit aa4613137d53 · 2023-08-01T12:28:19.000+07:00
diff --git a/Makefile b/Makefile
@@ -27,7 +27,8 @@ DATA_built  = $(RELEASE_SQL) \
 			  pg_sphere--1.1.5beta4gavo--1.2.0.sql \
 			  pg_sphere--1.2.0--1.2.1.sql \
 			  pg_sphere--1.2.1--1.2.2.sql \
-			  pg_sphere--1.2.2--1.2.3.sql
+			  pg_sphere--1.2.2--1.2.3.sql \
+			  pg_sphere--1.2.3--1.3.0.sql
 
 DOCS        = README.pg_sphere COPYRIGHT.pg_sphere
 REGRESS     = init tables points euler circle line ellipse poly path box index \
@@ -260,6 +261,9 @@ endif
 pg_sphere--1.2.2--1.2.3.sql:
 	cat upgrade_scripts/$@.in > $@
 
+pg_sphere--1.2.3--1.3.0.sql:
+	cat upgrade_scripts/$@.in > $@
+
 # end of local stuff
 
 src/sscan.o : src/sparse.c
diff --git a/expected/circle.out b/expected/circle.out
@@ -5,6 +5,22 @@
 (1 row)
 
 -- Input/Output ---
+SELECT scircle_deg(spoint(10,10), 90);
+               scircle_deg                
+------------------------------------------
+ <(0.57522204 , -0.57522204) , 1.5707963>
+(1 row)
+
+SELECT scircle_deg(spoint(10,10), 91);
+ERROR:  radius must not be greater than 90 degrees or less than 0
+SELECT scircle_deg(spoint(0,0), 0);
+  scircle_deg  
+---------------
+ <(0 , 0) , 0>
+(1 row)
+
+SELECT scircle_deg(spoint(10,10), -1);
+ERROR:  radius must not be greater than 90 degrees or less than 0
 SELECT set_sphere_output( 'RAD' );
  set_sphere_output 
 -------------------
diff --git a/expected/init_test.out.in b/expected/init_test.out.in
@@ -24,12 +24,12 @@ psql:pg_sphere.test.sql:159: NOTICE:  argument type spath is only a shell
 psql:pg_sphere.test.sql:178: NOTICE:  type "sbox" is not yet defined
 DETAIL:  Creating a shell type definition.
 psql:pg_sphere.test.sql:185: NOTICE:  argument type sbox is only a shell
-psql:pg_sphere.test.sql:8540: NOTICE:  type "spherekey" is not yet defined
+psql:pg_sphere.test.sql:8557: NOTICE:  type "spherekey" is not yet defined
 DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8547: NOTICE:  argument type spherekey is only a shell
-psql:pg_sphere.test.sql:8561: NOTICE:  type "pointkey" is not yet defined
+psql:pg_sphere.test.sql:8564: NOTICE:  argument type spherekey is only a shell
+psql:pg_sphere.test.sql:8578: NOTICE:  type "pointkey" is not yet defined
 DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8568: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8574: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8580: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8586: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8585: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8591: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8597: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8603: NOTICE:  argument type pointkey is only a shell
diff --git a/expected/init_test_healpix.out.in b/expected/init_test_healpix.out.in
@@ -1,2 +1,2 @@
-psql:pg_sphere.test.sql:9153: NOTICE:  return type smoc is only a shell
-psql:pg_sphere.test.sql:9159: NOTICE:  argument type smoc is only a shell
+psql:pg_sphere.test.sql:9170: NOTICE:  return type smoc is only a shell
+psql:pg_sphere.test.sql:9176: NOTICE:  argument type smoc is only a shell
diff --git a/expected/points.out b/expected/points.out
@@ -239,6 +239,24 @@ SELECT spoint(0.0109083078249646 , -0.000727220521664407);
  (0.625d , -0.041666667d)
 (1 row)
 
+SELECT spoint_deg(57.2958, 57.2958);
+      spoint_deg       
+-----------------------
+ (57.2958d , 57.2958d)
+(1 row)
+
+SELECT spoint_deg(0, 0);
+ spoint_deg 
+------------
+ (0d , 0d)
+(1 row)
+
+SELECT spoint_deg(114.5916, 0);
+    spoint_deg    
+------------------
+ (114.5916d , 0d)
+(1 row)
+
 SELECT set_sphere_output( 'RAD' );
  set_sphere_output 
 -------------------
diff --git a/expected/poly.out b/expected/poly.out
@@ -318,11 +318,37 @@ SELECT spoly '{(10d,0d),(10d,1d),(15d,0d)}';
  {(10d , 0d),(10d , 1d),(15d , 0d)}
 (1 row)
 
+SELECT spoly_deg(ARRAY[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]);
+            spoly_deg            
+---------------------------------
+ {(1d , 2d),(3d , 4d),(5d , 6d)}
+(1 row)
+
+SELECT spoly_deg(ARRAY[10.0, 0.0, 10.0, 1.0, 15.0, 0.0]);
+             spoly_deg              
+------------------------------------
+ {(10d , 0d),(10d , 1d),(15d , 0d)}
+(1 row)
+
 -- incorrect input -----
 SELECT spoly '{(10d,0d),(10d,1d)}';
 ERROR:  spherepoly_in: more than two points needed
 LINE 1: SELECT spoly '{(10d,0d),(10d,1d)}';
                      ^
+SELECT spoly_deg(ARRAY[1.0, 2.0, 3.0, 4.0, 5.0]);
+ERROR:  Invalid arguments count. It must be even and >= 6
+SELECT spoly_deg(ARRAY[]::float8[]);
+ spoly_deg 
+-----------
+ 
+(1 row)
+
+SELECT spoly_deg(NULL::float8[]);
+ spoly_deg 
+-----------
+ 
+(1 row)
+
 --- self-crossing input -----
 SELECT spoly '{(0d,0d),(10d,10d),(0d,10d),(10d,0d)}';
 ERROR:  spherepoly_from_array: a line segment overlaps or polygon too large
diff --git a/pgs_circle.sql.in b/pgs_circle.sql.in
@@ -32,6 +32,14 @@ CREATE FUNCTION scircle(spoint, float8)
 COMMENT ON FUNCTION scircle(spoint, float8) IS
   'spherical circle with spherical point as center and float8 as radius in radians';
 
+CREATE FUNCTION scircle_deg(spoint, float8)
+   RETURNS scircle
+   AS 'MODULE_PATHNAME' , 'spherecircle_by_center_deg'
+   LANGUAGE 'c'
+   IMMUTABLE STRICT PARALLEL SAFE;
+
+COMMENT ON FUNCTION scircle_deg(spoint, float8) IS
+  'spherical circle with spherical point as center and float8 as radius in degrees';
 
 --
 -- Casting point as circle
diff --git a/pgs_point.sql.in b/pgs_point.sql.in
@@ -15,6 +15,12 @@ CREATE FUNCTION spoint(FLOAT8, FLOAT8)
    LANGUAGE 'c'
    IMMUTABLE STRICT PARALLEL SAFE;
 
+CREATE FUNCTION spoint_deg(FLOAT8, FLOAT8)
+   RETURNS spoint
+   AS 'MODULE_PATHNAME', 'spherepoint_from_long_lat_deg'
+   LANGUAGE 'c'
+   IMMUTABLE STRICT PARALLEL SAFE;
+
 CREATE FUNCTION set_sphere_output_precision(INT4)
    RETURNS CSTRING
    AS 'MODULE_PATHNAME', 'set_sphere_output_precision'
@@ -28,6 +34,9 @@ CREATE FUNCTION set_sphere_output(CSTRING)
 COMMENT ON FUNCTION spoint(FLOAT8, FLOAT8) IS
   'returns a spherical point from longitude (arg1), latitude (arg2)';
 
+COMMENT ON FUNCTION spoint_deg(FLOAT8, FLOAT8) IS
+  'returns a spherical point from longitude(in degrees) (arg1), latitude(in degrees) (arg2)';
+
 CREATE FUNCTION long(spoint)
    RETURNS FLOAT8
    AS 'MODULE_PATHNAME', 'spherepoint_long'
diff --git a/pgs_types.sql.in b/pgs_types.sql.in
@@ -132,6 +132,17 @@ CREATE FUNCTION spoly_out(spoly)
    LANGUAGE 'c'
    IMMUTABLE STRICT;
 
+CREATE FUNCTION spoly_deg(float8[])
+   RETURNS spoly
+   AS 'MODULE_PATHNAME', 'spherepoly_deg'
+   LANGUAGE 'c'
+   IMMUTABLE STRICT;
+
+COMMENT ON FUNCTION spoly_deg(float8[]) IS
+  'create spoly from array of points. '
+  'Two consecutive numbers among those present '
+  'refer to the same occurrence and cover its '
+  'latitude and longitude, respectively';
 
 CREATE TYPE spoly (
    internallength = VARIABLE,
diff --git a/sql/circle.sql b/sql/circle.sql
@@ -5,6 +5,14 @@ SET extra_float_digits = 0;
 
 -- Input/Output ---
 
+SELECT scircle_deg(spoint(10,10), 90);
+
+SELECT scircle_deg(spoint(10,10), 91);
+
+SELECT scircle_deg(spoint(0,0), 0);
+
+SELECT scircle_deg(spoint(10,10), -1);
+
 SELECT set_sphere_output( 'RAD' );
 
 SELECT '< (1h 2m 30s , +1d 2m 30s), 1.0d >'::scircle;
diff --git a/sql/points.sql b/sql/points.sql
@@ -86,6 +86,12 @@ SELECT '(0.0109083078249646 , -0.000727220521664407)'::spoint;
 
 SELECT spoint(0.0109083078249646 , -0.000727220521664407);
 
+SELECT spoint_deg(57.2958, 57.2958);
+
+SELECT spoint_deg(0, 0);
+
+SELECT spoint_deg(114.5916, 0);
+
 SELECT set_sphere_output( 'RAD' );
 
 SELECT spoint(7.28318530717958623 , 0.00);
diff --git a/sql/poly.sql b/sql/poly.sql
@@ -78,10 +78,20 @@ SELECT spoly '{(359d,0d),(359d,1d),(4d,0d)}';
 
 SELECT spoly '{(10d,0d),(10d,1d),(15d,0d)}';
 
+SELECT spoly_deg(ARRAY[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]);
+
+SELECT spoly_deg(ARRAY[10.0, 0.0, 10.0, 1.0, 15.0, 0.0]);
+
 -- incorrect input -----
 
 SELECT spoly '{(10d,0d),(10d,1d)}';
 
+SELECT spoly_deg(ARRAY[1.0, 2.0, 3.0, 4.0, 5.0]);
+
+SELECT spoly_deg(ARRAY[]::float8[]);
+
+SELECT spoly_deg(NULL::float8[]);
+
 --- self-crossing input -----
 
 SELECT spoly '{(0d,0d),(10d,10d),(0d,10d),(10d,0d)}';
diff --git a/src/circle.c b/src/circle.c
@@ -1,4 +1,5 @@
 #include "circle.h"
+#include "pgs_util.h"
 
 /* Circle functions */
 
@@ -22,6 +23,7 @@ PG_FUNCTION_INFO_V1(spherecircle_center);
 PG_FUNCTION_INFO_V1(spherecircle_radius);
 PG_FUNCTION_INFO_V1(spherepoint_to_circle);
 PG_FUNCTION_INFO_V1(spherecircle_by_center);
+PG_FUNCTION_INFO_V1(spherecircle_by_center_deg);
 PG_FUNCTION_INFO_V1(spherecircle_area);
 PG_FUNCTION_INFO_V1(spherecircle_circ);
 PG_FUNCTION_INFO_V1(spheretrans_circle);
@@ -361,7 +363,7 @@ spherecircle_by_center(PG_FUNCTION_ARGS)
 
 	if (FPgt(rad, PIH) || FPlt(rad, 0.0))
 	{
-		elog(ERROR, "radius must be not greater than 90 degrees or less than 0");
+		elog(ERROR, "radius must not be greater than 90 degrees or less than 0");
 		PG_RETURN_NULL();
 	}
 	c = (SCIRCLE *) palloc(sizeof(SCIRCLE));
@@ -370,6 +372,17 @@ spherecircle_by_center(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(c);
 }
 
+Datum
+spherecircle_by_center_deg(PG_FUNCTION_ARGS)
+{
+	Datum res;
+	SPoint	   *p = (SPoint *) PG_GETARG_POINTER(0);
+	float8		rad = PG_GETARG_FLOAT8(1);
+	rad = deg_to_rad(rad);
+	res = DirectFunctionCall2(spherecircle_by_center, PointerGetDatum(p), Float8GetDatum(rad));
+	PG_RETURN_DATUM(res);
+}
+
 Datum
 spherecircle_area(PG_FUNCTION_ARGS)
 {
diff --git a/src/circle.h b/src/circle.h
@@ -132,6 +132,11 @@ Datum	spherepoint_to_circle(PG_FUNCTION_ARGS);
  */
 Datum	spherecircle_by_center(PG_FUNCTION_ARGS);
 
+/*
+ * Creates a circle from center and radius(in degrees).
+ */
+Datum	spherecircle_by_center_deg(PG_FUNCTION_ARGS);
+
 /*
  * Calculates the area of a circle in square radians.
  */
diff --git a/src/pgs_util.h b/src/pgs_util.h
@@ -1,5 +1,6 @@
 #ifndef __PGS_UTIL_H__
 #define __PGS_UTIL_H__
+#include <postgres.h>
 
 #define PI			3.14159265358979323846		/* pi */
 #define PIH			1.57079632679489661923		/* pi/2 */
@@ -26,4 +27,9 @@ conv_theta(double x)
 	return y;
 }
 
+static inline float8 deg_to_rad(float8 in)
+{
+	return in * PI / 180;
+}
+
 #endif
diff --git a/src/point.c b/src/point.c
@@ -1,9 +1,11 @@
 #include "point.h"
+#include "pgs_util.h"
 
 /* This file contains definitions for spherical point functions. */
 
 PG_FUNCTION_INFO_V1(spherepoint_in);
 PG_FUNCTION_INFO_V1(spherepoint_from_long_lat);
+PG_FUNCTION_INFO_V1(spherepoint_from_long_lat_deg);
 PG_FUNCTION_INFO_V1(spherepoint_distance);
 PG_FUNCTION_INFO_V1(spherepoint_long);
 PG_FUNCTION_INFO_V1(spherepoint_lat);
@@ -141,7 +143,6 @@ spherepoint_in(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(sp);
 }
 
-
 Datum
 spherepoint_from_long_lat(PG_FUNCTION_ARGS)
 {
@@ -153,6 +154,16 @@ spherepoint_from_long_lat(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(p);
 }
 
+Datum
+spherepoint_from_long_lat_deg(PG_FUNCTION_ARGS)
+{
+	Datum res;
+	float8 lng = deg_to_rad(PG_GETARG_FLOAT8(0));
+	float8 lat = deg_to_rad(PG_GETARG_FLOAT8(1));
+	res = DirectFunctionCall2(spherepoint_from_long_lat, Float8GetDatum(lng), Float8GetDatum(lat));
+	PG_RETURN_DATUM(res);
+}
+
 static double
 norm2(double a, double b)
 {
diff --git a/src/point.h b/src/point.h
@@ -50,6 +50,11 @@ Datum	spherepoint_in(PG_FUNCTION_ARGS);
  */
 Datum	spherepoint_from_long_lat(PG_FUNCTION_ARGS);
 
+/*
+ * Create a spherical point from longitude and latitude both in degrees.
+ */
+Datum	spherepoint_from_long_lat_deg(PG_FUNCTION_ARGS);
+
 /*
  * Calculate the distance between two spherical points.
  */
diff --git a/src/polygon.c b/src/polygon.c
diff --git a/src/polygon.h b/src/polygon.h
diff --git a/upgrade_scripts/pg_sphere--1.2.3--1.3.0.sql.in b/upgrade_scripts/pg_sphere--1.2.3--1.3.0.sql.in
