Reset OGR order to standard;

add geometryToIsoWKT function;
gwaldron · Mar 2, 2024 · 05f081b · 05f081b
1 parent a6e7a00
commit 05f081b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/osgEarth/GeometryUtils b/src/osgEarth/GeometryUtils
@@ -31,6 +31,7 @@ namespace osgEarth
     namespace GeometryUtils
     {
         extern OSGEARTH_EXPORT std::string geometryToWKT( const Geometry* geometry );
+        extern OSGEARTH_EXPORT std::string geometryToIsoWKT( const Geometry* geometry );
         extern OSGEARTH_EXPORT Geometry*   geometryFromWKT( const std::string& wkt, bool rewindPolygons = true);
 
         extern OSGEARTH_EXPORT std::string geometryToGeoJSON( const Geometry* geometry );

diff --git a/src/osgEarth/GeometryUtils.cpp b/src/osgEarth/GeometryUtils.cpp
@@ -43,6 +43,24 @@ osgEarth::GeometryUtils::geometryToWKT( const Geometry* geometry )
     return result;
 }
 
+std::string
+osgEarth::GeometryUtils::geometryToIsoWKT( const Geometry* geometry )
+{
+    OGRGeometryH g = OgrUtils::createOgrGeometry( geometry );
+    std::string result;
+    if (g)
+    {
+        char* buf;   
+        if (OGR_G_ExportToIsoWkt( g, &buf ) == OGRERR_NONE)
+        {
+            result = std::string(buf);
+            OGRFree( buf );
+        }
+        OGR_G_DestroyGeometry( g );
+    }
+    return result;
+}
+
 std::string 
 osgEarth::GeometryUtils::geometryToGeoJSON( const Geometry* geometry )
 {

diff --git a/src/osgEarth/OgrUtils.cpp b/src/osgEarth/OgrUtils.cpp
@@ -274,15 +274,15 @@ OgrUtils::encodeShape( const Geometry* geometry, OGRwkbGeometryType shape_type,
     {
         if (part_type == wkbNone)
         {
-            for (int v = geometry->size() - 1; v >= 0; v--)
+            for (int v = 0; v < geometry->size(); v++)
             {
                 osg::Vec3d p = (*geometry)[v];
                 OGR_G_AddPoint(shape_handle, p.x(), p.y(), p.z());
             }
         }
         else if (part_type == wkbPoint)
         {
-            for (int v = geometry->size() - 1; v >= 0; v--)
+            for (int v = 0; v < geometry->size(); v++)
             {
                 osg::Vec3d p = (*geometry)[v];
                 OGRGeometryH part_handle = OGR_G_CreateGeometry(part_type);