diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml deleted file mode 100644 index 14ebf12..0000000 --- a/.github/workflows/build-test.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build & Test - -on: - push: - branches: - - master - pull_request: - -jobs: - - build: - - runs-on: macOS-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - name: Install - run: pod install - - name: Build & Test - run: xcodebuild test -workspace sf-geojson-ios.xcworkspace -scheme sf-geojson-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afc75af..46724c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,8 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v3 - - name: Install - run: pod install - - name: Build - run: xcodebuild build-for-testing -workspace sf-geojson-ios.xcworkspace -scheme sf-geojson-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14' + uses: actions/checkout@v4 + - name: Swift Build + run: swift build + - name: Swift Test + run: swift test diff --git a/.gitignore b/.gitignore index 2384951..0b7626a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Pods xcuserdata/ *.swp Carthage/ +.build/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 312e832..2e0894e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ Adheres to [Semantic Versioning](http://semver.org/). --- -## 4.2.6 (TBD) +## 5.0.0 (5-4-2025) -* TBD +* Integrates sf-ios 5.0.0 (SimpleFeatures) breaking code chanegs for NS_ENUM. +* Updates existing enums to NS_ENUM for Swift for Objective-C interoperability. +* Adds Swift Package support and removes Cocoapods support (since it's deprecated). ## [4.2.5](https://github.com/ngageoint/simple-features-geojson-ios/releases/tag/4.2.5) (04-08-2024) diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..98db084 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "8069c0fafbcdb7a67b070448df7ff6bec18895a15a1ef21c9f16b8148c04a49e", + "pins" : [ + { + "identity" : "simple-features-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ngageoint/simple-features-ios", + "state" : { + "branch" : "psolt/v5-NS_ENUM_Package", + "revision" : "466c1b5225e3fb6e004a459b2d4811dab20bc561" + } + } + ], + "version" : 3 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..4ff3b6b --- /dev/null +++ b/Package.swift @@ -0,0 +1,62 @@ +// swift-tools-version:5.10 +import PackageDescription + +/// SPM Conversion Notes +/// * Hyphens break the resource bundling logic in Objective-C, so we're using full names +/// * sf-geoson is now SimpleFeaturesGeoJSON + +let package = Package( + name: "SimpleFeaturesGeoJSON", + platforms: [.macOS(.v11), .iOS(.v13)], + products: [ + .library( + name: "SimpleFeaturesGeoJSON", + targets: ["SimpleFeaturesGeoJSON"]), + ], + dependencies: [ + + .package(url: "https://github.com/ngageoint/simple-features-ios", branch: "psolt/v5-NS_ENUM_Package"), // FIXME: Update to published release (5.0.0 version) + +// .package(name: "simple-features-ios", path: "../simple-features-ios"), // Testing locally against (psolt/v5-NS_ENUM_Package) + ], + targets: [ + .target( + name: "SimpleFeaturesGeoJSON", + dependencies: [ + .product(name: "SimpleFeatures", package: "simple-features-ios") + ], + path: "sf-geojson-ios", + publicHeadersPath: "include" + ), + .testTarget( + name: "SimpleFeaturesGeoJSONTests", // Use full name without hyphens to prevent SPM test resource bug + dependencies: [ + "SimpleFeaturesGeoJSON", + "SimpleFeatureGeoJSONTestHelpers" + ], + path: "sf-geojson-iosTests", + resources: [ // In Objective-C, the tests fail to load resource using SWIFTPM_MODULE_BUNDLE macro with hyphens for target/testTarget names, so we'll use full names. + .copy("fc-points.geojson"), + .copy("fc-points-altitude.geojson"), + .copy("gc.geojson"), + .copy("gc-multiple.geojson") + ] + ), + .testTarget( + name: "SimpleFeaturesGeoJSONTestsSwift", + dependencies: [ + "SimpleFeaturesGeoJSON", + "SimpleFeatureGeoJSONTestHelpers", + ], + path: "sf-geojson-iosTests-swift" + ), + .target( + name: "SimpleFeatureGeoJSONTestHelpers", // Shared helper code + dependencies: [ + "SimpleFeaturesGeoJSON", + ], + path: "sf-geojson-ios-TestUtils", + publicHeadersPath: "" + ), + ] +) diff --git a/Podfile b/Podfile deleted file mode 100644 index 424dbbb..0000000 --- a/Podfile +++ /dev/null @@ -1,10 +0,0 @@ -source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '12.0' - -target 'sf-geojson-ios' do - pod 'sf-ios', '~> 4.1.4' - - target 'sf-geojson-iosTests' do - inherit! :search_paths - end -end diff --git a/README.md b/README.md index ebe0935..542238b 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ View the latest [Appledoc](http://ngageoint.github.io/simple-features-geojson-io ```objectivec +@import SimpleFeaturesGeoJSON; + // NSString *content = ... SFGGeometry *geometry = [SFGFeatureConverter jsonToGeometry:content]; @@ -37,6 +39,8 @@ SFGeometry *simpleGeometry = [geometry geometry]; ```objectivec +@import SimpleFeaturesGeoJSON; + // SFGeometry *geometry = ... NSString *content = [SFGFeatureConverter simpleGeometryToJSON:geometry]; @@ -53,43 +57,48 @@ NSDictionary *contentTree = [SFGFeatureConverter simpleGeometryToTree:geometry]; ### Build ### -[![Build & Test](https://github.com/ngageoint/simple-features-geojson-ios/workflows/Build%20&%20Test/badge.svg)](https://github.com/ngageoint/simple-features-geojson-ios/actions/workflows/build-test.yml) +[![Build](https://github.com/ngageoint/simple-features-geojson-ios/actions/workflows/build.yml/badge.svg)](https://github.com/ngageoint/simple-features-geojson-ios/actions/workflows/build.yml) -Build this repository using Xcode and/or CocoaPods: +Build this repository using SPM: - pod repo update - pod install + swift build -Open sf-geojson-ios.xcworkspace in Xcode or build from command line: +Open the Swift Package in Xcode: - xcodebuild -workspace 'sf-geojson-ios.xcworkspace' -scheme sf-geojson-ios build + open Package.swift Run tests from Xcode or from command line: - xcodebuild test -workspace 'sf-geojson-ios.xcworkspace' -scheme sf-geojson-ios -destination 'platform=iOS Simulator,name=iPhone 15' + swift test ### Include Library ### -Include this repository by specifying it in a Podfile using a supported option. +Add a package dependency version: -Pull from [CocoaPods](https://cocoapods.org/pods/sf-geojson-ios): + .package(url: "https://github.com/ngageoint/simple-features-geojson-ios", from: "5.0.0"), - pod 'sf-geojson-ios', '~> 4.2.5' + # Or specific branch: -Pull from GitHub: + .package(url: "https://github.com/ngageoint/simple-features-geojson-ios", branch: "release/5.0.0"), + + # Or as a local dependency: - pod 'sf-geojson-ios', :git => 'https://github.com/ngageoint/simple-features-geojson-ios.git', :branch => 'master' - pod 'sf-geojson-ios', :git => 'https://github.com/ngageoint/simple-features-geojson-ios.git', :tag => '4.2.5' + .package(name: "simple-features-geojson-ios", path: "../simple-features-geojson-ios"), -Include as local project: +Use it in a target: - pod 'sf-geojson-ios', :path => '../simple-features-geojson-ios' + .target( + name: "MyLibrary", + dependencies: [ + .product(name: "SimpleFeaturesGeoJSON", package: "simple-features-geojson-ios") + ] + ) ### Swift ### -To use from Swift, import the sf-geojson-ios bridging header from the Swift project's bridging header +To use from Swift, import the framework: - #import "sf-geojson-ios-Bridging-Header.h" + import SimpleFeaturesGeoJSON #### Read #### diff --git a/sf-geojson-iosTests/SFGGeometryTestUtils.h b/sf-geojson-ios-TestUtils/SFGGeometryTestUtils.h similarity index 93% rename from sf-geojson-iosTests/SFGGeometryTestUtils.h rename to sf-geojson-ios-TestUtils/SFGGeometryTestUtils.h index 0c2e549..a29064b 100644 --- a/sf-geojson-iosTests/SFGGeometryTestUtils.h +++ b/sf-geojson-ios-TestUtils/SFGGeometryTestUtils.h @@ -6,15 +6,7 @@ // Copyright © 2015 NGA. All rights reserved. // -#import "SFGeometryEnvelope.h" -#import "SFMultiPoint.h" -#import "SFMultiLineString.h" -#import "SFCircularString.h" -#import "SFCompoundCurve.h" -#import "SFCurvePolygon.h" -#import "SFTIN.h" -#import "SFTriangle.h" - +@import SimpleFeatures; @interface SFGGeometryTestUtils : NSObject diff --git a/sf-geojson-iosTests/SFGGeometryTestUtils.m b/sf-geojson-ios-TestUtils/SFGGeometryTestUtils.m similarity index 98% rename from sf-geojson-iosTests/SFGGeometryTestUtils.m rename to sf-geojson-ios-TestUtils/SFGGeometryTestUtils.m index 08f15a9..d85b25d 100644 --- a/sf-geojson-iosTests/SFGGeometryTestUtils.m +++ b/sf-geojson-ios-TestUtils/SFGGeometryTestUtils.m @@ -6,6 +6,7 @@ // Copyright © 2015 NGA. All rights reserved. // +@import XCTest; #import "SFGGeometryTestUtils.h" #import "SFGTestUtils.h" @@ -38,7 +39,7 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo }else{ [SFGTestUtils assertNotNil:actual]; - enum SFGeometryType geometryType = expected.geometryType; + SFGeometryType geometryType = expected.geometryType; switch(geometryType){ case SF_GEOMETRY: [NSException raise:@"Unexpected Geometry Type" format:@"Unexpected Geometry Type of %@ which is abstract", [SFGeometryTypes name:geometryType]]; @@ -90,13 +91,13 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo [self compareTriangleWithExpected:(SFTriangle *)expected andActual:(SFTriangle *)actual]; break; default: - [NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %d", geometryType]; + [NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %ld", (long)geometryType]; } } } +(void) compareBaseGeometryAttributesWithExpected: (SFGeometry *) expected andActual: (SFGeometry *) actual{ - [SFGTestUtils assertEqualIntWithValue:expected.geometryType andValue2:actual.geometryType]; + XCTAssertEqual(expected.geometryType, actual.geometryType); [SFGTestUtils assertEqualBoolWithValue:expected.hasZ andValue2:actual.hasZ]; [SFGTestUtils assertEqualBoolWithValue:expected.hasM andValue2:actual.hasM]; } diff --git a/sf-geojson-iosTests/SFGTestUtils.h b/sf-geojson-ios-TestUtils/SFGTestUtils.h similarity index 97% rename from sf-geojson-iosTests/SFGTestUtils.h rename to sf-geojson-ios-TestUtils/SFGTestUtils.h index ab2436f..3c3602d 100644 --- a/sf-geojson-iosTests/SFGTestUtils.h +++ b/sf-geojson-ios-TestUtils/SFGTestUtils.h @@ -6,9 +6,8 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGeometry.h" -#import "SFMultiPolygon.h" -#import "SFGPoint.h" +@import SimpleFeatures; +@import SimpleFeaturesGeoJSON; @interface SFGTestUtils : NSObject diff --git a/sf-geojson-iosTests/SFGTestUtils.m b/sf-geojson-ios-TestUtils/SFGTestUtils.m similarity index 99% rename from sf-geojson-iosTests/SFGTestUtils.m rename to sf-geojson-ios-TestUtils/SFGTestUtils.m index f648b91..d6144ba 100644 --- a/sf-geojson-iosTests/SFGTestUtils.m +++ b/sf-geojson-ios-TestUtils/SFGTestUtils.m @@ -7,9 +7,9 @@ // #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" #import "SFGGeometryTestUtils.h" -#import "SFLinearRing.h" +@import SimpleFeatures; +@import SimpleFeaturesGeoJSON; #define ARC4RANDOM_MAX 0x100000000 diff --git a/sf-geojson-ios.podspec b/sf-geojson-ios.podspec deleted file mode 100644 index 7e8f4b2..0000000 --- a/sf-geojson-ios.podspec +++ /dev/null @@ -1,21 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'sf-geojson-ios' - s.version = '4.2.6' - s.license = {:type => 'MIT', :file => 'LICENSE' } - s.summary = 'iOS SDK for Simple Features GeoJSON' - s.homepage = 'https://github.com/ngageoint/simple-features-geojson-ios' - s.authors = { 'NGA' => '', 'BIT Systems' => '', 'Brian Osborn' => 'bosborn@caci.com' } - s.social_media_url = 'https://twitter.com/NGA_GEOINT' - s.source = { :git => 'https://github.com/ngageoint/simple-features-geojson-ios.git', :tag => s.version } - s.requires_arc = true - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - - s.platform = :ios, '12.0' - s.ios.deployment_target = '12.0' - - s.source_files = 'sf-geojson-ios/**/*.{h,m}' - - s.frameworks = 'Foundation' - - s.dependency 'sf-ios', '~> 4.1.4' -end diff --git a/sf-geojson-ios.xcodeproj/project.pbxproj b/sf-geojson-ios.xcodeproj/project.pbxproj deleted file mode 100644 index 21bd6ae..0000000 --- a/sf-geojson-ios.xcodeproj/project.pbxproj +++ /dev/null @@ -1,786 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 041F18E724CB5751001311E4 /* SFGReadmeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 041F18E624CB5751001311E4 /* SFGReadmeTest.m */; }; - 041F18EA24CB5779001311E4 /* SFGSwiftReadmeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041F18E924CB5779001311E4 /* SFGSwiftReadmeTest.swift */; }; - 042FC6571B963FE500549A4B /* sf_geojson_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 042FC64B1B963FE500549A4B /* sf_geojson_ios.framework */; }; - 042FC6D31B96421E00549A4B /* sf-geojson-ios-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 042FC69E1B96421E00549A4B /* sf-geojson-ios-Prefix.pch */; }; - 042FC6D51B96453E00549A4B /* sf_geojson_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 042FC6D41B96453E00549A4B /* sf_geojson_ios.h */; }; - 0472B51B1C03590500496B87 /* sf-geojson-ios-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472B51A1C03590500496B87 /* sf-geojson-ios-Bridging-Header.h */; }; - 0493A5A02AE94BA1000B75E6 /* sf_geojson_ios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493A59F2AE94BA1000B75E6 /* sf_geojson_ios.swift */; }; - 04B45FA327283E0500BACC29 /* SFGGeometryTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B45FA127283E0500BACC29 /* SFGGeometryTypes.h */; }; - 04B45FA427283E0500BACC29 /* SFGGeometryTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B45FA227283E0500BACC29 /* SFGGeometryTypes.m */; }; - 04C393CB22DF6ED00049F6C0 /* SFGGeoJSONObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393C922DF6ED00049F6C0 /* SFGGeoJSONObject.h */; }; - 04C393CC22DF6ED00049F6C0 /* SFGGeoJSONObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393CA22DF6ED00049F6C0 /* SFGGeoJSONObject.m */; }; - 04C393CF22DF6EF90049F6C0 /* SFGGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393CD22DF6EF90049F6C0 /* SFGGeometry.h */; }; - 04C393D022DF6EF90049F6C0 /* SFGGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393CE22DF6EF90049F6C0 /* SFGGeometry.m */; }; - 04C393D322DF6F1B0049F6C0 /* SFGPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393D122DF6F1B0049F6C0 /* SFGPoint.h */; }; - 04C393D422DF6F1B0049F6C0 /* SFGPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393D222DF6F1B0049F6C0 /* SFGPoint.m */; }; - 04C393D722DF70100049F6C0 /* SFGPointTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393D622DF70100049F6C0 /* SFGPointTestCase.m */; }; - 04C393DA22DF78B50049F6C0 /* SFGTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393D922DF78B50049F6C0 /* SFGTestUtils.m */; }; - 04C393DD22DFBCB00049F6C0 /* SFGFeatureConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393DB22DFBCB00049F6C0 /* SFGFeatureConverter.h */; }; - 04C393DE22DFBCB00049F6C0 /* SFGFeatureConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393DC22DFBCB00049F6C0 /* SFGFeatureConverter.m */; }; - 04C393E122DFC32F0049F6C0 /* SFGPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393DF22DFC32F0049F6C0 /* SFGPosition.h */; }; - 04C393E222DFC32F0049F6C0 /* SFGPosition.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393E022DFC32F0049F6C0 /* SFGPosition.m */; }; - 04C393E522E26E230049F6C0 /* SFGGeometryTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393E422E26E230049F6C0 /* SFGGeometryTestUtils.m */; }; - 04C393E822E616B40049F6C0 /* SFGFeature.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393E622E616B40049F6C0 /* SFGFeature.h */; }; - 04C393E922E616B40049F6C0 /* SFGFeature.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393E722E616B40049F6C0 /* SFGFeature.m */; }; - 04C393EC22E616D30049F6C0 /* SFGFeatureCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393EA22E616D30049F6C0 /* SFGFeatureCollection.h */; }; - 04C393ED22E616D30049F6C0 /* SFGFeatureCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393EB22E616D30049F6C0 /* SFGFeatureCollection.m */; }; - 04C393F022E6170F0049F6C0 /* SFGGeometryCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393EE22E6170F0049F6C0 /* SFGGeometryCollection.h */; }; - 04C393F122E6170F0049F6C0 /* SFGGeometryCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393EF22E6170F0049F6C0 /* SFGGeometryCollection.m */; }; - 04C393F422E617300049F6C0 /* SFGLineString.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393F222E617300049F6C0 /* SFGLineString.h */; }; - 04C393F522E617300049F6C0 /* SFGLineString.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393F322E617300049F6C0 /* SFGLineString.m */; }; - 04C393F822E618560049F6C0 /* SFGMultiLineString.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393F622E618560049F6C0 /* SFGMultiLineString.h */; }; - 04C393F922E618560049F6C0 /* SFGMultiLineString.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393F722E618560049F6C0 /* SFGMultiLineString.m */; }; - 04C393FC22E619D60049F6C0 /* SFGMultiPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393FA22E619D60049F6C0 /* SFGMultiPoint.h */; }; - 04C393FD22E619D60049F6C0 /* SFGMultiPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393FB22E619D60049F6C0 /* SFGMultiPoint.m */; }; - 04C3940022E619F90049F6C0 /* SFGMultiPolygon.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C393FE22E619F90049F6C0 /* SFGMultiPolygon.h */; }; - 04C3940122E619F90049F6C0 /* SFGMultiPolygon.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C393FF22E619F90049F6C0 /* SFGMultiPolygon.m */; }; - 04C3940422E61A500049F6C0 /* SFGPolygon.h in Headers */ = {isa = PBXBuildFile; fileRef = 04C3940222E61A500049F6C0 /* SFGPolygon.h */; }; - 04C3940522E61A500049F6C0 /* SFGPolygon.m in Sources */ = {isa = PBXBuildFile; fileRef = 04C3940322E61A500049F6C0 /* SFGPolygon.m */; }; - 04E8E46E22E76B75001696A2 /* SFGFeatureTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E46D22E76B75001696A2 /* SFGFeatureTestCase.m */; }; - 04E8E47122F31F25001696A2 /* SFGPolygonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47022F31F25001696A2 /* SFGPolygonTestCase.m */; }; - 04E8E47422F336AD001696A2 /* SFGLineStringTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47322F336AD001696A2 /* SFGLineStringTestCase.m */; }; - 04E8E47722F355D9001696A2 /* SFGMultiPointTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47622F355D9001696A2 /* SFGMultiPointTestCase.m */; }; - 04E8E47A22F36026001696A2 /* SFGMultiLineStringTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47922F36026001696A2 /* SFGMultiLineStringTestCase.m */; }; - 04E8E47D22F36E4D001696A2 /* SFGMultiPolygonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47C22F36E4D001696A2 /* SFGMultiPolygonTestCase.m */; }; - 04E8E48022F3829D001696A2 /* SFGGeometryCollectionTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E47F22F3829D001696A2 /* SFGGeometryCollectionTestCase.m */; }; - 04E8E48322F47873001696A2 /* SFGFeatureCollectionTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E48222F47873001696A2 /* SFGFeatureCollectionTestCase.m */; }; - 04E8E48822F4A82E001696A2 /* gc.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 04E8E48422F4A82E001696A2 /* gc.geojson */; }; - 04E8E48922F4A82E001696A2 /* fc-points.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 04E8E48522F4A82E001696A2 /* fc-points.geojson */; }; - 04E8E48A22F4A82E001696A2 /* gc-multiple.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 04E8E48622F4A82E001696A2 /* gc-multiple.geojson */; }; - 04E8E48B22F4A82E001696A2 /* fc-points-altitude.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 04E8E48722F4A82E001696A2 /* fc-points-altitude.geojson */; }; - 04E8E4BC22FDE120001696A2 /* SFGOrderedDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 04E8E4BA22FDE11F001696A2 /* SFGOrderedDictionary.h */; }; - 04E8E4BD22FDE120001696A2 /* SFGOrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E8E4BB22FDE120001696A2 /* SFGOrderedDictionary.m */; }; - B4B9C5C590F6D09B45DC2BDB /* libPods-sf-geojson-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A70C9172FC5893F17C0FB6 /* libPods-sf-geojson-ios.a */; }; - B5D94958E350F092F31540ED /* libPods-sf-geojson-iosTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 499642A447440D35F38311C9 /* libPods-sf-geojson-iosTests.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 042FC6581B963FE500549A4B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 042FC6421B963FE500549A4B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 042FC64A1B963FE500549A4B; - remoteInfo = "sf-geojson-ios"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 041F18E524CB5751001311E4 /* SFGReadmeTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGReadmeTest.h; sourceTree = ""; }; - 041F18E624CB5751001311E4 /* SFGReadmeTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGReadmeTest.m; sourceTree = ""; }; - 041F18E824CB5778001311E4 /* sf-geojson-iosTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "sf-geojson-iosTests-Bridging-Header.h"; sourceTree = ""; }; - 041F18E924CB5779001311E4 /* SFGSwiftReadmeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFGSwiftReadmeTest.swift; sourceTree = ""; }; - 042FC64B1B963FE500549A4B /* sf_geojson_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sf_geojson_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 042FC64F1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 042FC6561B963FE500549A4B /* sf_geojson_iosTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sf_geojson_iosTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 042FC65C1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 042FC69E1B96421E00549A4B /* sf-geojson-ios-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-geojson-ios-Prefix.pch"; sourceTree = ""; }; - 042FC6D41B96453E00549A4B /* sf_geojson_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sf_geojson_ios.h; sourceTree = ""; }; - 0472B51A1C03590500496B87 /* sf-geojson-ios-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-geojson-ios-Bridging-Header.h"; sourceTree = ""; }; - 0493A59F2AE94BA1000B75E6 /* sf_geojson_ios.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sf_geojson_ios.swift; sourceTree = ""; }; - 04B45FA127283E0500BACC29 /* SFGGeometryTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGGeometryTypes.h; sourceTree = ""; }; - 04B45FA227283E0500BACC29 /* SFGGeometryTypes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGGeometryTypes.m; sourceTree = ""; }; - 04C393C922DF6ED00049F6C0 /* SFGGeoJSONObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGGeoJSONObject.h; sourceTree = ""; }; - 04C393CA22DF6ED00049F6C0 /* SFGGeoJSONObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGGeoJSONObject.m; sourceTree = ""; }; - 04C393CD22DF6EF90049F6C0 /* SFGGeometry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGGeometry.h; sourceTree = ""; }; - 04C393CE22DF6EF90049F6C0 /* SFGGeometry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGGeometry.m; sourceTree = ""; }; - 04C393D122DF6F1B0049F6C0 /* SFGPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGPoint.h; sourceTree = ""; }; - 04C393D222DF6F1B0049F6C0 /* SFGPoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGPoint.m; sourceTree = ""; }; - 04C393D522DF70100049F6C0 /* SFGPointTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGPointTestCase.h; sourceTree = ""; }; - 04C393D622DF70100049F6C0 /* SFGPointTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGPointTestCase.m; sourceTree = ""; }; - 04C393D822DF78B50049F6C0 /* SFGTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGTestUtils.h; sourceTree = ""; }; - 04C393D922DF78B50049F6C0 /* SFGTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGTestUtils.m; sourceTree = ""; }; - 04C393DB22DFBCB00049F6C0 /* SFGFeatureConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGFeatureConverter.h; sourceTree = ""; }; - 04C393DC22DFBCB00049F6C0 /* SFGFeatureConverter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGFeatureConverter.m; sourceTree = ""; }; - 04C393DF22DFC32F0049F6C0 /* SFGPosition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGPosition.h; sourceTree = ""; }; - 04C393E022DFC32F0049F6C0 /* SFGPosition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGPosition.m; sourceTree = ""; }; - 04C393E322E26E230049F6C0 /* SFGGeometryTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFGGeometryTestUtils.h; sourceTree = ""; }; - 04C393E422E26E230049F6C0 /* SFGGeometryTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFGGeometryTestUtils.m; sourceTree = ""; }; - 04C393E622E616B40049F6C0 /* SFGFeature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGFeature.h; sourceTree = ""; }; - 04C393E722E616B40049F6C0 /* SFGFeature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGFeature.m; sourceTree = ""; }; - 04C393EA22E616D30049F6C0 /* SFGFeatureCollection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGFeatureCollection.h; sourceTree = ""; }; - 04C393EB22E616D30049F6C0 /* SFGFeatureCollection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGFeatureCollection.m; sourceTree = ""; }; - 04C393EE22E6170F0049F6C0 /* SFGGeometryCollection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGGeometryCollection.h; sourceTree = ""; }; - 04C393EF22E6170F0049F6C0 /* SFGGeometryCollection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGGeometryCollection.m; sourceTree = ""; }; - 04C393F222E617300049F6C0 /* SFGLineString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGLineString.h; sourceTree = ""; }; - 04C393F322E617300049F6C0 /* SFGLineString.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGLineString.m; sourceTree = ""; }; - 04C393F622E618560049F6C0 /* SFGMultiLineString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiLineString.h; sourceTree = ""; }; - 04C393F722E618560049F6C0 /* SFGMultiLineString.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiLineString.m; sourceTree = ""; }; - 04C393FA22E619D60049F6C0 /* SFGMultiPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiPoint.h; sourceTree = ""; }; - 04C393FB22E619D60049F6C0 /* SFGMultiPoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiPoint.m; sourceTree = ""; }; - 04C393FE22E619F90049F6C0 /* SFGMultiPolygon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiPolygon.h; sourceTree = ""; }; - 04C393FF22E619F90049F6C0 /* SFGMultiPolygon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiPolygon.m; sourceTree = ""; }; - 04C3940222E61A500049F6C0 /* SFGPolygon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGPolygon.h; sourceTree = ""; }; - 04C3940322E61A500049F6C0 /* SFGPolygon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGPolygon.m; sourceTree = ""; }; - 04E8E46C22E76B75001696A2 /* SFGFeatureTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGFeatureTestCase.h; sourceTree = ""; }; - 04E8E46D22E76B75001696A2 /* SFGFeatureTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGFeatureTestCase.m; sourceTree = ""; }; - 04E8E46F22F31F25001696A2 /* SFGPolygonTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGPolygonTestCase.h; sourceTree = ""; }; - 04E8E47022F31F25001696A2 /* SFGPolygonTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGPolygonTestCase.m; sourceTree = ""; }; - 04E8E47222F336AD001696A2 /* SFGLineStringTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGLineStringTestCase.h; sourceTree = ""; }; - 04E8E47322F336AD001696A2 /* SFGLineStringTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGLineStringTestCase.m; sourceTree = ""; }; - 04E8E47522F355D9001696A2 /* SFGMultiPointTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiPointTestCase.h; sourceTree = ""; }; - 04E8E47622F355D9001696A2 /* SFGMultiPointTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiPointTestCase.m; sourceTree = ""; }; - 04E8E47822F36026001696A2 /* SFGMultiLineStringTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiLineStringTestCase.h; sourceTree = ""; }; - 04E8E47922F36026001696A2 /* SFGMultiLineStringTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiLineStringTestCase.m; sourceTree = ""; }; - 04E8E47B22F36E4D001696A2 /* SFGMultiPolygonTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGMultiPolygonTestCase.h; sourceTree = ""; }; - 04E8E47C22F36E4D001696A2 /* SFGMultiPolygonTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGMultiPolygonTestCase.m; sourceTree = ""; }; - 04E8E47E22F3829D001696A2 /* SFGGeometryCollectionTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGGeometryCollectionTestCase.h; sourceTree = ""; }; - 04E8E47F22F3829D001696A2 /* SFGGeometryCollectionTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGGeometryCollectionTestCase.m; sourceTree = ""; }; - 04E8E48122F47873001696A2 /* SFGFeatureCollectionTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGFeatureCollectionTestCase.h; sourceTree = ""; }; - 04E8E48222F47873001696A2 /* SFGFeatureCollectionTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGFeatureCollectionTestCase.m; sourceTree = ""; }; - 04E8E48422F4A82E001696A2 /* gc.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gc.geojson; sourceTree = ""; }; - 04E8E48522F4A82E001696A2 /* fc-points.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "fc-points.geojson"; sourceTree = ""; }; - 04E8E48622F4A82E001696A2 /* gc-multiple.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "gc-multiple.geojson"; sourceTree = ""; }; - 04E8E48722F4A82E001696A2 /* fc-points-altitude.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "fc-points-altitude.geojson"; sourceTree = ""; }; - 04E8E4BA22FDE11F001696A2 /* SFGOrderedDictionary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFGOrderedDictionary.h; sourceTree = ""; }; - 04E8E4BB22FDE120001696A2 /* SFGOrderedDictionary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFGOrderedDictionary.m; sourceTree = ""; }; - 192D9E5452A64EB6A7955A5A /* Pods-sf-geojson-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-geojson-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-sf-geojson-ios/Pods-sf-geojson-ios.release.xcconfig"; sourceTree = ""; }; - 457018C9103A514A78925D9E /* Pods-sf-geojson-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-geojson-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-sf-geojson-ios/Pods-sf-geojson-ios.debug.xcconfig"; sourceTree = ""; }; - 499642A447440D35F38311C9 /* libPods-sf-geojson-iosTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-geojson-iosTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 6179C77188B4A0E8D4DEDBEB /* Pods-sf-geojson-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-geojson-iosTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-sf-geojson-iosTests/Pods-sf-geojson-iosTests.debug.xcconfig"; sourceTree = ""; }; - B17E59AE80997CC09DD740D6 /* Pods-sf-geojson-iosTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-geojson-iosTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-sf-geojson-iosTests/Pods-sf-geojson-iosTests.release.xcconfig"; sourceTree = ""; }; - F9A70C9172FC5893F17C0FB6 /* libPods-sf-geojson-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-geojson-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 042FC6471B963FE500549A4B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - B4B9C5C590F6D09B45DC2BDB /* libPods-sf-geojson-ios.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6531B963FE500549A4B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 042FC6571B963FE500549A4B /* sf_geojson_ios.framework in Frameworks */, - B5D94958E350F092F31540ED /* libPods-sf-geojson-iosTests.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 042FC6411B963FE500549A4B = { - isa = PBXGroup; - children = ( - 042FC64D1B963FE500549A4B /* sf-geojson-ios */, - 042FC65A1B963FE500549A4B /* sf-geojson-iosTests */, - 042FC64C1B963FE500549A4B /* Products */, - 987AE7974D8B4ECED7B3FB6B /* Pods */, - 63206AE083C9F99B2058A9EE /* Frameworks */, - ); - sourceTree = ""; - }; - 042FC64C1B963FE500549A4B /* Products */ = { - isa = PBXGroup; - children = ( - 042FC64B1B963FE500549A4B /* sf_geojson_ios.framework */, - 042FC6561B963FE500549A4B /* sf_geojson_iosTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 042FC64D1B963FE500549A4B /* sf-geojson-ios */ = { - isa = PBXGroup; - children = ( - 042FC6D41B96453E00549A4B /* sf_geojson_ios.h */, - 0493A59F2AE94BA1000B75E6 /* sf_geojson_ios.swift */, - 042FC69E1B96421E00549A4B /* sf-geojson-ios-Prefix.pch */, - 04C393E622E616B40049F6C0 /* SFGFeature.h */, - 04C393E722E616B40049F6C0 /* SFGFeature.m */, - 04C393EA22E616D30049F6C0 /* SFGFeatureCollection.h */, - 04C393EB22E616D30049F6C0 /* SFGFeatureCollection.m */, - 04C393DB22DFBCB00049F6C0 /* SFGFeatureConverter.h */, - 04C393DC22DFBCB00049F6C0 /* SFGFeatureConverter.m */, - 04C393C922DF6ED00049F6C0 /* SFGGeoJSONObject.h */, - 04C393CA22DF6ED00049F6C0 /* SFGGeoJSONObject.m */, - 04C393CD22DF6EF90049F6C0 /* SFGGeometry.h */, - 04C393CE22DF6EF90049F6C0 /* SFGGeometry.m */, - 04C393EE22E6170F0049F6C0 /* SFGGeometryCollection.h */, - 04C393EF22E6170F0049F6C0 /* SFGGeometryCollection.m */, - 04B45FA127283E0500BACC29 /* SFGGeometryTypes.h */, - 04B45FA227283E0500BACC29 /* SFGGeometryTypes.m */, - 04C393F222E617300049F6C0 /* SFGLineString.h */, - 04C393F322E617300049F6C0 /* SFGLineString.m */, - 04C393F622E618560049F6C0 /* SFGMultiLineString.h */, - 04C393F722E618560049F6C0 /* SFGMultiLineString.m */, - 04C393FA22E619D60049F6C0 /* SFGMultiPoint.h */, - 04C393FB22E619D60049F6C0 /* SFGMultiPoint.m */, - 04C393FE22E619F90049F6C0 /* SFGMultiPolygon.h */, - 04C393FF22E619F90049F6C0 /* SFGMultiPolygon.m */, - 04C393D122DF6F1B0049F6C0 /* SFGPoint.h */, - 04C393D222DF6F1B0049F6C0 /* SFGPoint.m */, - 04C3940222E61A500049F6C0 /* SFGPolygon.h */, - 04C3940322E61A500049F6C0 /* SFGPolygon.m */, - 04C393DF22DFC32F0049F6C0 /* SFGPosition.h */, - 04C393E022DFC32F0049F6C0 /* SFGPosition.m */, - 04E8E4BA22FDE11F001696A2 /* SFGOrderedDictionary.h */, - 04E8E4BB22FDE120001696A2 /* SFGOrderedDictionary.m */, - 042FC64E1B963FE500549A4B /* Supporting Files */, - 0472B51A1C03590500496B87 /* sf-geojson-ios-Bridging-Header.h */, - ); - path = "sf-geojson-ios"; - sourceTree = ""; - }; - 042FC64E1B963FE500549A4B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 042FC64F1B963FE500549A4B /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 042FC65A1B963FE500549A4B /* sf-geojson-iosTests */ = { - isa = PBXGroup; - children = ( - 041F18E524CB5751001311E4 /* SFGReadmeTest.h */, - 041F18E624CB5751001311E4 /* SFGReadmeTest.m */, - 041F18E924CB5779001311E4 /* SFGSwiftReadmeTest.swift */, - 041F18E824CB5778001311E4 /* sf-geojson-iosTests-Bridging-Header.h */, - 04E8E48122F47873001696A2 /* SFGFeatureCollectionTestCase.h */, - 04E8E48222F47873001696A2 /* SFGFeatureCollectionTestCase.m */, - 04E8E46C22E76B75001696A2 /* SFGFeatureTestCase.h */, - 04E8E46D22E76B75001696A2 /* SFGFeatureTestCase.m */, - 04E8E47E22F3829D001696A2 /* SFGGeometryCollectionTestCase.h */, - 04E8E47F22F3829D001696A2 /* SFGGeometryCollectionTestCase.m */, - 04C393E322E26E230049F6C0 /* SFGGeometryTestUtils.h */, - 04C393E422E26E230049F6C0 /* SFGGeometryTestUtils.m */, - 04E8E47222F336AD001696A2 /* SFGLineStringTestCase.h */, - 04E8E47322F336AD001696A2 /* SFGLineStringTestCase.m */, - 04E8E47822F36026001696A2 /* SFGMultiLineStringTestCase.h */, - 04E8E47922F36026001696A2 /* SFGMultiLineStringTestCase.m */, - 04E8E47522F355D9001696A2 /* SFGMultiPointTestCase.h */, - 04E8E47622F355D9001696A2 /* SFGMultiPointTestCase.m */, - 04E8E47B22F36E4D001696A2 /* SFGMultiPolygonTestCase.h */, - 04E8E47C22F36E4D001696A2 /* SFGMultiPolygonTestCase.m */, - 04C393D522DF70100049F6C0 /* SFGPointTestCase.h */, - 04C393D622DF70100049F6C0 /* SFGPointTestCase.m */, - 04E8E46F22F31F25001696A2 /* SFGPolygonTestCase.h */, - 04E8E47022F31F25001696A2 /* SFGPolygonTestCase.m */, - 04C393D822DF78B50049F6C0 /* SFGTestUtils.h */, - 04C393D922DF78B50049F6C0 /* SFGTestUtils.m */, - 042FC65B1B963FE500549A4B /* Supporting Files */, - ); - path = "sf-geojson-iosTests"; - sourceTree = ""; - }; - 042FC65B1B963FE500549A4B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 04E8E48722F4A82E001696A2 /* fc-points-altitude.geojson */, - 04E8E48522F4A82E001696A2 /* fc-points.geojson */, - 04E8E48622F4A82E001696A2 /* gc-multiple.geojson */, - 04E8E48422F4A82E001696A2 /* gc.geojson */, - 042FC65C1B963FE500549A4B /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 63206AE083C9F99B2058A9EE /* Frameworks */ = { - isa = PBXGroup; - children = ( - 499642A447440D35F38311C9 /* libPods-sf-geojson-iosTests.a */, - F9A70C9172FC5893F17C0FB6 /* libPods-sf-geojson-ios.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - 987AE7974D8B4ECED7B3FB6B /* Pods */ = { - isa = PBXGroup; - children = ( - 6179C77188B4A0E8D4DEDBEB /* Pods-sf-geojson-iosTests.debug.xcconfig */, - B17E59AE80997CC09DD740D6 /* Pods-sf-geojson-iosTests.release.xcconfig */, - 457018C9103A514A78925D9E /* Pods-sf-geojson-ios.debug.xcconfig */, - 192D9E5452A64EB6A7955A5A /* Pods-sf-geojson-ios.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 042FC6481B963FE500549A4B /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 04C393E122DFC32F0049F6C0 /* SFGPosition.h in Headers */, - 04C393DD22DFBCB00049F6C0 /* SFGFeatureConverter.h in Headers */, - 04C393D322DF6F1B0049F6C0 /* SFGPoint.h in Headers */, - 04C393F022E6170F0049F6C0 /* SFGGeometryCollection.h in Headers */, - 04C393E822E616B40049F6C0 /* SFGFeature.h in Headers */, - 04C3940022E619F90049F6C0 /* SFGMultiPolygon.h in Headers */, - 04E8E4BC22FDE120001696A2 /* SFGOrderedDictionary.h in Headers */, - 04C393CF22DF6EF90049F6C0 /* SFGGeometry.h in Headers */, - 04C393CB22DF6ED00049F6C0 /* SFGGeoJSONObject.h in Headers */, - 04C393F822E618560049F6C0 /* SFGMultiLineString.h in Headers */, - 04C393FC22E619D60049F6C0 /* SFGMultiPoint.h in Headers */, - 04C3940422E61A500049F6C0 /* SFGPolygon.h in Headers */, - 04C393EC22E616D30049F6C0 /* SFGFeatureCollection.h in Headers */, - 04C393F422E617300049F6C0 /* SFGLineString.h in Headers */, - 0472B51B1C03590500496B87 /* sf-geojson-ios-Bridging-Header.h in Headers */, - 04B45FA327283E0500BACC29 /* SFGGeometryTypes.h in Headers */, - 042FC6D51B96453E00549A4B /* sf_geojson_ios.h in Headers */, - 042FC6D31B96421E00549A4B /* sf-geojson-ios-Prefix.pch in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 042FC64A1B963FE500549A4B /* sf-geojson-ios */ = { - isa = PBXNativeTarget; - buildConfigurationList = 042FC6611B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-geojson-ios" */; - buildPhases = ( - 61CC2D3C723ED627843718C0 /* [CP] Check Pods Manifest.lock */, - 042FC6461B963FE500549A4B /* Sources */, - 042FC6471B963FE500549A4B /* Frameworks */, - 042FC6481B963FE500549A4B /* Headers */, - 042FC6491B963FE500549A4B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "sf-geojson-ios"; - productName = "sf-geojson-ios"; - productReference = 042FC64B1B963FE500549A4B /* sf_geojson_ios.framework */; - productType = "com.apple.product-type.framework"; - }; - 042FC6551B963FE500549A4B /* sf-geojson-iosTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 042FC6641B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-geojson-iosTests" */; - buildPhases = ( - A047BB626AE642B283582B82 /* [CP] Check Pods Manifest.lock */, - 042FC6521B963FE500549A4B /* Sources */, - 042FC6531B963FE500549A4B /* Frameworks */, - 042FC6541B963FE500549A4B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 042FC6591B963FE500549A4B /* PBXTargetDependency */, - ); - name = "sf-geojson-iosTests"; - productName = "sf-geojson-iosTests"; - productReference = 042FC6561B963FE500549A4B /* sf_geojson_iosTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 042FC6421B963FE500549A4B /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1500; - ORGANIZATIONNAME = NGA; - TargetAttributes = { - 042FC64A1B963FE500549A4B = { - CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 1500; - }; - 042FC6551B963FE500549A4B = { - CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 1160; - }; - }; - }; - buildConfigurationList = 042FC6451B963FE500549A4B /* Build configuration list for PBXProject "sf-geojson-ios" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 042FC6411B963FE500549A4B; - productRefGroup = 042FC64C1B963FE500549A4B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 042FC64A1B963FE500549A4B /* sf-geojson-ios */, - 042FC6551B963FE500549A4B /* sf-geojson-iosTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 042FC6491B963FE500549A4B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6541B963FE500549A4B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 04E8E48822F4A82E001696A2 /* gc.geojson in Resources */, - 04E8E48B22F4A82E001696A2 /* fc-points-altitude.geojson in Resources */, - 04E8E48A22F4A82E001696A2 /* gc-multiple.geojson in Resources */, - 04E8E48922F4A82E001696A2 /* fc-points.geojson in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 61CC2D3C723ED627843718C0 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-sf-geojson-ios-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - A047BB626AE642B283582B82 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-sf-geojson-iosTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 042FC6461B963FE500549A4B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 04C393ED22E616D30049F6C0 /* SFGFeatureCollection.m in Sources */, - 04C393DE22DFBCB00049F6C0 /* SFGFeatureConverter.m in Sources */, - 04C393F122E6170F0049F6C0 /* SFGGeometryCollection.m in Sources */, - 04C393E922E616B40049F6C0 /* SFGFeature.m in Sources */, - 04C393D022DF6EF90049F6C0 /* SFGGeometry.m in Sources */, - 04C393FD22E619D60049F6C0 /* SFGMultiPoint.m in Sources */, - 0493A5A02AE94BA1000B75E6 /* sf_geojson_ios.swift in Sources */, - 04C393F522E617300049F6C0 /* SFGLineString.m in Sources */, - 04C393E222DFC32F0049F6C0 /* SFGPosition.m in Sources */, - 04E8E4BD22FDE120001696A2 /* SFGOrderedDictionary.m in Sources */, - 04C393F922E618560049F6C0 /* SFGMultiLineString.m in Sources */, - 04C393D422DF6F1B0049F6C0 /* SFGPoint.m in Sources */, - 04C3940522E61A500049F6C0 /* SFGPolygon.m in Sources */, - 04B45FA427283E0500BACC29 /* SFGGeometryTypes.m in Sources */, - 04C393CC22DF6ED00049F6C0 /* SFGGeoJSONObject.m in Sources */, - 04C3940122E619F90049F6C0 /* SFGMultiPolygon.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6521B963FE500549A4B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 04E8E47122F31F25001696A2 /* SFGPolygonTestCase.m in Sources */, - 04E8E47D22F36E4D001696A2 /* SFGMultiPolygonTestCase.m in Sources */, - 04E8E47422F336AD001696A2 /* SFGLineStringTestCase.m in Sources */, - 04C393E522E26E230049F6C0 /* SFGGeometryTestUtils.m in Sources */, - 041F18E724CB5751001311E4 /* SFGReadmeTest.m in Sources */, - 04C393DA22DF78B50049F6C0 /* SFGTestUtils.m in Sources */, - 041F18EA24CB5779001311E4 /* SFGSwiftReadmeTest.swift in Sources */, - 04E8E47722F355D9001696A2 /* SFGMultiPointTestCase.m in Sources */, - 04E8E48322F47873001696A2 /* SFGFeatureCollectionTestCase.m in Sources */, - 04E8E48022F3829D001696A2 /* SFGGeometryCollectionTestCase.m in Sources */, - 04E8E47A22F36026001696A2 /* SFGMultiLineStringTestCase.m in Sources */, - 04C393D722DF70100049F6C0 /* SFGPointTestCase.m in Sources */, - 04E8E46E22E76B75001696A2 /* SFGFeatureTestCase.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 042FC6591B963FE500549A4B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 042FC64A1B963FE500549A4B /* sf-geojson-ios */; - targetProxy = 042FC6581B963FE500549A4B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 042FC65F1B963FE500549A4B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = ""; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 042FC6601B963FE500549A4B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = ""; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 042FC6621B963FE500549A4B /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 457018C9103A514A78925D9E /* Pods-sf-geojson-ios.debug.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - INFOPLIST_FILE = "sf-geojson-ios/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; - PRODUCT_NAME = sf_geojson_ios; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 042FC6631B963FE500549A4B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 192D9E5452A64EB6A7955A5A /* Pods-sf-geojson-ios.release.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - INFOPLIST_FILE = "sf-geojson-ios/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; - PRODUCT_NAME = sf_geojson_ios; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 042FC6651B963FE500549A4B /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 6179C77188B4A0E8D4DEDBEB /* Pods-sf-geojson-iosTests.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "sf-geojson-iosTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_NAME = sf_geojson_iosTests; - SWIFT_OBJC_BRIDGING_HEADER = "sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 042FC6661B963FE500549A4B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = B17E59AE80997CC09DD740D6 /* Pods-sf-geojson-iosTests.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = "sf-geojson-iosTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_NAME = sf_geojson_iosTests; - SWIFT_OBJC_BRIDGING_HEADER = "sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 042FC6451B963FE500549A4B /* Build configuration list for PBXProject "sf-geojson-ios" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC65F1B963FE500549A4B /* Debug */, - 042FC6601B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 042FC6611B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-geojson-ios" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC6621B963FE500549A4B /* Debug */, - 042FC6631B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 042FC6641B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-geojson-iosTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC6651B963FE500549A4B /* Debug */, - 042FC6661B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 042FC6421B963FE500549A4B /* Project object */; -} diff --git a/sf-geojson-ios.xcodeproj/xcshareddata/xcschemes/sf-geojson-ios.xcscheme b/sf-geojson-ios.xcodeproj/xcshareddata/xcschemes/sf-geojson-ios.xcscheme deleted file mode 100644 index cabac62..0000000 --- a/sf-geojson-ios.xcodeproj/xcshareddata/xcschemes/sf-geojson-ios.xcscheme +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sf-geojson-ios/Info.plist b/sf-geojson-ios/Info.plist deleted file mode 100644 index ae6787f..0000000 --- a/sf-geojson-ios/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/sf-geojson-ios/SFGFeature.m b/sf-geojson-ios/SFGFeature.m index 0a746ec..692db97 100644 --- a/sf-geojson-ios/SFGFeature.m +++ b/sf-geojson-ios/SFGFeature.m @@ -6,9 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGFeature.h" -#import "SFGFeatureConverter.h" -#import "SFGOrderedDictionary.h" +#import +#import +#import NSString * const SFG_TYPE_FEATURE = @"Feature"; @@ -65,7 +65,7 @@ -(SFGeometry *) simpleGeometry{ return _geometry != nil ? [_geometry geometry] : nil; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return _geometry != nil ? [_geometry geometryType] : -1; } diff --git a/sf-geojson-ios/SFGFeatureCollection.m b/sf-geojson-ios/SFGFeatureCollection.m index 6484254..9276715 100644 --- a/sf-geojson-ios/SFGFeatureCollection.m +++ b/sf-geojson-ios/SFGFeatureCollection.m @@ -6,9 +6,11 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGFeatureCollection.h" -#import "SFGFeatureConverter.h" -#import "SFGOrderedDictionary.h" +#import +#import +#import + +@import SimpleFeatures; NSString * const SFG_TYPE_FEATURE_COLLECTION = @"FeatureCollection"; @@ -102,11 +104,11 @@ -(SFGeometry *) simpleGeometry{ return geometry; } --(enum SFGGeometryType) geometryType{ - enum SFGGeometryType result = -1; +-(SFGGeometryType) geometryType{ + SFGGeometryType result = -1; for(SFGFeature *feature in self.features){ - enum SFGGeometryType gt = [feature geometryType]; + SFGGeometryType gt = [feature geometryType]; if(result == -1){ result = gt; }else if(gt != result){ diff --git a/sf-geojson-ios/SFGFeatureConverter.m b/sf-geojson-ios/SFGFeatureConverter.m index b5243fc..346a830 100644 --- a/sf-geojson-ios/SFGFeatureConverter.m +++ b/sf-geojson-ios/SFGFeatureConverter.m @@ -6,7 +6,8 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGFeatureConverter.h" +#import +@import SimpleFeatures; @implementation SFGFeatureConverter @@ -202,7 +203,7 @@ +(SFGGeometry *) treeToGeometry: (NSDictionary *) tree{ +(SFGGeometry *) simpleGeometryToGeometry: (SFGeometry *) simpleGeometry{ SFGGeometry *geometry = nil; if(simpleGeometry != nil){ - enum SFGeometryType geometryType = simpleGeometry.geometryType; + SFGeometryType geometryType = simpleGeometry.geometryType; switch (geometryType) { case SF_POINT: geometry = [SFGPoint pointWithPoint:(SFPoint *)simpleGeometry]; diff --git a/sf-geojson-ios/SFGGeoJSONObject.m b/sf-geojson-ios/SFGGeoJSONObject.m index ee7cd25..28ed45f 100644 --- a/sf-geojson-ios/SFGGeoJSONObject.m +++ b/sf-geojson-ios/SFGGeoJSONObject.m @@ -6,8 +6,10 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeoJSONObject.h" -#import "SFGOrderedDictionary.h" +#import +#import + +@import SimpleFeatures; NSString * const SFG_MEMBER_TYPE = @"type"; diff --git a/sf-geojson-ios/SFGGeometry.m b/sf-geojson-ios/SFGGeometry.m index 51cacc3..7aaaace 100644 --- a/sf-geojson-ios/SFGGeometry.m +++ b/sf-geojson-ios/SFGGeometry.m @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeometry.h" +#import NSString * const SFG_MEMBER_COORDINATES = @"coordinates"; @@ -38,7 +38,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ [self doesNotRecognizeSelector:_cmd]; return -1; } diff --git a/sf-geojson-ios/SFGGeometryCollection.m b/sf-geojson-ios/SFGGeometryCollection.m index 2156a85..7879d3b 100644 --- a/sf-geojson-ios/SFGGeometryCollection.m +++ b/sf-geojson-ios/SFGGeometryCollection.m @@ -6,8 +6,10 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeometryCollection.h" -#import "SFGFeatureConverter.h" +#import +#import + +@import SimpleFeatures; NSString * const SFG_MEMBER_GEOMETRIES = @"geometries"; @@ -72,7 +74,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_GEOMETRYCOLLECTION; } diff --git a/sf-geojson-ios/SFGGeometryTypes.m b/sf-geojson-ios/SFGGeometryTypes.m index 6e0f6f3..6e46bf5 100644 --- a/sf-geojson-ios/SFGGeometryTypes.m +++ b/sf-geojson-ios/SFGGeometryTypes.m @@ -6,12 +6,14 @@ // Copyright © 2021 NGA. All rights reserved. // -#import "SFGGeometryTypes.h" +#import + +@import SimpleFeatures; @interface SFGGeometryTypes() -@property (nonatomic) enum SFGGeometryType type; -@property (nonatomic) enum SFGeometryType simpleType; +@property (nonatomic) SFGGeometryType type; +@property (nonatomic) SFGeometryType simpleType; @property (nonatomic, strong) NSString *name; @end @@ -47,11 +49,11 @@ +(void) initialize: (SFGGeometryTypes *) type{ [nameTypes setObject:type forKey:[type.name lowercaseString]]; } -+(SFGGeometryTypes *) createWithType: (enum SFGGeometryType) type andSimpleType: (enum SFGeometryType) simpleType andName: (NSString *) name{ ++(SFGGeometryTypes *) createWithType: (SFGGeometryType) type andSimpleType: (SFGeometryType) simpleType andName: (NSString *) name{ return [[SFGGeometryTypes alloc] initWithType:type andSimpleType:simpleType andName:name]; } --(instancetype) initWithType: (enum SFGGeometryType) type andSimpleType: (enum SFGeometryType) simpleType andName: (NSString *) name{ +-(instancetype) initWithType: (SFGGeometryType) type andSimpleType: (SFGeometryType) simpleType andName: (NSString *) name{ self = [super init]; if(self != nil){ _type = type; @@ -61,11 +63,11 @@ -(instancetype) initWithType: (enum SFGGeometryType) type andSimpleType: (enum S return self; } --(enum SFGGeometryType) type{ +-(SFGGeometryType) type{ return _type; } --(enum SFGeometryType) simpleType{ +-(SFGeometryType) simpleType{ return _simpleType; } @@ -73,11 +75,11 @@ -(NSString *) name{ return _name; } -+(SFGGeometryTypes *) type: (enum SFGGeometryType) geometryType{ ++(SFGGeometryTypes *) type: (SFGGeometryType) geometryType{ return [types objectForKey:[NSNumber numberWithInteger:geometryType]]; } -+(NSString *) name: (enum SFGGeometryType) geometryType{ ++(NSString *) name: (SFGGeometryType) geometryType{ return [self type:geometryType].name; } diff --git a/sf-geojson-ios/SFGLineString.m b/sf-geojson-ios/SFGLineString.m index f4c0047..53e2750 100644 --- a/sf-geojson-ios/SFGLineString.m +++ b/sf-geojson-ios/SFGLineString.m @@ -6,7 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGLineString.h" +#import + +@import SimpleFeatures; @implementation SFGLineString @@ -61,7 +63,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_LINESTRING; } diff --git a/sf-geojson-ios/SFGMultiLineString.m b/sf-geojson-ios/SFGMultiLineString.m index e17dc4d..65d6561 100644 --- a/sf-geojson-ios/SFGMultiLineString.m +++ b/sf-geojson-ios/SFGMultiLineString.m @@ -6,7 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGMultiLineString.h" +#import + +@import SimpleFeatures; @implementation SFGMultiLineString @@ -61,7 +63,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_MULTILINESTRING; } diff --git a/sf-geojson-ios/SFGMultiPoint.m b/sf-geojson-ios/SFGMultiPoint.m index d20025c..a77f4ae 100644 --- a/sf-geojson-ios/SFGMultiPoint.m +++ b/sf-geojson-ios/SFGMultiPoint.m @@ -6,7 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGMultiPoint.h" +#import + +@import SimpleFeatures; @implementation SFGMultiPoint @@ -61,7 +63,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_MULTIPOINT; } diff --git a/sf-geojson-ios/SFGMultiPolygon.m b/sf-geojson-ios/SFGMultiPolygon.m index 91cb421..5be6036 100644 --- a/sf-geojson-ios/SFGMultiPolygon.m +++ b/sf-geojson-ios/SFGMultiPolygon.m @@ -6,7 +6,8 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGMultiPolygon.h" +#import +@import SimpleFeatures; @implementation SFGMultiPolygon @@ -61,7 +62,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_MULTIPOLYGON; } diff --git a/sf-geojson-ios/SFGOrderedDictionary.m b/sf-geojson-ios/SFGOrderedDictionary.m index 080a6ff..afdcdff 100644 --- a/sf-geojson-ios/SFGOrderedDictionary.m +++ b/sf-geojson-ios/SFGOrderedDictionary.m @@ -23,7 +23,7 @@ // distribution. // -#import "SFGOrderedDictionary.h" +#import static NSString *DescriptionForObject(id object, id locale, NSUInteger indent) { diff --git a/sf-geojson-ios/SFGPoint.m b/sf-geojson-ios/SFGPoint.m index b9d6d62..ed3cdbc 100644 --- a/sf-geojson-ios/SFGPoint.m +++ b/sf-geojson-ios/SFGPoint.m @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPoint.h" +#import @implementation SFGPoint @@ -61,12 +61,12 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_POINT; } -(SFGeometry *) geometry{ - return [self point]; + return [self point]; // FIXME: BUG? What is this suppose to return? } -(SFPoint *) point{ diff --git a/sf-geojson-ios/SFGPolygon.m b/sf-geojson-ios/SFGPolygon.m index a1083a7..9f768cc 100644 --- a/sf-geojson-ios/SFGPolygon.m +++ b/sf-geojson-ios/SFGPolygon.m @@ -6,8 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPolygon.h" -#import "SFLinearRing.h" +#import + +@import SimpleFeatures; @implementation SFGPolygon @@ -62,7 +63,7 @@ -(instancetype) initWithTree: (NSDictionary *) tree{ return self; } --(enum SFGGeometryType) geometryType{ +-(SFGGeometryType) geometryType{ return SFG_POLYGON; } diff --git a/sf-geojson-ios/SFGPosition.m b/sf-geojson-ios/SFGPosition.m index ef0b999..13774e5 100644 --- a/sf-geojson-ios/SFGPosition.m +++ b/sf-geojson-ios/SFGPosition.m @@ -6,7 +6,8 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPosition.h" +#import +@import SimpleFeatures; @implementation SFGPosition diff --git a/sf-geojson-ios/SFGFeature.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeature.h similarity index 94% rename from sf-geojson-ios/SFGFeature.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeature.h index 36ca7d7..7e93ebc 100644 --- a/sf-geojson-ios/SFGFeature.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeature.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeometry.h" +#import /** * Feature type @@ -103,7 +103,7 @@ extern NSString * const SFG_MEMBER_PROPERTIES; * * @return geometry type */ --(enum SFGGeometryType) geometryType; +-(SFGGeometryType) geometryType; @end diff --git a/sf-geojson-ios/SFGFeatureCollection.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureCollection.h similarity index 96% rename from sf-geojson-ios/SFGFeatureCollection.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureCollection.h index fc770de..85f5824 100644 --- a/sf-geojson-ios/SFGFeatureCollection.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureCollection.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGFeature.h" +#import /** * Feature Collection type @@ -133,7 +133,7 @@ extern NSString * const SFG_MEMBER_FEATURES; * * @return geometry type */ --(enum SFGGeometryType) geometryType; +-(SFGGeometryType) geometryType; /** * Get the combined properties from all features diff --git a/sf-geojson-ios/SFGFeatureConverter.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureConverter.h similarity index 95% rename from sf-geojson-ios/SFGFeatureConverter.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureConverter.h index 9115d06..debd9f2 100644 --- a/sf-geojson-ios/SFGFeatureConverter.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGFeatureConverter.h @@ -6,11 +6,11 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGMultiPoint.h" -#import "SFGMultiLineString.h" -#import "SFGMultiPolygon.h" -#import "SFGGeometryCollection.h" -#import "SFGFeatureCollection.h" +#import +#import +#import +#import +#import /** * Feature Converter diff --git a/sf-geojson-ios/SFGGeoJSONObject.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeoJSONObject.h similarity index 98% rename from sf-geojson-ios/SFGGeoJSONObject.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeoJSONObject.h index e14a6ea..08aaab4 100644 --- a/sf-geojson-ios/SFGGeoJSONObject.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeoJSONObject.h @@ -7,7 +7,9 @@ // #import -#import "SFGeometry.h" + +@class SFGeometry; + /** * Type key diff --git a/sf-geojson-ios/SFGGeometry.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometry.h similarity index 88% rename from sf-geojson-ios/SFGGeometry.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometry.h index c066000..896413c 100644 --- a/sf-geojson-ios/SFGGeometry.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometry.h @@ -6,9 +6,11 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeoJSONObject.h" -#import "SFGeometry.h" -#import "SFGGeometryTypes.h" + +#import +#import + +@class SFGeometry; /** * Coordinates key @@ -50,7 +52,7 @@ extern NSString * const SFG_MEMBER_COORDINATES; * * @return geometry type */ --(enum SFGGeometryType) geometryType; +-(SFGGeometryType) geometryType; /** * Get the simple geometry diff --git a/sf-geojson-ios/SFGGeometryCollection.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryCollection.h similarity index 97% rename from sf-geojson-ios/SFGGeometryCollection.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryCollection.h index c535d17..9c6fa74 100644 --- a/sf-geojson-ios/SFGGeometryCollection.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryCollection.h @@ -6,8 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeometry.h" -#import "SFGeometryCollection.h" +#import + +@class SFGeometryCollection; /** * Geometries key diff --git a/sf-geojson-ios/SFGGeometryTypes.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryTypes.h similarity index 75% rename from sf-geojson-ios/SFGGeometryTypes.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryTypes.h index 161e8d8..dcaa7e0 100644 --- a/sf-geojson-ios/SFGGeometryTypes.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGGeometryTypes.h @@ -6,12 +6,15 @@ // Copyright © 2021 NGA. All rights reserved. // -#import "SFGeometryTypes.h" +#import + +// Forward declare enum +typedef NS_ENUM(NSInteger, SFGeometryType); /** * Geometry Type enumeration */ -enum SFGGeometryType{ +typedef NS_ENUM(NSInteger, SFGGeometryType) { SFG_GEOMETRY = 0, SFG_POINT, SFG_LINESTRING, @@ -32,14 +35,14 @@ enum SFGGeometryType{ * * @return type */ --(enum SFGGeometryType) type; +-(SFGGeometryType) type; /** * Get the simple geometry type * * @return simple geometry type */ --(enum SFGeometryType) simpleType; +-(SFGeometryType) simpleType; /** * Get the name @@ -55,7 +58,7 @@ enum SFGGeometryType{ * * @return geometry type */ -+(SFGGeometryTypes *) type: (enum SFGGeometryType) geometryType; ++(SFGGeometryTypes *) type: (SFGGeometryType) geometryType; /** * Get the geometry name @@ -64,7 +67,7 @@ enum SFGGeometryType{ * * @return geometry name */ -+(NSString *) name: (enum SFGGeometryType) geometryType; ++(NSString *) name: (SFGGeometryType) geometryType; /** * Get the geometry type of the name diff --git a/sf-geojson-ios/SFGLineString.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGLineString.h similarity index 95% rename from sf-geojson-ios/SFGLineString.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGLineString.h index 8d240cd..588b1ef 100644 --- a/sf-geojson-ios/SFGLineString.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGLineString.h @@ -6,8 +6,10 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPoint.h" -#import "SFLineString.h" +#import +#import + +@class SFLineString; /** * Line String diff --git a/sf-geojson-ios/SFGMultiLineString.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiLineString.h similarity index 95% rename from sf-geojson-ios/SFGMultiLineString.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiLineString.h index 1b7ea5e..9ee162d 100644 --- a/sf-geojson-ios/SFGMultiLineString.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiLineString.h @@ -6,8 +6,11 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGLineString.h" -#import "SFMultiLineString.h" +#import +#import + +@class SFMultiLineString; + /** * Multi Line String */ diff --git a/sf-geojson-ios/SFGMultiPoint.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPoint.h similarity index 96% rename from sf-geojson-ios/SFGMultiPoint.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPoint.h index 27e50b7..9e2eac2 100644 --- a/sf-geojson-ios/SFGMultiPoint.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPoint.h @@ -6,8 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPoint.h" -#import "SFMultiPoint.h" +#import + +@class SFMultiPoint; /** * Multi Point diff --git a/sf-geojson-ios/SFGMultiPolygon.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPolygon.h similarity index 95% rename from sf-geojson-ios/SFGMultiPolygon.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPolygon.h index 7191231..afd5735 100644 --- a/sf-geojson-ios/SFGMultiPolygon.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGMultiPolygon.h @@ -6,8 +6,10 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGPolygon.h" -#import "SFMultiPolygon.h" +#import +#import + +@class SFMultiPolygon; /** * Multi Polygon diff --git a/sf-geojson-ios/SFGOrderedDictionary.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGOrderedDictionary.h similarity index 100% rename from sf-geojson-ios/SFGOrderedDictionary.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGOrderedDictionary.h diff --git a/sf-geojson-ios/SFGPoint.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPoint.h similarity index 94% rename from sf-geojson-ios/SFGPoint.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPoint.h index a431d1f..54b97a1 100644 --- a/sf-geojson-ios/SFGPoint.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPoint.h @@ -6,8 +6,8 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGGeometry.h" -#import "SFGPosition.h" +#import +#import /** * Point diff --git a/sf-geojson-ios/SFGPolygon.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPolygon.h similarity index 94% rename from sf-geojson-ios/SFGPolygon.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPolygon.h index 16bb696..347cc21 100644 --- a/sf-geojson-ios/SFGPolygon.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPolygon.h @@ -6,8 +6,10 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFGLineString.h" -#import "SFPolygon.h" +#import +#import + +@class SFPolygon; /** * Polygon diff --git a/sf-geojson-ios/SFGPosition.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPosition.h similarity index 99% rename from sf-geojson-ios/SFGPosition.h rename to sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPosition.h index 8a03c57..147c56a 100644 --- a/sf-geojson-ios/SFGPosition.h +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SFGPosition.h @@ -6,7 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // -#import "SFPoint.h" +#import + +@class SFPoint; /** * Position diff --git a/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SimpleFeaturesGeoJSON.h b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SimpleFeaturesGeoJSON.h new file mode 100644 index 0000000..4c4b723 --- /dev/null +++ b/sf-geojson-ios/include/SimpleFeaturesGeoJSON/SimpleFeaturesGeoJSON.h @@ -0,0 +1,28 @@ +// +// sf-geojson-ios.h +// sf-geojson-ios +// +// Created by Brian Osborn on 7/17/19. +// Copyright (c) 2019 NGA. All rights reserved. +// + +#ifndef sf_geojson_ios_sf_geojson_ios_h +#define sf_geojson_ios_sf_geojson_ios_h + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import + +#endif diff --git a/sf-geojson-ios/sf-geojson-ios-Bridging-Header.h b/sf-geojson-ios/sf-geojson-ios-Bridging-Header.h deleted file mode 100644 index 24e4365..0000000 --- a/sf-geojson-ios/sf-geojson-ios-Bridging-Header.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// sf-geojson-ios-Bridging-Header.h -// sf-geojson-ios -// -// Created by Brian Osborn on 7/17/19. -// Copyright © 2019 NGA. All rights reserved. -// - -#ifndef sf_geojson_ios_Bridging_Header_h -#define sf_geojson_ios_Bridging_Header_h - -#import "sf-ios-Bridging-Header.h" -#import "sf_geojson_ios.h" -#import "SFGFeature.h" -#import "SFGFeatureCollection.h" -#import "SFGFeatureConverter.h" -#import "SFGGeoJSONObject.h" -#import "SFGGeometry.h" -#import "SFGGeometryCollection.h" -#import "SFGGeometryTypes.h" -#import "SFGLineString.h" -#import "SFGMultiLineString.h" -#import "SFGMultiPoint.h" -#import "SFGMultiPolygon.h" -#import "SFGOrderedDictionary.h" -#import "SFGPoint.h" -#import "SFGPolygon.h" -#import "SFGPosition.h" - -#endif /* sf_geojson_ios_Bridging_Header_h */ diff --git a/sf-geojson-ios/sf-geojson-ios-Prefix.pch b/sf-geojson-ios/sf-geojson-ios-Prefix.pch deleted file mode 100644 index fbe8d11..0000000 --- a/sf-geojson-ios/sf-geojson-ios-Prefix.pch +++ /dev/null @@ -1,6 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - diff --git a/sf-geojson-ios/sf_geojson_ios.h b/sf-geojson-ios/sf_geojson_ios.h deleted file mode 100644 index fc95eee..0000000 --- a/sf-geojson-ios/sf_geojson_ios.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// sf-geojson-ios.h -// sf-geojson-ios -// -// Created by Brian Osborn on 7/17/19. -// Copyright (c) 2019 NGA. All rights reserved. -// - -#ifndef sf_geojson_ios_sf_geojson_ios_h -#define sf_geojson_ios_sf_geojson_ios_h - - -#endif diff --git a/sf-geojson-ios/sf_geojson_ios.swift b/sf-geojson-ios/sf_geojson_ios.swift deleted file mode 100644 index ba7039c..0000000 --- a/sf-geojson-ios/sf_geojson_ios.swift +++ /dev/null @@ -1,9 +0,0 @@ -// -// sf_geojson_ios.swift -// sf-geojson-ios -// -// Created by Brian Osborn on 10/25/23. -// Copyright © 2023 NGA. All rights reserved. -// - -import Foundation diff --git a/sf-geojson-iosTests/SFGSwiftReadmeTest.swift b/sf-geojson-iosTests-swift/SFGSwiftReadmeTest.swift similarity index 84% rename from sf-geojson-iosTests/SFGSwiftReadmeTest.swift rename to sf-geojson-iosTests-swift/SFGSwiftReadmeTest.swift index cb3e1cc..6cebe2f 100644 --- a/sf-geojson-iosTests/SFGSwiftReadmeTest.swift +++ b/sf-geojson-iosTests-swift/SFGSwiftReadmeTest.swift @@ -7,9 +7,12 @@ // import XCTest +import SimpleFeatures +import SimpleFeaturesGeoJSON +import SimpleFeatureGeoJSONTestHelpers /** -* README example tests +* README.md example tests for sample code */ class SFGSwiftReadmeTest: XCTestCase{ @@ -17,7 +20,7 @@ class SFGSwiftReadmeTest: XCTestCase{ static var TEST_CONTENT: String = "{\"type\":\"Point\",\"coordinates\":[1,1]}" /** - * Test read + * Test read for README.md */ func testRead(){ @@ -28,7 +31,7 @@ class SFGSwiftReadmeTest: XCTestCase{ } /** - * Test read + * Test read for README.md * * @param content * content @@ -46,11 +49,14 @@ class SFGSwiftReadmeTest: XCTestCase{ // let feature: SFGFeature = SFGFeatureConverter.json(toFeature: content) // let featureCollection : SFGFeatureCollection = SFGFeatureConverter.json(toFeatureCollection: content) + // Suppress warnings + print(simpleGeometry) + return geometry; } /** - * Test write + * Test write for README.md */ func testWrite(){ @@ -61,7 +67,7 @@ class SFGSwiftReadmeTest: XCTestCase{ } /** - * Test write + * Test write for README.md * * @param geometry * geometry @@ -81,6 +87,11 @@ class SFGSwiftReadmeTest: XCTestCase{ let contentTree : Dictionary = SFGFeatureConverter.simpleGeometry(toTree: geometry) + // Suppress warnings + print(featureContent) + print(featureCollectionContent) + print(contentTree) + return content; } diff --git a/sf-geojson-iosTests/Info.plist b/sf-geojson-iosTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/sf-geojson-iosTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/sf-geojson-iosTests/SFGFeatureCollectionTestCase.h b/sf-geojson-iosTests/SFGFeatureCollectionTestCase.h index 789e5cd..4c521bd 100644 --- a/sf-geojson-iosTests/SFGFeatureCollectionTestCase.h +++ b/sf-geojson-iosTests/SFGFeatureCollectionTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGFeatureCollectionTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGFeatureCollectionTestCase.m b/sf-geojson-iosTests/SFGFeatureCollectionTestCase.m index ff89b0b..187108b 100644 --- a/sf-geojson-iosTests/SFGFeatureCollectionTestCase.m +++ b/sf-geojson-iosTests/SFGFeatureCollectionTestCase.m @@ -6,9 +6,9 @@ // Copyright © 2019 NGA. All rights reserved. // +@import SimpleFeaturesGeoJSON; #import "SFGFeatureCollectionTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" @implementation SFGFeatureCollectionTestCase @@ -30,10 +30,33 @@ -(void) testDeserializeFeatureCollection{ [self compareFeatureCollection:featureCollection withJSON:json]; } +//- (NSBundle *)bundleForTesting { +// NSBundle *bundle = [[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]]; +// NSBundle *bundle2 = [NSBundle mainBundle] URLForResource:<#(nullable NSString *)#> withExtension:<#(nullable NSString *)#>]// let settingsURL = Bundle.module.url(forResource: "settings", withExtension: "plist") +// +//} +//_resolvedPath NSPathStore2 * @"/Users/paulsolt/Library/Developer/Xcode/DerivedData/simple-features-geojson-ios-dwrimorfnjugdudfluiopcuoleyh/Build/Products/Debug-iphonesimulator/sf-geojson-iosTests.xctest" 0x0000000103611ff0 + +- (NSBundle *)getBundle { +#if SWIFT_PACKAGE + return SWIFTPM_MODULE_BUNDLE; +// return sf_geojson_ios_sf_geojson_iosTests_SWIFTPM_MODULE_BUNDLE(); +#else + return [NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]]; +#endif +} + -(void) testDeserializeFeatureCollection2{ - - NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"fc-points.geojson"]; - NSString *json = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil]; +// NSBundle *bundle = [NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]]; +// NSBundle *bundle = SWIFTPM_MODULE_BUNDLE; + NSString *filePath = [[[self getBundle] resourcePath] stringByAppendingPathComponent:@"fc-points.geojson"]; + +// NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"fc-points.geojson"]; + NSError *error = nil; + NSString *json = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:&error]; + if (error) { + NSLog(@"Error: %@", error); + } SFGGeoJSONObject *objectFromJSON = [SFGFeatureConverter jsonToObject:json]; [SFGTestUtils assertTrue:[objectFromJSON class] == [SFGFeatureCollection class]]; [SFGTestUtils assertEqualWithValue:SFG_TYPE_FEATURE_COLLECTION andValue2:[objectFromJSON type]]; @@ -58,7 +81,7 @@ -(void) testDeserializeFeatureCollection2{ -(void) testDeserializeFeatureCollection3{ - NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"fc-points-altitude.geojson"]; + NSString *filePath = [[[self getBundle] resourcePath] stringByAppendingPathComponent:@"fc-points-altitude.geojson"]; NSString *json = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil]; SFGGeoJSONObject *objectFromJSON = [SFGFeatureConverter jsonToObject:json]; [SFGTestUtils assertTrue:[objectFromJSON class] == [SFGFeatureCollection class]]; @@ -101,7 +124,9 @@ -(void) testDeserializeFeatureCollection3{ -(void) testDeserializeFeatureCollection4{ - NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"gc.geojson"]; + NSString *filePath = [[[self getBundle] resourcePath] stringByAppendingPathComponent:@"gc.geojson"]; +// NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"gc.geojson"]; + NSString *json = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil]; SFGGeoJSONObject *objectFromJSON = [SFGFeatureConverter jsonToObject:json]; [SFGTestUtils assertTrue:[objectFromJSON class] == [SFGFeatureCollection class]]; @@ -138,7 +163,7 @@ -(void) testDeserializeFeatureCollection4{ -(void) testDeserializeFeatureCollection5{ - NSString *filePath = [[[NSBundle bundleForClass:[SFGFeatureCollectionTestCase class]] resourcePath] stringByAppendingPathComponent:@"gc-multiple.geojson"]; + NSString *filePath = [[[self getBundle] resourcePath] stringByAppendingPathComponent:@"gc-multiple.geojson"]; NSString *json = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil]; SFGGeoJSONObject *objectFromJSON = [SFGFeatureConverter jsonToObject:json]; [SFGTestUtils assertTrue:[objectFromJSON class] == [SFGFeatureCollection class]]; diff --git a/sf-geojson-iosTests/SFGFeatureTestCase.h b/sf-geojson-iosTests/SFGFeatureTestCase.h index 0b9c6e7..a96b5ec 100644 --- a/sf-geojson-iosTests/SFGFeatureTestCase.h +++ b/sf-geojson-iosTests/SFGFeatureTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGFeatureTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGFeatureTestCase.m b/sf-geojson-iosTests/SFGFeatureTestCase.m index 44a3441..a24c384 100644 --- a/sf-geojson-iosTests/SFGFeatureTestCase.m +++ b/sf-geojson-iosTests/SFGFeatureTestCase.m @@ -8,7 +8,8 @@ #import "SFGFeatureTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; + @implementation SFGFeatureTestCase diff --git a/sf-geojson-iosTests/SFGGeometryCollectionTestCase.h b/sf-geojson-iosTests/SFGGeometryCollectionTestCase.h index 70279ae..493e88c 100644 --- a/sf-geojson-iosTests/SFGGeometryCollectionTestCase.h +++ b/sf-geojson-iosTests/SFGGeometryCollectionTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGGeometryCollectionTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGGeometryCollectionTestCase.m b/sf-geojson-iosTests/SFGGeometryCollectionTestCase.m index dfd7147..a375dea 100644 --- a/sf-geojson-iosTests/SFGGeometryCollectionTestCase.m +++ b/sf-geojson-iosTests/SFGGeometryCollectionTestCase.m @@ -8,7 +8,7 @@ #import "SFGGeometryCollectionTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; @implementation SFGGeometryCollectionTestCase diff --git a/sf-geojson-iosTests/SFGLineStringTestCase.h b/sf-geojson-iosTests/SFGLineStringTestCase.h index 88ad15b..e5de0dd 100644 --- a/sf-geojson-iosTests/SFGLineStringTestCase.h +++ b/sf-geojson-iosTests/SFGLineStringTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGLineStringTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGLineStringTestCase.m b/sf-geojson-iosTests/SFGLineStringTestCase.m index bb4aab1..7f8fb14 100644 --- a/sf-geojson-iosTests/SFGLineStringTestCase.m +++ b/sf-geojson-iosTests/SFGLineStringTestCase.m @@ -8,7 +8,7 @@ #import "SFGLineStringTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; @implementation SFGLineStringTestCase diff --git a/sf-geojson-iosTests/SFGMultiLineStringTestCase.h b/sf-geojson-iosTests/SFGMultiLineStringTestCase.h index 2e65c8f..f74d7a4 100644 --- a/sf-geojson-iosTests/SFGMultiLineStringTestCase.h +++ b/sf-geojson-iosTests/SFGMultiLineStringTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGMultiLineStringTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGMultiLineStringTestCase.m b/sf-geojson-iosTests/SFGMultiLineStringTestCase.m index d28ec23..371d81b 100644 --- a/sf-geojson-iosTests/SFGMultiLineStringTestCase.m +++ b/sf-geojson-iosTests/SFGMultiLineStringTestCase.m @@ -8,7 +8,7 @@ #import "SFGMultiLineStringTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; static NSString *MULTILINESTRING = @"{\"type\":\"MultiLineString\",\"coordinates\":[[[100,10],[101,1],[101,10]]]}"; static NSString *MULTILINESTRING_WITH_ALT = @"{\"type\":\"MultiLineString\",\"coordinates\":[[[100,10,5],[101,1,10],[101,10,15]]]}"; diff --git a/sf-geojson-iosTests/SFGMultiPointTestCase.h b/sf-geojson-iosTests/SFGMultiPointTestCase.h index c32b89c..6946fbb 100644 --- a/sf-geojson-iosTests/SFGMultiPointTestCase.h +++ b/sf-geojson-iosTests/SFGMultiPointTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGMultiPointTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGMultiPointTestCase.m b/sf-geojson-iosTests/SFGMultiPointTestCase.m index c8bfe44..0a70f4e 100644 --- a/sf-geojson-iosTests/SFGMultiPointTestCase.m +++ b/sf-geojson-iosTests/SFGMultiPointTestCase.m @@ -8,7 +8,7 @@ #import "SFGMultiPointTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; @implementation SFGMultiPointTestCase diff --git a/sf-geojson-iosTests/SFGMultiPolygonTestCase.h b/sf-geojson-iosTests/SFGMultiPolygonTestCase.h index 38b2674..6c209ec 100644 --- a/sf-geojson-iosTests/SFGMultiPolygonTestCase.h +++ b/sf-geojson-iosTests/SFGMultiPolygonTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGMultiPolygonTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGMultiPolygonTestCase.m b/sf-geojson-iosTests/SFGMultiPolygonTestCase.m index 61248c6..7903261 100644 --- a/sf-geojson-iosTests/SFGMultiPolygonTestCase.m +++ b/sf-geojson-iosTests/SFGMultiPolygonTestCase.m @@ -6,10 +6,11 @@ // Copyright © 2019 NGA. All rights reserved. // +@import SimpleFeatures; + #import "SFGMultiPolygonTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" -#import "SFLinearRing.h" +@import SimpleFeaturesGeoJSON; @implementation SFGMultiPolygonTestCase diff --git a/sf-geojson-iosTests/SFGPointTestCase.h b/sf-geojson-iosTests/SFGPointTestCase.h index d5d811b..b31aebe 100644 --- a/sf-geojson-iosTests/SFGPointTestCase.h +++ b/sf-geojson-iosTests/SFGPointTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGPointTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGPointTestCase.m b/sf-geojson-iosTests/SFGPointTestCase.m index 7d440d2..83ec50d 100644 --- a/sf-geojson-iosTests/SFGPointTestCase.m +++ b/sf-geojson-iosTests/SFGPointTestCase.m @@ -8,7 +8,7 @@ #import "SFGPointTestCase.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; @implementation SFGPointTestCase diff --git a/sf-geojson-iosTests/SFGPolygonTestCase.h b/sf-geojson-iosTests/SFGPolygonTestCase.h index a194410..8eca3ac 100644 --- a/sf-geojson-iosTests/SFGPolygonTestCase.h +++ b/sf-geojson-iosTests/SFGPolygonTestCase.h @@ -6,7 +6,7 @@ // Copyright © 2019 NGA. All rights reserved. // -#import +@import XCTest; @interface SFGPolygonTestCase : XCTestCase diff --git a/sf-geojson-iosTests/SFGPolygonTestCase.m b/sf-geojson-iosTests/SFGPolygonTestCase.m index 4af97bf..c3ed130 100644 --- a/sf-geojson-iosTests/SFGPolygonTestCase.m +++ b/sf-geojson-iosTests/SFGPolygonTestCase.m @@ -8,8 +8,8 @@ #import "SFGPolygonTestCase.h" #import "SFGTestUtils.h" -#import "SFLinearRing.h" -#import "SFGFeatureConverter.h" +@import SimpleFeatures; +@import SimpleFeaturesGeoJSON; @implementation SFGPolygonTestCase diff --git a/sf-geojson-iosTests/SFGReadmeTest.h b/sf-geojson-iosTests/SFGReadmeTest.h index 5b747f7..27ea243 100644 --- a/sf-geojson-iosTests/SFGReadmeTest.h +++ b/sf-geojson-iosTests/SFGReadmeTest.h @@ -6,7 +6,7 @@ // Copyright © 2020 NGA. All rights reserved. // -#import +@import XCTest; /** * README example tests diff --git a/sf-geojson-iosTests/SFGReadmeTest.m b/sf-geojson-iosTests/SFGReadmeTest.m index 744b952..3fdfa90 100644 --- a/sf-geojson-iosTests/SFGReadmeTest.m +++ b/sf-geojson-iosTests/SFGReadmeTest.m @@ -8,7 +8,8 @@ #import "SFGReadmeTest.h" #import "SFGTestUtils.h" -#import "SFGFeatureConverter.h" +@import SimpleFeaturesGeoJSON; +@import SimpleFeatureGeoJSONTestHelpers; @implementation SFGReadmeTest diff --git a/sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h b/sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h index 6885665..3e6fedc 100644 --- a/sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h +++ b/sf-geojson-iosTests/sf-geojson-iosTests-Bridging-Header.h @@ -6,6 +6,5 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "sf-geojson-ios-Bridging-Header.h" #import "SFGTestUtils.h" #import "SFGGeometryTestUtils.h"