From 735546309015250fde5397ba5f66e6cef2c70ad8 Mon Sep 17 00:00:00 2001
From: Andrey Novikov <novikov@gmail.com>
Date: Thu, 18 Aug 2016 15:13:35 +0300
Subject: [PATCH] Deprecate base layer, closes #102

---
 vtm/src/org/oscim/map/Map.java | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
index 618f80c0..a360efe2 100644
--- a/vtm/src/org/oscim/map/Map.java
+++ b/vtm/src/org/oscim/map/Map.java
@@ -108,8 +108,6 @@ public abstract class Map implements TaskQueue {
     protected final MapEventLayer mEventLayer;
     protected GestureDetector mGestureDetector;
 
-    private TileLayer mBaseLayer;
-
     protected boolean mClearMap = true;
 
     public Map() {
@@ -161,7 +159,6 @@ public abstract class Map implements TaskQueue {
 
     public TileLayer setBaseMap(TileLayer tileLayer) {
         mLayers.add(1, tileLayer);
-        mBaseLayer = tileLayer;
         return tileLayer;
     }
 
@@ -178,10 +175,6 @@ public abstract class Map implements TaskQueue {
      * to all vector layers and use map background color from theme.
      */
     public void setTheme(ThemeFile theme, boolean allLayers) {
-        if (mBaseLayer == null) {
-            log.error("No base layer set");
-            throw new IllegalStateException();
-        }
         setTheme(ThemeLoader.load(theme), allLayers);
     }
 
@@ -194,19 +187,19 @@ public abstract class Map implements TaskQueue {
             throw new IllegalArgumentException("Theme cannot be null.");
         }
 
-        if (mBaseLayer == null) {
-            log.warn("No base layer set.");
-        } else if (mBaseLayer instanceof VectorTileLayer) {
-            ((VectorTileLayer) mBaseLayer).setRenderTheme(theme);
-        }
-
-        if (allLayers) {
-            for (Layer layer : mLayers) {
-                if (layer instanceof VectorTileLayer) {
-                    ((VectorTileLayer) layer).setRenderTheme(theme);
-                }
+        boolean themeSet = false;
+        for (Layer layer : mLayers) {
+            if (layer instanceof VectorTileLayer) {
+                ((VectorTileLayer) layer).setRenderTheme(theme);
+                themeSet = true;
+                if (!allLayers)
+                    break;
             }
         }
+        if (!themeSet) {
+            log.error("No vector layers set");
+            throw new IllegalStateException();
+        }
 
         MapRenderer.setBackgroundColor(theme.getMapBackground());