Changes between Version 14 and Version 15 of FDORfc49

Timestamp:

06/10/10 12:37:37 (15 years ago)

Author:

romicadascalescu

Comment:

--

FDORfc49

@@ -146 +146 @@
 {
 public:
+
+    /// 
+    /// Existing Function
+    /// 
+     static System::Boolean Evaluate(NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g1, NAMESPACE_OSGEO_FDO_FILTER::SpatialOperations op, NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g2);
+
     /// \brief
+    /// 
+    /// New Additional Functions
+    /// 
     /// Evaluates if two FDO geometric objects spatially interact with each other based on a user supplied spatial operator.
     /// For example: Contains, Crosses, Disjoint, Equals, Intersects, Overlaps, Touches, Within, CoveredBy, Inside, EnvelopeIntersects.
@@ -161 +170 @@
     /// user really wants 0). If an invalid value is provided, the default then will be used
     /// 
+    /// \param toleranceZ
+    /// Input tolerance to used to compare Z coordinate
+    /// Default tolerance used is 1e-10. Valid range is >=0 (that is, 0 is valid in case the
+    /// user really wants 0). If an invalid value is provided, the default then will be used
+    /// 
     /// \return
     /// Returns The tesselated Geometry.
     /// 
     static System::Boolean Evaluate(NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g1, NAMESPACE_OSGEO_FDO_FILTER::SpatialOperations op, NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g2, double toleranceXY);
-
-        /// \brief
-    /// Evaluates if two FDO geometric objects spatially interact with each other based on a user supplied spatial operator.
-    /// For example: Contains, Crosses, Disjoint, Equals, Intersects, Overlaps, Touches, Within, CoveredBy, Inside, EnvelopeIntersects.
-    /// 
-    /// \param g1 
-    /// Input Left hand Geometry to Evaluate
-    /// \param op 
-    /// Input The spatial operation to apply to the left and right hand geometries 
-    /// \param g2 
-    /// Input Right hand Geometry to Evaluate
-    /// \param toleranceXY 
-    /// Input tolerance to used to compare XY coordinates
-    /// Default tolerance used is 1e-10. Valid range is >=0 (that is, 0 is valid in case the
-    /// user really wants 0). If an invalid value is provided, the default then will be used
-    /// 
-    /// \param toleranceZ
-    /// Input tolerance to used to compare Z coordinate
-    /// Default tolerance used is 1e-10. Valid range is >=0 (that is, 0 is valid in case the
-    /// user really wants 0). If an invalid value is provided, the default then will be used
-    /// 
-    /// \return
-    /// Returns The tesselated Geometry.
-    /// 
     static System::Boolean Evaluate(NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g1, NAMESPACE_OSGEO_FDO_FILTER::SpatialOperations op, NAMESPACE_OSGEO_GEOMETRY::IGeometry^ g2, double toleranceXY, double toleranceZ);
 
+    /// 
+    /// Existing Functions
+    /// 
+    static System::Boolean PointInRing( NAMESPACE_OSGEO_GEOMETRY::ILinearRing^ ring, System::Double coordinateX, System::Double coordinateY);
+    static System::Boolean PointInRing( NAMESPACE_OSGEO_GEOMETRY::ILinearRing^ ring, System::Double coordinateX, System::Double coordinateY, System::Boolean% isOnBoundary);
+
     /// \brief
+    /// 
+    /// New Additional Functions
+    /// 
     /// Tests whether a point is within a ring or not.
     /// 
@@ -208 +207 @@
     /// Returns TRUE if the point is within ring or on its boundary, FALSE otherwise.
     /// 
+    static System::Boolean PointInRing( NAMESPACE_OSGEO_GEOMETRY::ILinearRing^ ring, System::Double coordinateX, System::Double coordinateY, double toleranceXY);
     static System::Boolean PointInRing( NAMESPACE_OSGEO_GEOMETRY::ILinearRing^ ring, System::Double coordinateX, System::Double coordinateY, System::Boolean% isOnBoundary, double toleranceXY);
-    static System::Boolean PointInRing( NAMESPACE_OSGEO_GEOMETRY::ILinearRing^ ring, System::Double coordinateX, System::Double coordinateY, double toleranceXY);
+
+    /// 
+    /// Existing Functions
+    /// 
+    static System::Boolean PointInPolygon(NAMESPACE_OSGEO_GEOMETRY::IPolygon^ polygon, System::Double coordinateX, System::Double coordinateY);
+    static System::Boolean PointInPolygon(NAMESPACE_OSGEO_GEOMETRY::IPolygon^ polygon, System::Double coordinateX, System::Double coordinateY, System::Boolean% isOnExtBoundary);
+    static System::Boolean PointInPolygon(NAMESPACE_OSGEO_GEOMETRY::IPolygon^ polygon, System::Double coordinateX, System::Double coordinateY, System::Boolean% isOnExtBoundary, System::Boolean% isOnInBoundary);
 
     /// \brief
     /// Tests whether a point is within a polygon (including its islands) or not.
+    /// 
+    /// New Additional Functions
     /// 
     /// \param polygon