Commitce73075

committed

Fix found problems after review

1 parent9d5fa49 commitce73075Copy full SHA for ce73075

File tree

+22

-15

lines changed

+22

-15

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,18 +350,18 @@ SELECT spoly(NULL::spoint[]);`
`350`	`350`	`(1 row)`
`351`	`351`
`352`	`352`	`SELECT spoly(ARRAY[]::spoint[]);`
`353`		`-ERROR:spoly_deg: invalid number of arguments (must be >= 3)`
	`353`	`+ERROR:spherepoly_from_point_array: invalid number of arguments (must be >= 3)`
`354`	`354`	`SELECT spoly(ARRAY[spoint_deg(0, 0)]);`
`355`		`-ERROR:spoly_deg: invalid number of arguments (must be >= 3)`
	`355`	`+ERROR:spherepoly_from_point_array: invalid number of arguments (must be >= 3)`
`356`	`356`	`SELECT spoly(ARRAY[spoint_deg(0, 0), spoint_deg(10, 0)]);`
`357`		`-ERROR:spoly_deg: invalid number of arguments (must be >= 3)`
`358`		`-SELECT spoly(ARRAY[spoint_deg(0, 0), spoint_deg(10, 0), spoint_deg(10,10)]);`
	`357`	`+ERROR:spherepoly_from_point_array: invalid number of arguments (must be >= 3)`
	`358`	`+SELECT spoly(ARRAY[spoint_deg(0, 0), spoint_deg(10, 0), spoint_deg(10,10)]);`
`359`	`359`	`spoly`
`360`	`360`	`------------------------------------`
`361`	`361`	`{(0d , 0d),(10d , 0d),(10d , 10d)}`
`362`	`362`	`(1 row)`
`363`	`363`
`364`		`-SELECT spoly(ARRAY[spoint_deg(0, 0), spoint_deg(10, 0), spoint_deg(10,10), spoint_deg(0, 10)]);`
	`364`	`+SELECT spoly(ARRAY[spoint_deg(0, 0), spoint_deg(10, 0), spoint_deg(10,10), spoint_deg(0, 10)]);`
`365`	`365`	`spoly`
`366`	`366`	`-----------------------------------------------`
`367`	`367`	`{(0d , 0d),(10d , 0d),(10d , 10d),(0d , 10d)}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ SELECT spoly(ARRAY[spoint_deg(0, 0)]);`
`96`	`96`
`97`	`97`	`SELECT spoly(ARRAY[spoint_deg(0,0), spoint_deg(10,0)]);`
`98`	`98`
`99`		`-SELECT spoly(ARRAY[spoint_deg(0,0), spoint_deg(10,0), spoint_deg(10,10)]);`
	`99`	`+SELECT spoly(ARRAY[spoint_deg(0,0), spoint_deg(10,0), spoint_deg(10,10)]);`
`100`	`100`
`101`		`-SELECT spoly(ARRAY[spoint_deg(0,0), spoint_deg(10,0), spoint_deg(10,10), spoint_deg(0,10)]);`
	`101`	`+SELECT spoly(ARRAY[spoint_deg(0,0), spoint_deg(10,0), spoint_deg(10,10), spoint_deg(0,10)]);`
`102`	`102`
`103`	`103`	`--- incorrect input -----`
`104`	`104`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1010,21 +1010,21 @@ spherepoly_deg(PG_FUNCTION_ARGS)`
`1010`	`1010`	`Datum`
`1011`	`1011`	`spherepoly_from_point_array(PG_FUNCTION_ARGS)`
`1012`	`1012`	`{`
`1013`		`-intnp;`
`1014`		`-ArrayType*inarr=PG_GETARG_ARRAYTYPE_P(0);`
`1015`	`1013`	`SPoint*points;`
`1016`		`-`
`1017`		`-np=ArrayGetNItems(ARR_NDIM(inarr),ARR_DIMS(inarr));`
	`1014`	`+ArrayType*inarr=PG_GETARG_ARRAYTYPE_P(0);`
	`1015`	`+constintnp=ArrayGetNItems(ARR_NDIM(inarr),ARR_DIMS(inarr));`
`1018`	`1016`
`1019`	`1017`	`if (np<3)`
`1020`	`1018`	`{`
`1021`		`-elog(ERROR,"spoly_deg: invalid number of arguments (must be >= 3)");`
	`1019`	`+elog(ERROR,"spherepoly_from_point_array: "`
	`1020`	`+"invalid number of arguments (must be >= 3)");`
`1022`	`1021`	`PG_RETURN_NULL();`
`1023`	`1022`	`}`
`1024`	`1023`
`1025`	`1024`	`if (ARR_HASNULL(inarr))`
`1026`	`1025`	`{`
`1027`		`-elog(ERROR,"spoly_deg: input array is invalid because if has null values");`
	`1026`	`+elog(ERROR,"spherepoly_from_point_array: "`
	`1027`	`+"input array is invalid because it has null values");`
`1028`	`1028`	`PG_RETURN_NULL();`
`1029`	`1029`	`}`
`1030`	`1030`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,22 @@ Datumspherepoly_get_point(PG_FUNCTION_ARGS);`
`87`	`87`	`int8poly_line_pos(constSPOLYpoly,constSLineline);`
`88`	`88`
`89`	`89`	`/*`
`90`		`- * Input of a spherical from array of pair-consecutive numbers (lng, lat), in radians.`
	`90`	`+ * Create a spherical polygon (spoly) from an array of pair-consecutive`
	`91`	`+ * numbers (lng, lat), in radians.`
`91`	`92`	`*/`
`92`	`93`	`Datumspherepoly_rad(PG_FUNCTION_ARGS);`
`93`	`94`
`94`	`95`	`/*`
`95`		`- * Input of a spherical from array of pair-consecutive numbers (lng, lat), in degrees.`
	`96`	`+ * Create a spherical polygon (spoly) from an array of pair-consecutive`
	`97`	`+ * numbers (lng, lat), in degrees.`
`96`	`98`	`*/`
`97`	`99`	`Datumspherepoly_deg(PG_FUNCTION_ARGS);`
`98`	`100`
	`101`	`+/*`
	`102`	`+ * Create a spherical polygon (spoly) from an array of spoint elements.`
	`103`	`+ */`
	`104`	`+Datumspherepoly_from_point_array(PG_FUNCTION_ARGS);`
	`105`	`+`
`99`	`106`	`/*`
`100`	`107`	`* Input of a spherical polygon.`
`101`	`108`	`*/`

Comments

(0)