Updated sf-ios to 5.0.0 to use NS_ENUM for Swift interoperability

.github/workflows/build-test.yml

@@ -18,4 +18,8 @@ jobs:
     - name: Install
       run: pod install
     - name: Build & Test
-      run: xcodebuild test -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14'
+      run: |
+        iphone_names=$(xcrun simctl list devices available --json | jq -r '.devices | to_entries[] | .value[] | select(.name | test("^iPhone [0-9]+")) | .name')
+        latest_iphone=$(echo "$iphone_names" | sort | tail -n 1)
+        echo "latest_iphone: $latest_iphone"
+        xcodebuild test -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination "platform=iOS Simulator,OS=latest,name=$latest_iphone"

.github/workflows/build.yml

@@ -13,8 +13,12 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install
       run: pod install
     - name: Build
-      run: xcodebuild build-for-testing -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14'
+      run: |
+        iphone_names=$(xcrun simctl list devices available --json | jq -r '.devices | to_entries[] | .value[] | select(.name | test("^iPhone [0-9]+")) | .name')
+        latest_iphone=$(echo "$iphone_names" | sort | tail -n 1)
+        echo "latest_iphone: $latest_iphone"
+        xcodebuild build-for-testing -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination "platform=iOS Simulator,OS=latest,name=$latest_iphone"

CHANGELOG.md

@@ -4,9 +4,9 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 2.1.5 (TBD)
+## 3.0.0
 
-* TBD
+* sf-ios 5.0.0 with NS_ENUM support for Objective-C and Swift interoperability.
 
 ## [2.1.4](https://github.com/ngageoint/simple-features-wkt-ios/releases/tag/2.1.4) (04-08-2024)
 

Podfile

@@ -1,8 +1,9 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '12.0'
+platform :ios, '15.0'
 
 target 'sf-wkt-ios' do
-  pod 'sf-ios', '~> 4.1.4'
+#  pod 'sf-ios', '5.0.0'
+  pod 'sf-ios', :git => 'https://github.com/ngageoint/simple-features-ios.git', :branch => 'psolt/v5-NS_ENUM'
 
   target 'sf-wkt-iosTests' do
     inherit! :search_paths

README.md

@@ -53,20 +53,20 @@ Open sf-wkt-ios.xcworkspace in Xcode or build from command line:
 
 Run tests from Xcode or from command line:
 
-    xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 15'
+    xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 16'
 
 ### Include Library ###
 
 Include this repository by specifying it in a Podfile using a supported option.
 
 Pull from [CocoaPods](https://cocoapods.org/pods/sf-wkt-ios):
 
-    pod 'sf-wkt-ios', '~> 2.1.4'
+    pod 'sf-wkt-ios', '~> 3.0.0'
 
 Pull from GitHub:
 
     pod 'sf-wkt-ios', :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :branch => 'master'
-    pod 'sf-wkt-ios', :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :tag => '2.1.4'
+    pod 'sf-wkt-ios', :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :tag => '3.0.0'
 
 Include as local project:
 

docs/release.txt

@@ -5,7 +5,7 @@ xcodebuild -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios build
 
 Xcode Test:
 
-xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 15'
+xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 16'
 
 CocoaPods Local Lint:
 

sf-wkt-ios.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'sf-wkt-ios'
-  s.version          = '2.1.5'
+  s.version          = '3.0.0'
   s.license          =  {:type => 'MIT', :file => 'LICENSE' }
   s.summary          = 'iOS SDK for Simple Features Well-Known Text'
   s.homepage         = 'https://github.com/ngageoint/simple-features-wkt-ios'
@@ -10,12 +10,12 @@ Pod::Spec.new do |s|
   s.requires_arc     = true
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
 
-  s.platform         = :ios, '12.0'
-  s.ios.deployment_target = '12.0'
+  s.platform         = :ios, '15.0'
+  s.ios.deployment_target = '15.0'
 
   s.source_files = 'sf-wkt-ios/**/*.{h,m}'
 
   s.frameworks = 'Foundation'
 
-  s.dependency 'sf-ios', '~> 4.1.4'
+  s.dependency 'sf-ios', '5.0.0'
 end

sf-wkt-ios.xcodeproj/project.pbxproj

@@ -9,20 +9,18 @@
 /* Begin PBXBuildFile section */
 		042FC6571B963FE500549A4B /* sf_wkt_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 042FC64B1B963FE500549A4B /* sf_wkt_ios.framework */; };
 		042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */; };
-		042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */; };
-		0472B51B1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */; };
-		0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */; };
+		042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */; };
-		0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */; };
+		0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */; };
-		0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */; };
+		0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485565524D9ADC300810C6D /* SFWTGeometryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */; };
 		0485565824DD6A9F00810C6D /* SFWTTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565724DD6A9F00810C6D /* SFWTTestUtils.m */; };
 		0485565B24DD6C9500810C6D /* SFWTGeometryTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565A24DD6C9500810C6D /* SFWTGeometryTestUtils.m */; };
 		0485565E24DD8B4700810C6D /* SFWTReadmeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565D24DD8B4700810C6D /* SFWTReadmeTest.m */; };
 		0485566124DDD0F500810C6D /* SFWTSwiftReadmeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */; };
 		0485566324DDEF7300810C6D /* SFWTTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485566224DDEF7300810C6D /* SFWTTestCase.m */; };
-		0493A59E2AE94176000B75E6 /* sf_wkt_ios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */; };
 		B4B9C5C590F6D09B45DC2BDB /* libPods-sf-wkt-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A70C9172FC5893F17C0FB6 /* libPods-sf-wkt-ios.a */; };
 		B5D94958E350F092F31540ED /* libPods-sf-wkt-iosTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */; };
 /* End PBXBuildFile section */
@@ -44,7 +42,6 @@
 		042FC65C1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Prefix.pch"; sourceTree = "<group>"; };
 		042FC6D41B96453E00549A4B /* sf_wkt_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sf_wkt_ios.h; sourceTree = "<group>"; };
-		0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Bridging-Header.h"; sourceTree = "<group>"; };
 		0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryTypeInfo.h; sourceTree = "<group>"; };
 		0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryTypeInfo.m; sourceTree = "<group>"; };
 		0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryReader.h; sourceTree = "<group>"; };
@@ -60,7 +57,6 @@
 		0485565F24DDD0F400810C6D /* sf-wkt-iosTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-iosTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFWTSwiftReadmeTest.swift; sourceTree = "<group>"; };
 		0485566224DDEF7300810C6D /* SFWTTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTTestCase.m; sourceTree = "<group>"; };
-		0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sf_wkt_ios.swift; sourceTree = "<group>"; };
 		192D9E5452A64EB6A7955A5A /* Pods-sf-wkt-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-ios/Pods-sf-wkt-ios.release.xcconfig"; sourceTree = "<group>"; };
 		457018C9103A514A78925D9E /* Pods-sf-wkt-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-ios/Pods-sf-wkt-ios.debug.xcconfig"; sourceTree = "<group>"; };
 		499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-wkt-iosTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -114,7 +110,6 @@
 			isa = PBXGroup;
 			children = (
 				042FC6D41B96453E00549A4B /* sf_wkt_ios.h */,
-				0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */,
 				0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */,
 				0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */,
 				0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */,
@@ -123,7 +118,6 @@
 				0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */,
 				042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */,
 				042FC64E1B963FE500549A4B /* Supporting Files */,
-				0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */,
 			);
 			path = "sf-wkt-ios";
 			sourceTree = "<group>";
@@ -188,12 +182,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0472B51B1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h in Headers */,
 				042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */,
 				0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */,
 				0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */,
-				042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */,
 				0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */,
+				042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -245,7 +238,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1620;
 				ORGANIZATIONNAME = NGA;
 				TargetAttributes = {
 					042FC64A1B963FE500549A4B = {
@@ -341,7 +334,6 @@
 				0485565524D9ADC300810C6D /* SFWTGeometryWriter.m in Sources */,
 				0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */,
 				0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */,
-				0493A59E2AE94176000B75E6 /* sf_wkt_ios.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -372,6 +364,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -434,6 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -543,7 +537,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6179C77188B4A0E8D4DEDBEB /* Pods-sf-wkt-iosTests.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -570,7 +563,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B17E59AE80997CC09DD740D6 /* Pods-sf-wkt-iosTests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",

sf-wkt-ios.xcodeproj/xcshareddata/xcschemes/sf-wkt-ios.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

sf-wkt-ios/SFWTGeometryReader.h

@@ -6,16 +6,8 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFTextReader.h"
-#import "SFMultiPoint.h"
-#import "SFMultiLineString.h"
-#import "SFMultiPolygon.h"
-#import "SFCircularString.h"
-#import "SFCompoundCurve.h"
-#import "SFTIN.h"
-#import "SFTriangle.h"
+@import sf_ios;
 #import "SFWTGeometryTypeInfo.h"
-#import "SFGeometryFilter.h"
 
 /**
  * Well Known Text reader
@@ -127,7 +119,7 @@
  *
  *  @return geometry
  */
--(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType;
+-(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType;
 
 /**
  * Read the geometry type info
@@ -480,7 +472,7 @@
  *
  *  @return geometry
  */
-+(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject<SFGeometryFilter> *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType;
++(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject<SFGeometryFilter> *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType;
 
 /**
  * Read the geometry type info

sf-wkt-ios/SFWTGeometryReader.m

@@ -68,7 +68,7 @@ -(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter andExpecte
     return [self readWithFilter:filter inType:SF_NONE andExpectedType:expectedType];
 }
 
--(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType{
+-(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType{
 
     SFGeometry *geometry = nil;
 
@@ -77,7 +77,7 @@ -(SFGeometry *) readWithFilter: (NSObject<SFGeometryFilter> *) filter inType: (e
 
     if(geometryTypeInfo != nil){
 
-        enum SFGeometryType geometryType = [geometryTypeInfo geometryType];
+        SFGeometryType geometryType = [geometryTypeInfo geometryType];
         BOOL hasZ = [geometryTypeInfo hasZ];
         BOOL hasM = [geometryTypeInfo hasM];
 
@@ -167,7 +167,7 @@ -(SFWTGeometryTypeInfo *) readGeometryType{
         BOOL hasM = NO;
 
         // Determine the geometry type
-        enum SFGeometryType geometryType = [SFGeometryTypes fromName:geometryTypeValue];
+        SFGeometryType geometryType = [SFGeometryTypes fromName:geometryTypeValue];
 
         // If not found, check if the geometry type has Z and/or M suffix
         if (geometryType == SF_NONE) {
@@ -702,7 +702,7 @@ +(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSOb
     return [self readGeometryWithReader:reader andFilter:filter inType:SF_NONE andExpectedType:expectedType];
 }
 
-+(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject<SFGeometryFilter> *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType{
++(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject<SFGeometryFilter> *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType{
     SFWTGeometryReader *geometryReader = [[SFWTGeometryReader alloc] initWithReader:reader];
     return [geometryReader readWithFilter:filter inType:containingType andExpectedType:expectedType];
 }
@@ -950,7 +950,7 @@ +(BOOL) isCommaOrRightParenthesis: (SFTextReader *) reader{
  *            geometry or null
  * @return true if passes filter
  */
-+(BOOL) filter: (NSObject<SFGeometryFilter> *) filter geometry: (SFGeometry *) geometry inType: (enum SFGeometryType) containingType{
++(BOOL) filter: (NSObject<SFGeometryFilter> *) filter geometry: (SFGeometry *) geometry inType: (SFGeometryType) containingType{
     return filter == nil || geometry == nil || [filter filterGeometry:geometry inType:containingType];
 }
 

sf-wkt-ios/SFWTGeometryTypeInfo.h

@@ -6,7 +6,8 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFGeometryTypes.h"
+@import Foundation;
+@import sf_ios;
 
 /**
  * Geometry type info
@@ -23,14 +24,14 @@
  * @param hasM
  *            has m
  */
--(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
+-(instancetype) initWithType: (SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM;
 
 /**
  * Get the geometry type
  *
  * @return geometry type
  */
--(enum SFGeometryType) geometryType;
+-(SFGeometryType) geometryType;
 
 /**
  * Has z values

sf-wkt-ios/SFWTGeometryTypeInfo.m

@@ -13,7 +13,7 @@ @interface SFWTGeometryTypeInfo()
 /**
  * Geometry type
  */
-@property (nonatomic) enum SFGeometryType geometryType;
+@property (nonatomic) SFGeometryType geometryType;
 
 /**
  * Has Z values flag
@@ -29,7 +29,7 @@ @interface SFWTGeometryTypeInfo()
 
 @implementation SFWTGeometryTypeInfo
 
--(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
+-(instancetype) initWithType: (SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{
     self = [super init];
     if(self != nil){
         self.geometryType = geometryType;
@@ -39,7 +39,7 @@ -(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL)
     return self;
 }
 
--(enum SFGeometryType) geometryType{
+-(SFGeometryType) geometryType{
     return _geometryType;
 }
 

sf-wkt-ios/SFWTGeometryWriter.h

@@ -6,13 +6,7 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFMultiPoint.h"
-#import "SFMultiLineString.h"
-#import "SFMultiPolygon.h"
-#import "SFCircularString.h"
-#import "SFCompoundCurve.h"
-#import "SFTIN.h"
-#import "SFTriangle.h"
+@import sf_ios;
 
 /**
  * Well Known Text writer