Changeset: be412ad9fb94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be412ad9fb94
Modified Files:
        geom/monetdb5/geom.c
Branch: sfcgal
Log Message:

For empty geometries we do not know the SRID


diffs (20 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -5411,7 +5411,7 @@ wkbCollectAppend(wkb **out, wkb **geom1W
     }
 
     //make sure the geometries are of the same srid
-    if (GEOSGetSRID(geom1Geometry) != GEOSGetSRID(geom2Geometry)) {
+    if ((GEOSisEmpty(geom1Geometry) != 1) && GEOSGetSRID(geom1Geometry) != 
GEOSGetSRID(geom2Geometry)) {
         err = createException(MAL, "geom.collect", "Geometries of different 
SRID");
     } else { 
         geometry1Type = GEOSGeomTypeId(geom1Geometry);
@@ -5481,6 +5481,7 @@ wkbCollectAppend(wkb **out, wkb **geom1W
         if ( (outGeometry = GEOSGeom_createCollection(type, geomGeometries, 
num_geoms+1)) == NULL ) {
             err = createException(MAL, "geom.Collect", 
"GEOSGeom_createCollection failed!!!");
         } else {
+               GEOSSetSRID(outGeometry, GEOSGetSRID(geom1Geometry));
             *out = geos2wkb(outGeometry);
         }
     }
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to