merge fixes

@@ -128,9 +128,6 @@ typedef enum : NSUInteger {
 /** A custom image to use behind the map tiles. The default behavior is to show the default `backgroundView` and not a static image. */
 - (void)setBackgroundImage:(UIImage *)backgroundImage;
 
-/** A custom image to use behind the map tiles. The default behavior is to show the default `backgroundView` and not a static image. */
-- (void)setBackgroundImage:(UIImage *)backgroundImage;
-
 /** A Boolean value indicating whether to draw tile borders and z/x/y numbers on tile images for debugging purposes. Defaults to `NO`. */
 @property (nonatomic, assign) BOOL debugTiles;
 

@@ -98,35 +98,6 @@
 
 #pragma mark -
 
-- (void)setBoundingBoxFromTilesources
-{
-    [_tileSourcesLock lock];
-
-    _latitudeLongitudeBoundingBox = ((RMSphericalTrapezium) {
-        .northEast = {.latitude = 90.0, .longitude = 180.0},
-        .southWest = {.latitude = -90.0, .longitude = -180.0}
-    });
-
-    for (id <RMTileSource>tileSource in _tileSources)
-    {
-        RMSphericalTrapezium newLatitudeLongitudeBoundingBox = [tileSource latitudeLongitudeBoundingBox];
-
-        _latitudeLongitudeBoundingBox = ((RMSphericalTrapezium) {
-            .northEast = {
-                .latitude = MIN(_latitudeLongitudeBoundingBox.northEast.latitude, newLatitudeLongitudeBoundingBox.northEast.latitude),
-                .longitude = MIN(_latitudeLongitudeBoundingBox.northEast.longitude, newLatitudeLongitudeBoundingBox.northEast.longitude)},
-            .southWest = {
-                .latitude = MAX(_latitudeLongitudeBoundingBox.southWest.latitude, newLatitudeLongitudeBoundingBox.southWest.latitude),
-                .longitude = MAX(_latitudeLongitudeBoundingBox.southWest.longitude, newLatitudeLongitudeBoundingBox.southWest.longitude)
-            }
-        });
-    }
-
-    [_tileSourcesLock unlock];
-}
-
-#pragma mark -
-
 - (NSArray *)tileSources
 {
     NSArray *tileSources = nil;