MultiLineString with CircularStrings byte encoding fix to use MultiCurve

Author: bosborn

CHANGELOG.md

@@ -7,6 +7,7 @@ Adheres to [Semantic Versioning](http://semver.org/).
 ## [4.1.1](https://github.com/ngageoint/simple-features-wkb-ios/releases/tag/4.1.1) (TBD)
 
 * sf-ios 4.1.1
+* MultiLineString with CircularStrings byte encoding fix to use MultiCurve
 * Imports cleanup and simplification
 
 ## [4.1.0](https://github.com/ngageoint/simple-features-wkb-ios/releases/tag/4.1.0) (09-07-2022)

sf-wkb-ios/SFWBGeometryCodes.h

@@ -45,6 +45,24 @@
  */
 +(int) codeFromGeometryType: (enum SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
+/**
+ * Get the well-known binary writable geometry code from the geometry
+ *
+ * @param geometry
+ *            geometry
+ * @return geometry code
+ */
++(int) wkbCodeFromGeometry: (SFGeometry *) geometry;
+
+/**
+ * Get the well-known binary writable geometry type from the geometry
+ *
+ * @param geometry
+ *            geometry
+ * @return geometry type
+ */
++(enum SFGeometryType) wkbGeometryTypeFromGeometry: (SFGeometry *) geometry;
+
 /**
  * Get the Geometry Type from the code
  *

sf-wkb-ios/SFWBGeometryCodes.m

@@ -7,6 +7,9 @@
 //
 
 #import "SFWBGeometryCodes.h"
+#import "SFLineString.h"
+#import "SFCircularString.h"
+#import "SFMultiLineString.h"
 
 @implementation SFWBGeometryCodes
 
@@ -91,6 +94,29 @@ +(int) codeFromGeometryType: (enum SFGeometryType) geometryType{
     return code;
 }
 
++(int) wkbCodeFromGeometry: (SFGeometry *) geometry{
+    return [self codeFromGeometryType:[self wkbGeometryTypeFromGeometry:geometry] andHasZ:geometry.hasZ andHasM:geometry.hasM];
+}
+
++(enum SFGeometryType) wkbGeometryTypeFromGeometry: (SFGeometry *) geometry{
+    enum SFGeometryType type = geometry.geometryType;
+    if(![geometry isEmpty]){
+        switch (type){
+            case SF_MULTILINESTRING:
+                {
+                    SFLineString *lineString = [((SFMultiLineString *) geometry) lineStringAtIndex:0];
+                    if([lineString isKindOfClass:[SFCircularString class]]){
+                        type = SF_MULTICURVE;
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    return type;
+}
+
 +(enum SFGeometryType) geometryTypeFromCode: (int) code{
 
     // Look at the last 2 digits to find the geometry type code

sf-wkb-ios/SFWBGeometryWriter.m

@@ -79,7 +79,7 @@ -(void) write: (SFGeometry *) geometry{
     [_writer writeByte:byteOrder];
 
     // Write the geometry type integer
-    [self writeInt:[SFWBGeometryCodes codeFromGeometry:geometry]];
+    [self writeInt:[SFWBGeometryCodes wkbCodeFromGeometry:geometry]];
 
     enum SFGeometryType geometryType = geometry.geometryType;
 
@@ -97,14 +97,8 @@ -(void) write: (SFGeometry *) geometry{
             [self writePolygon:(SFPolygon *)geometry];
             break;
         case SF_MULTIPOINT:
-            [self writeMultiPoint:(SFMultiPoint *)geometry];
-            break;
         case SF_MULTILINESTRING:
-            [self writeMultiLineString:(SFMultiLineString *)geometry];
-            break;
         case SF_MULTIPOLYGON:
-            [self writeMultiPolygon:(SFMultiPolygon *)geometry];
-            break;
         case SF_GEOMETRYCOLLECTION:
         case SF_MULTICURVE:
         case SF_MULTISURFACE:

sf-wkb-iosTests/SFWBGeometryTestUtils.h

@@ -117,12 +117,18 @@
 
 +(SFLineString *) createLineStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM andRing: (BOOL) ring;
 
++(SFCircularString *) createCircularStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
+
++(SFCircularString *) createCircularStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM andClosed: (BOOL) closed;
+
 +(SFPolygon *) createPolygonWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
 +(SFMultiPoint *) createMultiPointWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
 +(SFMultiLineString *) createMultiLineStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
++(SFMultiLineString *) createMultiLineStringOfCircularStringsWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
+
 +(SFMultiPolygon *) createMultiPolygonWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
 +(SFGeometryCollection *) createGeometryCollectionWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;

sf-wkb-iosTests/SFWBGeometryTestUtils.m

@@ -465,6 +465,27 @@ +(SFLineString *) createLineStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM and
     return lineString;
 }
 
++(SFCircularString *) createCircularStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
+    return [self createCircularStringWithHasZ:hasZ andHasM:hasM andClosed:false];
+}
+
++(SFCircularString *) createCircularStringWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM andClosed: (BOOL) closed{
+    
+    SFCircularString *circularString = [SFCircularString circularStringWithHasZ:hasZ andHasM:hasM];
+    
+    int num = 2 + [SFWBTestUtils randomIntLessThan:9];
+    
+    for(int i = 0; i < num; i++){
+        [circularString addPoint:[self createPointWithHasZ:hasZ andHasM:hasM]];
+    }
+    
+    if(closed){
+        [circularString addPoint:[circularString.points objectAtIndex:0]];
+    }
+    
+    return circularString;
+}
+
 +(SFPolygon *) createPolygonWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
 
     SFPolygon *polygon = [SFPolygon polygonWithHasZ:hasZ andHasM:hasM];
@@ -504,6 +525,19 @@ +(SFMultiLineString *) createMultiLineStringWithHasZ: (BOOL) hasZ andHasM: (BOOL
     return multiLineString;
 }
 
++(SFMultiLineString *) createMultiLineStringOfCircularStringsWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
+    
+    SFMultiLineString *multiLineString = [SFMultiLineString multiLineStringWithHasZ:hasZ andHasM:hasM];
+    
+    int num = 1 + [SFWBTestUtils randomIntLessThan:5];
+    
+    for(int i = 0; i < num; i++){
+        [multiLineString addLineString:[self createCircularStringWithHasZ:hasZ andHasM:hasM]];
+    }
+    
+    return multiLineString;
+}
+
 +(SFMultiPolygon *) createMultiPolygonWithHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
 
     SFMultiPolygon *multiPolygon = [SFMultiPolygon multiPolygonWithHasZ:hasZ andHasM:hasM];

sf-wkb-iosTests/SFWBTestCase.m

@@ -70,6 +70,22 @@ -(void) testMultiLineString {
     }
 }
 
+-(void) testMultiLineStringWithCircularStrings {
+    
+    for (int i = 0; i < GEOMETRIES_PER_TEST; i++) {
+
+        SFMultiLineString *multiLineString = [SFWBGeometryTestUtils createMultiLineStringOfCircularStringsWithHasZ:[SFWBTestUtils coinFlip] andHasM:[SFWBTestUtils coinFlip]];
+        
+        NSData *data = [SFWBGeometryTestUtils writeDataWithGeometry:multiLineString];
+        
+        SFGeometryCollection *geometry = [SFGeometryCollection geometryCollectionWithGeometries:multiLineString.geometries];
+        
+        SFGeometry *geometry2 = [SFWBGeometryTestUtils readGeometryWithData:data];
+        
+        [self geometryTester:geometry withCompare:geometry2];
+    }
+}
+
 -(void) testMultiCurveWithLineStrings{
 
     // Test a pre-created WKB saved as the abstract MultiCurve type with