Changeset 4637

Timestamp:

10/09/09 20:18:28 (3 years ago)

Author:

pramsey

Message:

Add geometry(geography) case per #257

Location:

trunk/postgis

Files:

• geography_inout.c (modified) (2 diffs)
• geography.sql.in.c (modified) (1 diff)

trunk/postgis/geography_inout.c

@@ -49 +49 @@
 Datum geography_from_binary(PG_FUNCTION_ARGS);
 Datum geography_from_geometry(PG_FUNCTION_ARGS);
+Datum geometry_from_geography(PG_FUNCTION_ARGS);
 
 /* Datum geography_gist_selectivity(PG_FUNCTION_ARGS); TBD */
@@ -933 +934 @@
 }
 
+PG_FUNCTION_INFO_V1(geometry_from_geography);
+Datum geometry_from_geography(PG_FUNCTION_ARGS)
+{
+        LWGEOM *lwgeom = NULL;
+        PG_LWGEOM *ret = NULL;
+        GSERIALIZED *g_ser = (GSERIALIZED*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+
+        lwgeom = lwgeom_from_gserialized(g_ser);
+        ret = pglwgeom_serialize(lwgeom);
+        lwgeom_release(lwgeom);
+        
+        if ( is_worth_caching_pglwgeom_bbox(ret) )
+        {
+                ret = (PG_LWGEOM *)DatumGetPointer(DirectFunctionCall1(LWGEOM_addBBOX, PointerGetDatum(ret)));
+        }
+
+        PG_RETURN_POINTER(ret); 
+}
+

trunk/postgis/geography.sql.in.c

@@ -174 +174 @@
 CREATE CAST (geometry AS geography) WITH FUNCTION geography(geometry) AS IMPLICIT;
 
+-- Availability: 1.5.0
+CREATE OR REPLACE FUNCTION geometry(geography)
+        RETURNS geometry
+        AS 'MODULE_PATHNAME','geometry_from_geography'
+        LANGUAGE 'C' IMMUTABLE STRICT;
+
+-- Availability: 1.5.0
+CREATE CAST (geography AS geometry) WITH FUNCTION geometry(geography) AS IMPLICIT;
+
 -- ---------- ---------- ---------- ---------- ---------- ---------- ----------
 -- GiST Support Functions