Skip to content

Commit

Permalink
Merge pull request #11 from ngageoint/develop
Browse files Browse the repository at this point in the history 
Develop to Master, 1.1.1 changes
  • Loading branch information
@bosborn
bosborn committed Nov 20, 2015
2 parents 12591b1 + 6dbcea3 commit 3057deb
Show file tree
Hide file tree
Showing 47 changed files with 1,553 additions and 34 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ Adheres to [Semantic Versioning](http://semver.org/).

---

## 1.1.1 (TBD)
## [1.1.1] (https://github.com/ngageoint/geopackage-ios/releases/tag/1.1.1) (11-20-2015)

* Feature Overlay Query message builder, check if features are indexed first
* TBD
* Data Columns Dao get data column by table and column names method - [Issue #4](https://github.com/ngageoint/geopackage-ios/issues/4)
* Additional GeoPackage createFeatureTableWithMetadata methods - [Issue #8](https://github.com/ngageoint/geopackage-ios/issues/8)
* min and max column query methods - [Issue #5](https://github.com/ngageoint/geopackage-ios/issues/5)
* Determine bounding box from Tile Grid methods - [Issue #7](https://github.com/ngageoint/geopackage-ios/issues/7)
* TileDao methods, query for tile grid or bounding box at zoom level - [Issue #6](https://github.com/ngageoint/geopackage-ios/issues/6)
* Database header and integrity validation options and methods. Validate externally linked GeoPackage headers by default. - [Issue #9](https://github.com/ngageoint/geopackage-ios/issues/9)
* User Table column ordering fix when created user table columns are not presorted by column index - [Issue #10](https://github.com/ngageoint/geopackage-ios/issues/10)

## [1.1.0](https://github.com/ngageoint/geopackage-ios/releases/tag/1.1.0) (11-04-2015)

Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pod 'proj4', '~> 4.8'
pod 'wkb-ios', '~> 1.0'

target :"geopackage-iosTests", :exclusive => true do
pod 'geopackage-ios', :path => '.'
podspec :path => './geopackage-ios.podspec'
end
10 changes: 8 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,13 @@ Build this repository using Xcode and/or CocoaPods:

pod install

Open geopackage-ios.xcworkspace in Xcode
Open geopackage-ios.xcworkspace in Xcode or build from command line:

xcodebuild -workspace 'geopackage-ios.xcworkspace' -scheme geopackage-ios build

Run tests from Xcode or from command line:

xcodebuild test -workspace 'geopackage-ios.xcworkspace' -scheme geopackage-ios -destination 'platform=iOS Simulator,name=iPhone 6s'

### Include Library ###

Expand All @@ -135,7 +141,7 @@ Pull from [CocoaPods](https://cocoapods.org/pods/geopackage-ios):
Pull from GitHub:

pod 'geopackage-ios', :git => 'https://github.com/ngageoint/geopackage-ios.git', :branch => 'master'
pod 'geopackage-ios', :git => 'https://github.com/ngageoint/geopackage-ios.git', :tag => '1.1.0'
pod 'geopackage-ios', :git => 'https://github.com/ngageoint/geopackage-ios.git', :tag => '1.1.1'

Include as local project:

Expand Down
2 changes: 1 addition & 1 deletion geopackage-ios.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pod::Spec.new do |s|
s.license = {:type => 'MIT', :file => 'LICENSE' }
s.summary = 'iOS SDK for GeoPackage'
s.homepage = 'https://github.com/ngageoint/geopackage-ios'
s.authors = { 'NGA' => '', 'Brian Osborn' => '[email protected]' }
s.authors = { 'NGA' => '', 'BIT Systems' => '', 'Brian Osborn' => '[email protected]' }
s.social_media_url = 'https://twitter.com/NGA_GEOINT'
s.source = { :git => 'https://github.com/ngageoint/geopackage-ios.git', :tag => s.version }
s.requires_arc = true
Expand Down
88 changes: 88 additions & 0 deletions geopackage-ios.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@
042FC8F91B964F6100549A4B /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 042FC8F71B964E6900549A4B /* libsqlite3.dylib */; };
0431EDEE1BE8F9BB0067FF36 /* GPGKGeoPackageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0431EDEC1BE8F9BB0067FF36 /* GPGKGeoPackageCache.h */; settings = {ASSET_TAGS = (); }; };
0431EDEF1BE8F9BB0067FF36 /* GPGKGeoPackageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0431EDED1BE8F9BB0067FF36 /* GPGKGeoPackageCache.m */; settings = {ASSET_TAGS = (); }; };
045BC9FB1BFA6EE00080B967 /* GPKGCreateTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BC9FA1BFA6EE00080B967 /* GPKGCreateTestCase.m */; settings = {ASSET_TAGS = (); }; };
045BC9FE1BFA6F8E0080B967 /* GPKGImportTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BC9FD1BFA6F8E0080B967 /* GPKGImportTestCase.m */; settings = {ASSET_TAGS = (); }; };
045BCA011BFA73C40080B967 /* GPKGManagerTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BCA001BFA73C40080B967 /* GPKGManagerTestCase.m */; settings = {ASSET_TAGS = (); }; };
045BCA041BFA8FA50080B967 /* GPKGGeoPackageTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BCA031BFA8FA50080B967 /* GPKGGeoPackageTestUtils.m */; settings = {ASSET_TAGS = (); }; };
045BCA081BFB6E220080B967 /* GPKGTileCreateTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BCA071BFB6E220080B967 /* GPKGTileCreateTestCase.m */; settings = {ASSET_TAGS = (); }; };
045BCA0B1BFB6E4A0080B967 /* GPKGTileImportTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BCA0A1BFB6E4A0080B967 /* GPKGTileImportTestCase.m */; settings = {ASSET_TAGS = (); }; };
045BCA0E1BFB6E850080B967 /* GPKGTileTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 045BCA0D1BFB6E850080B967 /* GPKGTileTestUtils.m */; settings = {ASSET_TAGS = (); }; };
046417C01BCBF282007624D4 /* GPKGNGAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 046417BE1BCBF282007624D4 /* GPKGNGAExtensions.h */; settings = {ASSET_TAGS = (); }; };
046417C11BCBF282007624D4 /* GPKGNGAExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 046417BF1BCBF282007624D4 /* GPKGNGAExtensions.m */; settings = {ASSET_TAGS = (); }; };
046417C51BCBF355007624D4 /* GPKGFeatureTableIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 046417C31BCBF355007624D4 /* GPKGFeatureTableIndex.h */; settings = {ASSET_TAGS = (); }; };
Expand Down Expand Up @@ -288,6 +295,7 @@
04DD10B01BDFB16D00CC59A0 /* GPKGConnectionPoolTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 04DD10AF1BDFB16D00CC59A0 /* GPKGConnectionPoolTestCase.m */; settings = {ASSET_TAGS = (); }; };
6903C385D41142932E5D29BE /* libPods-geopackage-iosTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D78F4C4CF43FBF5289DCCD3 /* libPods-geopackage-iosTests.a */; };
B16EA3BC364185079F6FC3EA /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FA26FA59BD87DC4A9A30A36 /* libPods.a */; };
F7882C471BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F7882C461BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.m */; settings = {ASSET_TAGS = (); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -551,6 +559,20 @@
042FC8F71B964E6900549A4B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
0431EDEC1BE8F9BB0067FF36 /* GPGKGeoPackageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPGKGeoPackageCache.h; sourceTree = "<group>"; };
0431EDED1BE8F9BB0067FF36 /* GPGKGeoPackageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPGKGeoPackageCache.m; sourceTree = "<group>"; };
045BC9F91BFA6EE00080B967 /* GPKGCreateTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGCreateTestCase.h; sourceTree = "<group>"; };
045BC9FA1BFA6EE00080B967 /* GPKGCreateTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGCreateTestCase.m; sourceTree = "<group>"; };
045BC9FC1BFA6F8E0080B967 /* GPKGImportTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGImportTestCase.h; sourceTree = "<group>"; };
045BC9FD1BFA6F8E0080B967 /* GPKGImportTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGImportTestCase.m; sourceTree = "<group>"; };
045BC9FF1BFA73C40080B967 /* GPKGManagerTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGManagerTestCase.h; sourceTree = "<group>"; };
045BCA001BFA73C40080B967 /* GPKGManagerTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGManagerTestCase.m; sourceTree = "<group>"; };
045BCA021BFA8FA50080B967 /* GPKGGeoPackageTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGGeoPackageTestUtils.h; sourceTree = "<group>"; };
045BCA031BFA8FA50080B967 /* GPKGGeoPackageTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGGeoPackageTestUtils.m; sourceTree = "<group>"; };
045BCA061BFB6E220080B967 /* GPKGTileCreateTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGTileCreateTestCase.h; sourceTree = "<group>"; };
045BCA071BFB6E220080B967 /* GPKGTileCreateTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGTileCreateTestCase.m; sourceTree = "<group>"; };
045BCA091BFB6E4A0080B967 /* GPKGTileImportTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGTileImportTestCase.h; sourceTree = "<group>"; };
045BCA0A1BFB6E4A0080B967 /* GPKGTileImportTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGTileImportTestCase.m; sourceTree = "<group>"; };
045BCA0C1BFB6E850080B967 /* GPKGTileTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGTileTestUtils.h; sourceTree = "<group>"; };
045BCA0D1BFB6E850080B967 /* GPKGTileTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGTileTestUtils.m; sourceTree = "<group>"; };
046417BE1BCBF282007624D4 /* GPKGNGAExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGNGAExtensions.h; sourceTree = "<group>"; };
046417BF1BCBF282007624D4 /* GPKGNGAExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGNGAExtensions.m; sourceTree = "<group>"; };
046417C31BCBF355007624D4 /* GPKGFeatureTableIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGFeatureTableIndex.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -608,6 +630,8 @@
9A6D855F8340B3698EA6418C /* Pods-geopackage-iosTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-geopackage-iosTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-geopackage-iosTests/Pods-geopackage-iosTests.release.xcconfig"; sourceTree = "<group>"; };
CB0B2D43B57C53B91B15E6F4 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
ED7BD96C5C8B5744CA3F89CF /* Pods-geopackage-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-geopackage-iosTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-geopackage-iosTests/Pods-geopackage-iosTests.debug.xcconfig"; sourceTree = "<group>"; };
F7882C451BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPKGDataColumnsDaoTest.h; sourceTree = "<group>"; };
F7882C461BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPKGDataColumnsDaoTest.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -703,6 +727,7 @@
042FC6EF1B964BC800549A4B /* geopackage-iosTests */ = {
isa = PBXGroup;
children = (
F7882C431BF146A900DC6BB0 /* schema */,
0480CD111BD6DC0600094009 /* features */,
048EC1721BD54F58008426A7 /* extension */,
048EC16E1BD54BDB008426A7 /* io */,
Expand All @@ -728,6 +753,14 @@
042FC8E21B964DA200549A4B /* tile.png */,
042FC8E31B964DA200549A4B /* tiles */,
042FC6F01B964BC800549A4B /* Supporting Files */,
045BC9F91BFA6EE00080B967 /* GPKGCreateTestCase.h */,
045BC9FA1BFA6EE00080B967 /* GPKGCreateTestCase.m */,
045BC9FC1BFA6F8E0080B967 /* GPKGImportTestCase.h */,
045BC9FD1BFA6F8E0080B967 /* GPKGImportTestCase.m */,
045BC9FF1BFA73C40080B967 /* GPKGManagerTestCase.h */,
045BCA001BFA73C40080B967 /* GPKGManagerTestCase.m */,
045BCA021BFA8FA50080B967 /* GPKGGeoPackageTestUtils.h */,
045BCA031BFA8FA50080B967 /* GPKGGeoPackageTestUtils.m */,
);
path = "geopackage-iosTests";
sourceTree = "<group>";
Expand Down Expand Up @@ -1203,6 +1236,7 @@
042FC8E31B964DA200549A4B /* tiles */ = {
isa = PBXGroup;
children = (
045BCA051BFB6D6C0080B967 /* user */,
042FC8E41B964DA200549A4B /* features */,
);
path = tiles;
Expand All @@ -1217,6 +1251,19 @@
path = features;
sourceTree = "<group>";
};
045BCA051BFB6D6C0080B967 /* user */ = {
isa = PBXGroup;
children = (
045BCA061BFB6E220080B967 /* GPKGTileCreateTestCase.h */,
045BCA071BFB6E220080B967 /* GPKGTileCreateTestCase.m */,
045BCA091BFB6E4A0080B967 /* GPKGTileImportTestCase.h */,
045BCA0A1BFB6E4A0080B967 /* GPKGTileImportTestCase.m */,
045BCA0C1BFB6E850080B967 /* GPKGTileTestUtils.h */,
045BCA0D1BFB6E850080B967 /* GPKGTileTestUtils.m */,
);
path = user;
sourceTree = "<group>";
};
046417C21BCBF2BC007624D4 /* index */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1354,6 +1401,23 @@
name = Pods;
sourceTree = "<group>";
};
F7882C431BF146A900DC6BB0 /* schema */ = {
isa = PBXGroup;
children = (
F7882C441BF146BA00DC6BB0 /* columns */,
);
path = schema;
sourceTree = "<group>";
};
F7882C441BF146BA00DC6BB0 /* columns */ = {
isa = PBXGroup;
children = (
F7882C451BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.h */,
F7882C461BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.m */,
);
path = columns;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -1524,6 +1588,7 @@
042FC6E81B964BC800549A4B /* Frameworks */,
042FC6E91B964BC800549A4B /* Resources */,
C0A452B14E727E90113AC7AA /* Copy Pods Resources */,
8E30385523A94FE7C8B884D4 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -1625,6 +1690,21 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
8E30385523A94FE7C8B884D4 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-geopackage-iosTests/Pods-geopackage-iosTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
C0A452B14E727E90113AC7AA /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1793,20 +1873,28 @@
048EC1791BD5503B008426A7 /* GPKGFeatureTableIndexImportTest.m in Sources */,
0480CD181BD6DC9400094009 /* GPKGFeatureIndexManagerImportTest.m in Sources */,
042FC8F01B964DA200549A4B /* GPKGTestConstants.m in Sources */,
045BC9FE1BFA6F8E0080B967 /* GPKGImportTestCase.m in Sources */,
042FC8F11B964DA200549A4B /* GPKGTestSetupTeardown.m in Sources */,
042FC8ED1B964DA200549A4B /* GPKGCreateGeoPackageTestCase.m in Sources */,
042FC8F21B964DA200549A4B /* GPKGTestUtils.m in Sources */,
04DD10B01BDFB16D00CC59A0 /* GPKGConnectionPoolTestCase.m in Sources */,
045BCA081BFB6E220080B967 /* GPKGTileCreateTestCase.m in Sources */,
045BCA011BFA73C40080B967 /* GPKGManagerTestCase.m in Sources */,
045BCA0E1BFB6E850080B967 /* GPKGTileTestUtils.m in Sources */,
0480CD151BD6DC6900094009 /* GPKGFeatureIndexManagerCreateTest.m in Sources */,
042FC8EC1B964DA200549A4B /* GPKGBaseTestCase.m in Sources */,
F7882C471BF1472700DC6BB0 /* GPKGDataColumnsDaoTest.m in Sources */,
042FC8EB1B964DA200549A4B /* GPKGGeoPackageGeometryDataUtils.m in Sources */,
042FC8E71B964DA200549A4B /* GPKGFeatureIndexerTest.m in Sources */,
045BCA0B1BFB6E4A0080B967 /* GPKGTileImportTestCase.m in Sources */,
048EC1761BD54FD4008426A7 /* GPKGFeatureTableIndexCreateTest.m in Sources */,
048EC1711BD54C6D008426A7 /* GPKGTestGeoPackageProgress.m in Sources */,
042FC8EA1B964DA200549A4B /* GPKGGeoPackageGeometryDataImportTest.m in Sources */,
042FC8F61B964DA200549A4B /* GPKGFeatureTileUtils.m in Sources */,
045BCA041BFA8FA50080B967 /* GPKGGeoPackageTestUtils.m in Sources */,
0480CD1B1BD6DD0100094009 /* GPKGFeatureIndexManagerUtils.m in Sources */,
042FC8EF1B964DA200549A4B /* GPKGImportGeoPackageTestCase.m in Sources */,
045BC9FB1BFA6EE00080B967 /* GPKGCreateTestCase.m in Sources */,
048EC17C1BD550AE008426A7 /* GPKGFeatureTableIndexUtils.m in Sources */,
042FC8E91B964DA200549A4B /* GPKGGeoPackageGeometryDataCreateTest.m in Sources */,
042FC8EE1B964DA200549A4B /* GPKGGeoPackageTestCase.m in Sources */,
Expand Down
Loading

0 comments on commit 3057deb

Please sign in to comment.