diff --git a/MapView/Map/FMDB b/MapView/Map/FMDB
index 0cfca84..e052477 160000
--- a/MapView/Map/FMDB
+++ b/MapView/Map/FMDB
@@ -1 +1 @@
-Subproject commit 0cfca849943c6d109934c9d708d0942a8708cb99
+Subproject commit e052477dc8953f51b56994b754b1c8a10bfe7262
diff --git a/MapView/Map/RMDBMapSource.m b/MapView/Map/RMDBMapSource.m
index 627df99..2ba869b 100644
--- a/MapView/Map/RMDBMapSource.m
+++ b/MapView/Map/RMDBMapSource.m
@@ -72,8 +72,7 @@
#import "RMTileImage.h"
#import "RMTileCache.h"
#import "RMFractalTileProjection.h"
-#import "FMDatabase.h"
-#import "FMDatabaseQueue.h"
+#import "FMDB.h"
#pragma mark --- begin constants ----
diff --git a/MapView/Map/RMDatabaseCache.m b/MapView/Map/RMDatabaseCache.m
index 2f263f7..1b8c9e7 100644
--- a/MapView/Map/RMDatabaseCache.m
+++ b/MapView/Map/RMDatabaseCache.m
@@ -26,8 +26,7 @@
// POSSIBILITY OF SUCH DAMAGE.
#import "RMDatabaseCache.h"
-#import "FMDatabase.h"
-#import "FMDatabaseQueue.h"
+#import "FMDB.h"
#import "RMTileImage.h"
#import "RMTile.h"
diff --git a/MapView/Map/RMInteractiveSource.m b/MapView/Map/RMInteractiveSource.m
index 3abcb71..9749b68 100644
--- a/MapView/Map/RMInteractiveSource.m
+++ b/MapView/Map/RMInteractiveSource.m
@@ -35,8 +35,7 @@
#import "RMConfiguration.h"
-#import "FMDatabase.h"
-#import "FMDatabaseQueue.h"
+#import "FMDB.h"
#import "GRMustache.h"
diff --git a/MapView/Map/RMMBTilesSource.m b/MapView/Map/RMMBTilesSource.m
index 127b544..89bacdf 100644
--- a/MapView/Map/RMMBTilesSource.m
+++ b/MapView/Map/RMMBTilesSource.m
@@ -36,8 +36,7 @@
#import "RMProjection.h"
#import "RMFractalTileProjection.h"
-#import "FMDatabase.h"
-#import "FMDatabaseQueue.h"
+#import "FMDB.h"
@implementation RMMBTilesSource
{
diff --git a/MapView/MapView.xcodeproj/project.pbxproj b/MapView/MapView.xcodeproj/project.pbxproj
index 7cba0d4..000988b 100755
--- a/MapView/MapView.xcodeproj/project.pbxproj
+++ b/MapView/MapView.xcodeproj/project.pbxproj
@@ -94,16 +94,6 @@
DD1E3C6E161F954F004FC649 /* SMCalloutView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD1E3C6C161F954F004FC649 /* SMCalloutView.h */; };
DD1E3C6F161F954F004FC649 /* SMCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD1E3C6D161F954F004FC649 /* SMCalloutView.m */; };
DD280D1416EFDDD30014B549 /* examples.map-z2effxa8.json in Resources */ = {isa = PBXBuildFile; fileRef = DD280D1216EFDDD30014B549 /* examples.map-z2effxa8.json */; };
- DD2B374514CF8041008DE8CB /* FMDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B373F14CF8041008DE8CB /* FMDatabase.h */; };
- DD2B374614CF8041008DE8CB /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B374014CF8041008DE8CB /* FMDatabase.m */; };
- DD2B374714CF8041008DE8CB /* FMDatabaseAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B374114CF8041008DE8CB /* FMDatabaseAdditions.h */; };
- DD2B374814CF8041008DE8CB /* FMDatabaseAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B374214CF8041008DE8CB /* FMDatabaseAdditions.m */; };
- DD2B374914CF8041008DE8CB /* FMResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B374314CF8041008DE8CB /* FMResultSet.h */; };
- DD2B374A14CF8041008DE8CB /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B374414CF8041008DE8CB /* FMResultSet.m */; };
- DD2B374F14CF814F008DE8CB /* FMDatabasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B374B14CF814F008DE8CB /* FMDatabasePool.h */; };
- DD2B375014CF814F008DE8CB /* FMDatabasePool.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B374C14CF814F008DE8CB /* FMDatabasePool.m */; };
- DD2B375114CF814F008DE8CB /* FMDatabaseQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B374D14CF814F008DE8CB /* FMDatabaseQueue.h */; };
- DD2B375214CF814F008DE8CB /* FMDatabaseQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B374E14CF814F008DE8CB /* FMDatabaseQueue.m */; };
DD2B375514CF8197008DE8CB /* RMMBTilesSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2B375314CF8197008DE8CB /* RMMBTilesSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD2B375614CF8197008DE8CB /* RMMBTilesSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B375414CF8197008DE8CB /* RMMBTilesSource.m */; };
DD36766B17D94F980001F27B /* mapbox-logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD36766A17D94F980001F27B /* mapbox-logo@2x.png */; };
@@ -114,6 +104,17 @@
DD41960116250ED40049E6BA /* RMTileCacheDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD41960216250ED40049E6BA /* RMTileCacheDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */; };
DD4BE198161CE296003EF677 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4BE197161CE296003EF677 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DD56B94F1961E23F00706C67 /* FMDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B9441961E23F00706C67 /* FMDatabase.h */; };
+ DD56B9501961E23F00706C67 /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = DD56B9451961E23F00706C67 /* FMDatabase.m */; };
+ DD56B9511961E23F00706C67 /* FMDatabaseAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B9461961E23F00706C67 /* FMDatabaseAdditions.h */; };
+ DD56B9521961E23F00706C67 /* FMDatabaseAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DD56B9471961E23F00706C67 /* FMDatabaseAdditions.m */; };
+ DD56B9531961E23F00706C67 /* FMDatabasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B9481961E23F00706C67 /* FMDatabasePool.h */; };
+ DD56B9541961E23F00706C67 /* FMDatabasePool.m in Sources */ = {isa = PBXBuildFile; fileRef = DD56B9491961E23F00706C67 /* FMDatabasePool.m */; };
+ DD56B9551961E23F00706C67 /* FMDatabaseQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B94A1961E23F00706C67 /* FMDatabaseQueue.h */; };
+ DD56B9561961E23F00706C67 /* FMDatabaseQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = DD56B94B1961E23F00706C67 /* FMDatabaseQueue.m */; };
+ DD56B9571961E23F00706C67 /* FMDB.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B94C1961E23F00706C67 /* FMDB.h */; };
+ DD56B9581961E23F00706C67 /* FMResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = DD56B94D1961E23F00706C67 /* FMResultSet.h */; };
+ DD56B9591961E23F00706C67 /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = DD56B94E1961E23F00706C67 /* FMResultSet.m */; };
DD5F5F9518C7C03C0085DE98 /* SMClassicCalloutView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD5F5F9318C7C03C0085DE98 /* SMClassicCalloutView.h */; };
DD5F5F9618C7C03C0085DE98 /* SMClassicCalloutView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD5F5F9418C7C03C0085DE98 /* SMClassicCalloutView.m */; };
DD5FA1EB15E2B020004EB6C5 /* RMLoadingTileView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -277,16 +278,6 @@
DD1E3C6C161F954F004FC649 /* SMCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SMCalloutView.h; path = SMCalloutView/SMCalloutView.h; sourceTree = "<group>"; };
DD1E3C6D161F954F004FC649 /* SMCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SMCalloutView.m; path = SMCalloutView/SMCalloutView.m; sourceTree = "<group>"; };
DD280D1216EFDDD30014B549 /* examples.map-z2effxa8.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "examples.map-z2effxa8.json"; path = "Map/Resources/examples.map-z2effxa8.json"; sourceTree = "<group>"; };
- DD2B373F14CF8041008DE8CB /* FMDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMDatabase.h; sourceTree = "<group>"; };
- DD2B374014CF8041008DE8CB /* FMDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMDatabase.m; sourceTree = "<group>"; };
- DD2B374114CF8041008DE8CB /* FMDatabaseAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMDatabaseAdditions.h; sourceTree = "<group>"; };
- DD2B374214CF8041008DE8CB /* FMDatabaseAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMDatabaseAdditions.m; sourceTree = "<group>"; };
- DD2B374314CF8041008DE8CB /* FMResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMResultSet.h; sourceTree = "<group>"; };
- DD2B374414CF8041008DE8CB /* FMResultSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMResultSet.m; sourceTree = "<group>"; };
- DD2B374B14CF814F008DE8CB /* FMDatabasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMDatabasePool.h; sourceTree = "<group>"; };
- DD2B374C14CF814F008DE8CB /* FMDatabasePool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMDatabasePool.m; sourceTree = "<group>"; };
- DD2B374D14CF814F008DE8CB /* FMDatabaseQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FMDatabaseQueue.h; sourceTree = "<group>"; };
- DD2B374E14CF814F008DE8CB /* FMDatabaseQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FMDatabaseQueue.m; sourceTree = "<group>"; };
DD2B375314CF8197008DE8CB /* RMMBTilesSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMBTilesSource.h; sourceTree = "<group>"; };
DD2B375414CF8197008DE8CB /* RMMBTilesSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMBTilesSource.m; sourceTree = "<group>"; };
DD36766A17D94F980001F27B /* mapbox-logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mapbox-logo@2x.png"; path = "Map/Resources/mapbox-logo@2x.png"; sourceTree = "<group>"; };
@@ -297,6 +288,17 @@
DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMTileCacheDownloadOperation.h; sourceTree = "<group>"; };
DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileCacheDownloadOperation.m; sourceTree = "<group>"; };
DD4BE197161CE296003EF677 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mapbox.h; sourceTree = "<group>"; };
+ DD56B9441961E23F00706C67 /* FMDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabase.h; path = fmdb/FMDatabase.h; sourceTree = "<group>"; };
+ DD56B9451961E23F00706C67 /* FMDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabase.m; path = fmdb/FMDatabase.m; sourceTree = "<group>"; };
+ DD56B9461961E23F00706C67 /* FMDatabaseAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabaseAdditions.h; path = fmdb/FMDatabaseAdditions.h; sourceTree = "<group>"; };
+ DD56B9471961E23F00706C67 /* FMDatabaseAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabaseAdditions.m; path = fmdb/FMDatabaseAdditions.m; sourceTree = "<group>"; };
+ DD56B9481961E23F00706C67 /* FMDatabasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabasePool.h; path = fmdb/FMDatabasePool.h; sourceTree = "<group>"; };
+ DD56B9491961E23F00706C67 /* FMDatabasePool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabasePool.m; path = fmdb/FMDatabasePool.m; sourceTree = "<group>"; };
+ DD56B94A1961E23F00706C67 /* FMDatabaseQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabaseQueue.h; path = fmdb/FMDatabaseQueue.h; sourceTree = "<group>"; };
+ DD56B94B1961E23F00706C67 /* FMDatabaseQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabaseQueue.m; path = fmdb/FMDatabaseQueue.m; sourceTree = "<group>"; };
+ DD56B94C1961E23F00706C67 /* FMDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDB.h; path = fmdb/FMDB.h; sourceTree = "<group>"; };
+ DD56B94D1961E23F00706C67 /* FMResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMResultSet.h; path = fmdb/FMResultSet.h; sourceTree = "<group>"; };
+ DD56B94E1961E23F00706C67 /* FMResultSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMResultSet.m; path = fmdb/FMResultSet.m; sourceTree = "<group>"; };
DD5F5F9318C7C03C0085DE98 /* SMClassicCalloutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SMClassicCalloutView.h; path = SMCalloutView/SMClassicCalloutView.h; sourceTree = "<group>"; };
DD5F5F9418C7C03C0085DE98 /* SMClassicCalloutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SMClassicCalloutView.m; path = SMCalloutView/SMClassicCalloutView.m; sourceTree = "<group>"; };
DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLoadingTileView.h; sourceTree = "<group>"; };
@@ -521,16 +523,17 @@
B8474B8C0EB40094006A0BC1 /* FMDB */ = {
isa = PBXGroup;
children = (
- DD2B373F14CF8041008DE8CB /* FMDatabase.h */,
- DD2B374014CF8041008DE8CB /* FMDatabase.m */,
- DD2B374114CF8041008DE8CB /* FMDatabaseAdditions.h */,
- DD2B374214CF8041008DE8CB /* FMDatabaseAdditions.m */,
- DD2B374314CF8041008DE8CB /* FMResultSet.h */,
- DD2B374414CF8041008DE8CB /* FMResultSet.m */,
- DD2B374B14CF814F008DE8CB /* FMDatabasePool.h */,
- DD2B374C14CF814F008DE8CB /* FMDatabasePool.m */,
- DD2B374D14CF814F008DE8CB /* FMDatabaseQueue.h */,
- DD2B374E14CF814F008DE8CB /* FMDatabaseQueue.m */,
+ DD56B9441961E23F00706C67 /* FMDatabase.h */,
+ DD56B9451961E23F00706C67 /* FMDatabase.m */,
+ DD56B9461961E23F00706C67 /* FMDatabaseAdditions.h */,
+ DD56B9471961E23F00706C67 /* FMDatabaseAdditions.m */,
+ DD56B9481961E23F00706C67 /* FMDatabasePool.h */,
+ DD56B9491961E23F00706C67 /* FMDatabasePool.m */,
+ DD56B94A1961E23F00706C67 /* FMDatabaseQueue.h */,
+ DD56B94B1961E23F00706C67 /* FMDatabaseQueue.m */,
+ DD56B94C1961E23F00706C67 /* FMDB.h */,
+ DD56B94D1961E23F00706C67 /* FMResultSet.h */,
+ DD56B94E1961E23F00706C67 /* FMResultSet.m */,
);
name = FMDB;
path = Map/FMDB/src;
@@ -740,18 +743,22 @@
B8C974230E8A19B2007D16AD /* RMTileCache.h in Headers */,
B8C9742B0E8A19B2007D16AD /* RMMemoryCache.h in Headers */,
B8C9742F0E8A19B2007D16AD /* RMMapLayer.h in Headers */,
+ DD56B9511961E23F00706C67 /* FMDatabaseAdditions.h in Headers */,
B8C974620E8A19E8007D16AD /* RMTileSource.h in Headers */,
B8C9746B0E8A1A50007D16AD /* RMMapView.h in Headers */,
B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */,
B8474BA40EB40094006A0BC1 /* RMDatabaseCache.h in Headers */,
B8800FF20EC3A239003E9CDD /* RMMapViewDelegate.h in Headers */,
B8800FF30EC3A23D003E9CDD /* RMConfiguration.h in Headers */,
+ DD56B94F1961E23F00706C67 /* FMDatabase.h in Headers */,
25757F4F1291C8640083D504 /* RMCircle.h in Headers */,
16EC85D2133CA6C300219947 /* RMAbstractMercatorTileSource.h in Headers */,
16EC85D4133CA6C300219947 /* RMAbstractWebMapSource.h in Headers */,
+ DD56B9581961E23F00706C67 /* FMResultSet.h in Headers */,
16EC85D6133CA6C300219947 /* RMCacheObject.h in Headers */,
160EEDAF13D41DEC007C5501 /* RMAnnotation.h in Headers */,
DD2B375514CF8197008DE8CB /* RMMBTilesSource.h in Headers */,
+ DD56B9551961E23F00706C67 /* FMDatabaseQueue.h in Headers */,
DD98B6FA14D76B930092882F /* RMMapboxSource.h in Headers */,
1607499514E120A100D535F5 /* RMGenericMapSource.h in Headers */,
DDC4BED5152E3BD700089409 /* RMInteractiveSource.h in Headers */,
@@ -788,16 +795,13 @@
DD3BEF7915913C55007892D8 /* RMAttributionViewController.h in Headers */,
16F3581B15864135003A3AD9 /* RMMapScrollView.h in Headers */,
16FBF07615936BF1004ECAD1 /* RMTileSourcesContainer.h in Headers */,
+ DD56B9531961E23F00706C67 /* FMDatabasePool.h in Headers */,
161E563A1594664E00B00BB6 /* RMOpenSeaMapLayer.h in Headers */,
1656665515A1DF7900EF3DC7 /* RMCoordinateGridSource.h in Headers */,
DD5FA1EB15E2B020004EB6C5 /* RMLoadingTileView.h in Headers */,
DD41960116250ED40049E6BA /* RMTileCacheDownloadOperation.h in Headers */,
DD4195C9162356900049E6BA /* RMBingSource.h in Headers */,
- DD2B374514CF8041008DE8CB /* FMDatabase.h in Headers */,
- DD2B374714CF8041008DE8CB /* FMDatabaseAdditions.h in Headers */,
- DD2B374914CF8041008DE8CB /* FMResultSet.h in Headers */,
- DD2B374F14CF814F008DE8CB /* FMDatabasePool.h in Headers */,
- DD2B375114CF814F008DE8CB /* FMDatabaseQueue.h in Headers */,
+ DD56B9571961E23F00706C67 /* FMDB.h in Headers */,
DD1E3C6E161F954F004FC649 /* SMCalloutView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -926,6 +930,7 @@
B8C974410E8A19B2007D16AD /* RMOpenStreetMapSource.m in Sources */,
B8C974420E8A19B2007D16AD /* RMMemoryCache.m in Sources */,
B8C974430E8A19B2007D16AD /* RMPixel.c in Sources */,
+ DD56B9541961E23F00706C67 /* FMDatabasePool.m in Sources */,
B8C974440E8A19B2007D16AD /* RMFractalTileProjection.m in Sources */,
B8C974480E8A19B2007D16AD /* RMTileCache.m in Sources */,
DD63176417D15EB5008CA79B /* RMCircleAnnotation.m in Sources */,
@@ -947,13 +952,9 @@
16FAB66513E03D55002F4E1C /* RMQuadTree.m in Sources */,
160E535813FBDB48004F82F9 /* RMMapTiledLayerView.m in Sources */,
1609AF8F14068B09008344B7 /* RMMapOverlayView.m in Sources */,
+ DD56B9561961E23F00706C67 /* FMDatabaseQueue.m in Sources */,
16128CF6148D295300C23C0E /* RMOpenSeaMapSource.m in Sources */,
- DD2B374614CF8041008DE8CB /* FMDatabase.m in Sources */,
- DD2B374814CF8041008DE8CB /* FMDatabaseAdditions.m in Sources */,
DD63176017D1506D008CA79B /* RMGreatCircleAnnotation.m in Sources */,
- DD2B374A14CF8041008DE8CB /* FMResultSet.m in Sources */,
- DD2B375014CF814F008DE8CB /* FMDatabasePool.m in Sources */,
- DD2B375214CF814F008DE8CB /* FMDatabaseQueue.m in Sources */,
DD2B375614CF8197008DE8CB /* RMMBTilesSource.m in Sources */,
DD98B6FB14D76B930092882F /* RMMapboxSource.m in Sources */,
DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */,
@@ -968,7 +969,9 @@
16FBF07715936BF1004ECAD1 /* RMTileSourcesContainer.m in Sources */,
161E563B1594664E00B00BB6 /* RMOpenSeaMapLayer.m in Sources */,
1656665615A1DF7900EF3DC7 /* RMCoordinateGridSource.m in Sources */,
+ DD56B9501961E23F00706C67 /* FMDatabase.m in Sources */,
16E5A63B15E531F200C92A5A /* RMCompositeSource.m in Sources */,
+ DD56B9591961E23F00706C67 /* FMResultSet.m in Sources */,
DD5FA1EC15E2B020004EB6C5 /* RMLoadingTileView.m in Sources */,
DD41960216250ED40049E6BA /* RMTileCacheDownloadOperation.m in Sources */,
DD4195CA162356900049E6BA /* RMBingSource.m in Sources */,
@@ -979,6 +982,7 @@
DDE357F516522661001DB842 /* RMPolylineAnnotation.m in Sources */,
DDE357F916522CD8001DB842 /* RMPolygonAnnotation.m in Sources */,
DD1985C2165C5F6400DF667F /* RMTileMillSource.m in Sources */,
+ DD56B9521961E23F00706C67 /* FMDatabaseAdditions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};