Changeset 12394

Timestamp:

10/13/07 00:12:13 (1 year ago)

Author:

hobu

Message:

apply patch for #1871 to expose GEOS IsValid?, IsEmpty?, and IsRing?

Files:

• trunk/gdal/ogr/ogr_api.h (modified) (1 diff)
• trunk/gdal/ogr/ogr_geometry.h (modified) (1 diff)
• trunk/gdal/ogr/ogrgeometry.cpp (modified) (1 diff)
• trunk/gdal/swig/include/ogr.i (modified) (1 diff)

trunk/gdal/ogr/ogr_api.h

@@ -122 +122 @@
-void   CPL_DLL OGR_G_Empty( OGRGeometryH );
-int    CPL_DLL OGR_G_IsEmpty (OGRGeometryH );
+int    CPL_DLL OGR_G_IsValid (OGRGeometryH );
+int    CPL_DLL OGR_G_IsSimple (OGRGeometryH );
+int    CPL_DLL OGR_G_IsRing (OGRGeometryH );
-
-/* backward compatibility */

trunk/gdal/ogr/ogr_geometry.h

@@ -86 +86 @@
-    virtual int getCoordinateDimension() const;
-    virtual OGRBoolean  IsEmpty() const; 
-
+
+
+
-    virtual void        empty() = 0;
-    virtual OGRGeometry *clone() const = 0;

trunk/gdal/ogr/ogrgeometry.cpp

@@ -1137 +1137 @@
-   return ((OGRGeometry *) hGeom)->IsEmpty();
-}
+
+/************************************************************************/
+/*                              IsValid()                               */
+/************************************************************************/
+
+/**
+ * Test if the geometry is valid
+ *
+ * This method is the same as the C function OGR_G_IsValid().
+ *
+ * This method is built on the GEOS library, check it for the definition
+ * of the geometry operation.
+ * If OGR is built without the GEOS library, this method will always return 
+ * FALSE. 
+ *
+ *
+ * @return TRUE if the geometry has no points, otherwise FALSE.  
+ */
+
+OGRBoolean
+OGRGeometry::IsValid(  ) const
+
+{
+#ifndef HAVE_GEOS
+
+    return FALSE;
+
+#else
+
+    OGRBoolean bResult = FALSE;
+    GEOSGeom hThisGeosGeom = NULL;
+    
+    hThisGeosGeom = exportToGEOS();
+
+    if( hThisGeosGeom != NULL  )
+    {
+        bResult = GEOSisValid( hThisGeosGeom );
+        GEOSGeom_destroy( hThisGeosGeom );
+    }
+
+    return bResult;
+
+#endif /* HAVE_GEOS */
+}
+
+int OGR_G_IsValid( OGRGeometryH hGeom )
+
+{
+   return ((OGRGeometry *) hGeom)->IsValid();
+}
+
+/************************************************************************/
+/*                              IsSimple()                               */
+/************************************************************************/
+
+/**
+ * Test if the geometry is simple
+ *
+ * This method is the same as the C function OGR_G_IsSimple().
+ *
+ * This method is built on the GEOS library, check it for the definition
+ * of the geometry operation.
+ * If OGR is built without the GEOS library, this method will always return 
+ * FALSE. 
+ *
+ *
+ * @return TRUE if the geometry has no points, otherwise FALSE.  
+ */
+
+OGRBoolean
+OGRGeometry::IsSimple(  ) const
+
+{
+#ifndef HAVE_GEOS
+
+    return FALSE;
+
+#else
+
+    OGRBoolean bResult = FALSE;
+    GEOSGeom hThisGeosGeom = NULL;
+    
+    hThisGeosGeom = exportToGEOS();
+
+    if( hThisGeosGeom != NULL  )
+    {
+        bResult = GEOSisSimple( hThisGeosGeom );
+        GEOSGeom_destroy( hThisGeosGeom );
+    }
+
+    return bResult;
+
+#endif /* HAVE_GEOS */
+}
+
+int OGR_G_IsSimple( OGRGeometryH hGeom )
+
+{
+   return ((OGRGeometry *) hGeom)->IsSimple();
+}
+
+/************************************************************************/
+/*                              IsRing()                               */
+/************************************************************************/
+
+/**
+ * Test if the geometry is a ring
+ *
+ * This method is the same as the C function OGR_G_IsRing().
+ *
+ * This method is built on the GEOS library, check it for the definition
+ * of the geometry operation.
+ * If OGR is built without the GEOS library, this method will always return 
+ * FALSE. 
+ *
+ *
+ * @return TRUE if the geometry has no points, otherwise FALSE.  
+ */
+
+OGRBoolean
+OGRGeometry::IsRing(  ) const
+
+{
+#ifndef HAVE_GEOS
+
+    return FALSE;
+
+#else
+
+    OGRBoolean bResult = FALSE;
+    GEOSGeom hThisGeosGeom = NULL;
+    
+    hThisGeosGeom = exportToGEOS();
+
+    if( hThisGeosGeom != NULL  )
+    {
+        bResult = GEOSisRing( hThisGeosGeom );
+        GEOSGeom_destroy( hThisGeosGeom );
+    }
+
+    return bResult;
+
+#endif /* HAVE_GEOS */
+}
+
+int OGR_G_IsRing( OGRGeometryH hGeom )
+
+{
+   return ((OGRGeometry *) hGeom)->IsRing();
+}
+
-/************************************************************************/
-/*                       OGRGeometryTypeToName()                        */

trunk/gdal/swig/include/ogr.i

@@ -1261 +1261 @@
-    return OGR_G_IsEmpty(self);
-  }  
+  
+  bool IsValid () {
+    return OGR_G_IsValid(self);
+  }  
+  
+  bool IsSimple () {
+    return OGR_G_IsSimple(self);
+  }  
+  
+  bool IsRing () {
+    return OGR_G_IsRing(self);
+  }  
+  
-  bool Intersect (OGRGeometryShadow* other) {
-    return OGR_G_Intersect(self, other);