Changeset: 943c7da68f9c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=943c7da68f9c
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
Branch: geo
Log Message:
ST_NumPatches + ST_PatchN
diffs (57 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -217,7 +217,6 @@ geom_export str wkbNumGeometries(int* ou
geom_export str wkbTransform(wkb**, wkb**, int*, int*, char**, char**);
geom_export str wkbPointOnSurface(wkb**, wkb**);
-
geom_export str geom_2_geom(wkb** resWKB, wkb **valueWKB, int* columnType,
int* columnSRID);
geom_export str geom_2_geom_bat(int* outBAT_id, int* inBAT_id, int*
columnType, int* columnSRID);
@@ -3115,8 +3114,6 @@ str wkbNumGeometries(int* out, wkb** geo
return MAL_SUCCEED;
}
-
-
/* MBR */
/* Creates the mbr for the given geom_geometry. */
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -335,7 +335,6 @@ end MakePolygon;
command PointOnSurface(w:wkb) :wkb address wkbPointOnSurface
comment "Returns a point guaranteed to lie on the surface. Similar to postGIS
it works for points and lines in addition to surfaces and for 3d geometries.";
-
command mbr(:wkb) :mbr address wkbMBR
comment "Creates the mbr for the given wkb.";
command MakeBox2D(:wkb,:wkb) :mbr address wkbBox2D
diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql
--- a/geom/sql/40_geom.sql
+++ b/geom/sql/40_geom.sql
@@ -4095,13 +4095,19 @@ CREATE FUNCTION ST_InteriorRings(geom Ge
--END;
--CREATE FUNCTION ST_SetInteriorRings(geom Geometry[]) RETURNS Geometry
EXTERNAL NAME geom."InteriorRings";
---Functions on Polyhedral Surfaces
+--Functions on Polyhedral Surfaces (a simple surface, consisting of a number
of Polygon pathes or facets)
--CREATE FUNCTION ST_Geometries(geom Geometry) RETURNS TABLE(geom Geometries)
EXTERNAL NAME geom."Geometries";
--CREATE FUNCTION NumSurfaces(geom Geometry) RETURNS integer EXTERNAL NAME
geom."NumSurfaces";
--CREATE FUNCTION Surface(positionNum integer) RETURNS Geometry EXTERNAL NAME
geom."SurfaceN";
--from Part 1
---CREATE FUNCTION ST_NumPatches(geom Geometry) RETURNS integer EXTERNAL NAME
--works only with polyhedral surface
---CREATE FUNCTION ST_PatchN(geom Geometry, patchNum integer) RETURNS Geometry
EXTERNAL NAME --works with polyhedral surface
+CREATE FUNCTION ST_NumPatches(geom Geometry) RETURNS integer --EXTERNAL NAME
geom."NumPatches"; --same with NumSurfaces
+BEGIN
+ RETURN SELECT ST_NumGeometries(geom);
+END;
+CREATE FUNCTION ST_PatchN(geom Geometry, patchNum integer) RETURNS Geometry
--EXTERNAL NAME geom."PatchN" --same with Surface
+BEGIN
+ RETURN SELECT ST_GeometryN(geom, patchNum);
+END;
--BoundingPolygons
--IsClosed
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
