Snap and SharedPaths are both direct GEOS proxies, not extra [RT-SIGTA]

git-svn-id: http://svn.osgeo.org/postgis/trunk@7732 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index 8214477a751d3c85c6e0a7eb3904f916eb0d0473..682c18855082d79342fac4e619dc09ea8979f89f 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -2170,6 +2170,29 @@ LWGEOM *lwgeom_difference(const LWGEOM *geom1, const LWGEOM *geom2);
 LWGEOM *lwgeom_symdifference(const LWGEOM* geom1, const LWGEOM* geom2);
 LWGEOM *lwgeom_union(const LWGEOM *geom1, const LWGEOM *geom2);
 
+/**
+ * Snap vertices and segments of a geometry to another using a given tolerance.
+ *
+ * @param geom1 the geometry to snap
+ * @param geom2 the geometry to snap to
+ * @param tolerance the distance under which vertices and segments are snapped
+ * 
+ * Requires GEOS-3.3.0+
+ */
+LWGEOM* lwgeom_snap(const LWGEOM* geom1, const LWGEOM* geom2, double tolerance);
+
+/*
+ * Return the set of paths shared between two linear geometries,
+ * and their direction (same or opposite).
+ *
+ * @param geom1 a lineal geometry
+ * @param geom2 another lineal geometry
+ *
+ * Requires GEOS-3.3.0+
+ */
+LWGEOM* lwgeom_sharedpaths(const LWGEOM* geom1, const LWGEOM* geom2);
+
+
 /*******************************************************************************
  * GEOS-dependent extra functions on LWGEOM
  ******************************************************************************/
@@ -2189,15 +2212,6 @@ LWGEOM* lwgeom_buildarea(const LWGEOM *geom) ;
  */
 LWGEOM* lwgeom_make_valid(LWGEOM* geom);
 
-/**
- * Snap vertices and segments of a geometry to another using a given tolerance.
- *
- * @param geom1 the geometry to snap
- * @param geom2 the geometry to snap to
- * @param tolerance the distance under which vertices and segments are snapped
- */
-LWGEOM* lwgeom_snap(const LWGEOM* geom1, const LWGEOM* geom2, double tolerance);
-
 /*
  * Split polygon by line, line by line, line by point.
  *
@@ -2211,18 +2225,5 @@ LWGEOM* lwgeom_snap(const LWGEOM* geom1, const LWGEOM* geom2, double tolerance);
  */
 LWGEOM* lwgeom_split(const LWGEOM* lwgeom_in, const LWGEOM* blade_in);
 
-/*
- * Return the set of paths shared between two linear geometries,
- * and their direction (same or opposite).
- *
- * Developed by Sandro Santilli <strk@keybit.net> for Faunalia
- * (http://www.faunalia.it) with funding from Regione Toscana - Sistema
- * Informativo per la Gestione del Territorio e dell' Ambiente
- * [RT-SIGTA]". For the project: "Sviluppo strumenti software per il
- * trattamento di dati geografici basati su QuantumGIS e Postgis (CIG
- * 0494241492)"
- */
-LWGEOM* lwgeom_sharedpaths(const LWGEOM* geom1, const LWGEOM* geom2);
-
 #endif /* !defined _LIBLWGEOM_H  */