Update to fix import statements and move dependencies outside of the public headers.

Using SimpleFeatures module instead of sf-ios to help fix issues around resource loading with dashes.

Author: paulsolt-ofsw

Package.resolved

@@ -12,18 +12,18 @@ let package = Package(
     dependencies: [
 
         .package(url: "https://github.com/ngageoint/simple-features-ios", branch: "psolt/v5-NS_ENUM_Package"), // FIXME: Update to published release
+        
 //        .package(name: "simple-features-ios", path: "../simple-features-ios"), // Testing locally against (psolt/v5-NS_ENUM_Package)
     ],
     targets: [
         .target(
             name: "SimpleFeaturesGeoJSON", // Use full name without hyphens to prevent SPM test resource bug
             dependencies: [
-                .product(name: "sf-ios", package: "simple-features-ios")
+                .product(name: "SimpleFeatures", package: "simple-features-ios")
             ],
             path: "sf-geojson-ios",
 
             exclude: [
-                "sf_geojson_ios.swift",
             ],
             publicHeadersPath: "",
             cSettings: [

Package.swift

@@ -10,6 +10,8 @@
 #import "SFGFeatureConverter.h"
 #import "SFGOrderedDictionary.h"
 
+@import SimpleFeatures;
+
 NSString * const SFG_TYPE_FEATURE_COLLECTION = @"FeatureCollection";
 
 NSString * const SFG_MEMBER_FEATURES = @"features";

sf-geojson-ios/Info.plist

@@ -7,6 +7,7 @@
 //
 
 #import "SFGFeatureConverter.h"
+@import SimpleFeatures;
 
 @implementation SFGFeatureConverter
 

sf-geojson-ios/SFGFeatureCollection.m

@@ -8,7 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
-@import sf_ios;
+@class SFGeometry;
+
 
 /**
  * Type key

sf-geojson-ios/SFGFeatureConverter.m

@@ -9,6 +9,8 @@
 #import "SFGGeoJSONObject.h"
 #import "SFGOrderedDictionary.h"
 
+@import SimpleFeatures;
+
 NSString * const SFG_MEMBER_TYPE = @"type";
 
 NSString * const SFG_MEMBER_BBOX = @"bbox";

sf-geojson-ios/SFGGeoJSONObject.h

@@ -6,12 +6,12 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-@import sf_ios;
 
 #import "SFGGeoJSONObject.h"
-//#import "SFGeometry.h"
 #import "SFGGeometryTypes.h"
 
+@class SFGeometry;
+
 /**
  * Coordinates key
  */

sf-geojson-ios/SFGGeoJSONObject.m

@@ -7,9 +7,8 @@
 //
 
 #import "SFGGeometry.h"
-//#import "SFGeometryCollection.h"
 
-@import sf_ios;
+@class SFGeometryCollection;
 
 /**
  * Geometries key

sf-geojson-ios/SFGGeometry.h

@@ -9,6 +9,8 @@
 #import "SFGGeometryCollection.h"
 #import "SFGFeatureConverter.h"
 
+@import SimpleFeatures;
+
 NSString * const SFG_MEMBER_GEOMETRIES = @"geometries";
 
 static NSOrderedSet *keys = nil;