Refill Themes

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "core/src/main/assets/styles/bubble-wrap"]
 	path = core/src/main/assets/styles/bubble-wrap
 	url = https://github.com/tangrams/bubble-wrap.git
-[submodule "core/src/main/assets/styles/refill-more-labels"]
-	path = core/src/main/assets/styles/refill-more-labels
-	url = https://github.com/tangrams/refill-style-more-labels.git
 [submodule "core/src/main/assets/styles/cinnabar-more-labels"]
 	path = core/src/main/assets/styles/cinnabar-more-labels
 	url = https://github.com/tangrams/cinnabar-style-more-labels.git
@@ -16,3 +13,6 @@
 [submodule "samples/mapzen-android-sdk-sample/src/main/assets/styles/tron-style"]
 	path = samples/mapzen-android-sdk-sample/src/main/assets/styles/tron-style
 	url = https://github.com/tangrams/tron-style.git
+[submodule "core/src/main/assets/styles/refill-style"]
+	path = core/src/main/assets/styles/refill-style
+	url = https://github.com/tangrams/refill-style

core/src/main/java/com/mapzen/android/graphics/GraphicsModule.java

@@ -63,4 +63,13 @@
       BitmapMarkerFactory bitmapMarkerFactory, StyleStringGenerator styleStringGenerator) {
     return new BitmapMarkerManager(bitmapMarkerFactory, styleStringGenerator);
   }
+
+  /**
+   * Returns the object used to generate import yaml for use loading
+   * {@link com.mapzen.android.graphics.model.ThemedMapStyle}s.
+   * @return
+   */
+  @Provides @Singleton public ImportYamlGenerator providesImportYamlGenerator() {
+    return new ImportYamlGenerator();
+  }
 }

core/src/main/java/com/mapzen/android/graphics/ImportYamlGenerator.java

@@ -0,0 +1,42 @@
+package com.mapzen.android.graphics;
+
+import com.mapzen.android.graphics.model.ThemeColor;
+import com.mapzen.android.graphics.model.ThemedMapStyle;
+
+/**
+ * Handles creating fully qualified import yaml for a given {@link ThemedMapStyle} so that
+ * it can be applied by {@link MapzenMap}.
+ */
+class ImportYamlGenerator {
+
+  /**
+   * Creates import yaml string for a given theme, label level, detail level, and color.
+   * @param themedMapStyle
+   * @param labelLevel
+   * @return
+   */
+  String getImportYaml(ThemedMapStyle themedMapStyle, int labelLevel, int detailLevel,
+      ThemeColor color) {
+    String labelFileName = new StringBuilder()
+        .append("label-")
+        .append(labelLevel)
+        .append(".yaml")
+        .toString();
+    String detailFileName = new StringBuilder()
+        .append("detail-")
+        .append(detailLevel)
+        .append(".yaml")
+        .toString();
+    String colorFileName = new StringBuilder()
+        .append("color-")
+        .append(color.toString())
+        .append(".yaml")
+        .toString();
+    return "{ import: [ "
+        + themedMapStyle.getBaseStyleFilename() + ", "
+        + themedMapStyle.getThemesPath() + labelFileName + ", "
+        + themedMapStyle.getThemesPath() + detailFileName + ", "
+        + themedMapStyle.getThemesPath() + colorFileName
+        + " ] }";
+  }
+}

core/src/main/java/com/mapzen/android/graphics/MapInitializer.java

@@ -4,6 +4,7 @@
 import com.mapzen.android.graphics.model.BubbleWrapStyle;
 import com.mapzen.android.graphics.model.MapStyle;
 import com.mapzen.android.graphics.model.BitmapMarkerManager;
+import com.mapzen.android.graphics.model.ThemedMapStyle;
 import com.mapzen.tangram.MapController;
 import com.mapzen.tangram.SceneError;
 import com.mapzen.tangram.SceneUpdate;
@@ -36,19 +37,23 @@ public class MapInitializer {
 
   private BitmapMarkerManager bitmapMarkerManager;
 
+  private ImportYamlGenerator yamlGenerator;
+
   /**
    * Creates a new instance.
    */
   @Inject MapInitializer(Context context, MapzenMapHttpHandler mapzenMapHttpHandler,
       MapDataManager mapDataManager, MapStateManager mapStateManager,
-      SceneUpdateManager sceneUpdateManager, BitmapMarkerManager bitmapMarkerManager) {
+      SceneUpdateManager sceneUpdateManager, BitmapMarkerManager bitmapMarkerManager,
+      ImportYamlGenerator yamlGenerator) {
     this.context = context;
     this.mapzenMapHttpHandler = mapzenMapHttpHandler;
     this.mapDataManager = mapDataManager;
     this.mapStateManager = mapStateManager;
     this.sceneUpdateManager = sceneUpdateManager;
     mapReadyInitializer = new MapReadyInitializer();
     this.bitmapMarkerManager = bitmapMarkerManager;
+    this.yamlGenerator = yamlGenerator;
   }
 
   /**
@@ -85,10 +90,11 @@ private void loadMap(final MapView mapView, MapStyle mapStyle, boolean styleExpl
       mapStyle = restoredMapStyle;
     }
     mapStateManager.setMapStyle(mapStyle);
-    loadMap(mapView, mapStyle.getSceneFile(), callback);
+    loadMap(mapView, mapStyle, callback);
   }
 
-  private void loadMap(final MapView mapView, String sceneFile, final OnMapReadyCallback callback) {
+  private void loadMap(final MapView mapView, MapStyle mapStyle,
+      final OnMapReadyCallback callback) {
     final String apiKey = MapzenManager.instance(context).getApiKey();
     final List<SceneUpdate> sceneUpdates = sceneUpdateManager.getUpdatesFor(apiKey, locale,
         mapStateManager.isTransitOverlayEnabled(), mapStateManager.isBikeOverlayEnabled(),
@@ -97,9 +103,16 @@ private void loadMap(final MapView mapView, String sceneFile, final OnMapReadyCa
         new MapController.SceneLoadListener() {
       @Override public void onSceneReady(int sceneId, SceneError sceneError) {
         mapReadyInitializer.onMapReady(mapView, mapzenMapHttpHandler, callback, mapDataManager,
-            mapStateManager, sceneUpdateManager, locale, bitmapMarkerManager);
+            mapStateManager, sceneUpdateManager, locale, bitmapMarkerManager, yamlGenerator);
       }
     });
-    controller.loadSceneFileAsync(sceneFile, sceneUpdates);
+    if (mapStyle instanceof ThemedMapStyle) {
+      ThemedMapStyle themedMapStyle = (ThemedMapStyle) mapStyle;
+      String yaml = yamlGenerator.getImportYaml(themedMapStyle, mapStateManager.getLabelLevel(),
+          mapStateManager.getLod(), mapStateManager.getThemeColor());
+      controller.loadSceneYamlAsync(yaml, themedMapStyle.getStyleRootPath(), sceneUpdates);
+    } else {
+      controller.loadSceneFileAsync(mapStyle.getSceneFile(), sceneUpdates);
+    }
   }
 }

core/src/main/java/com/mapzen/android/graphics/MapReadyInitializer.java

@@ -25,7 +25,7 @@ class MapReadyInitializer {
   void onMapReady(MapView mapView, MapzenMapHttpHandler mapzenMapHttpHandler,
       OnMapReadyCallback callback, MapDataManager mapDataManager, MapStateManager mapStateManager,
       SceneUpdateManager sceneUpdateManager, Locale locale,
-      BitmapMarkerManager bitmapMarkerManager) {
+      BitmapMarkerManager bitmapMarkerManager, ImportYamlGenerator yamlGenerator) {
     MapController mapController = mapView.getTangramMapView().getMap(null);
     mapController.setSceneLoadListener(null);
     mapController.setHttpHandler(mapzenMapHttpHandler.httpHandler());
@@ -34,6 +34,6 @@ void onMapReady(MapView mapView, MapzenMapHttpHandler mapzenMapHttpHandler,
     callback.onMapReady(
         new MapzenMap(mapView, mapController, new OverlayManager(mapView, mapController,
             mapDataManager, mapStateManager), mapStateManager, new LabelPickHandler(mapView),
-            bitmapMarkerManager, sceneUpdateManager, locale, mapzenManager));
+            bitmapMarkerManager, sceneUpdateManager, locale, mapzenManager, yamlGenerator));
   }
 }

core/src/main/java/com/mapzen/android/graphics/MapStateManager.java

@@ -3,6 +3,7 @@
 import com.mapzen.android.graphics.model.BubbleWrapStyle;
 import com.mapzen.android.graphics.model.CameraType;
 import com.mapzen.android.graphics.model.MapStyle;
+import com.mapzen.android.graphics.model.ThemeColor;
 import com.mapzen.tangram.LngLat;
 
 /**
@@ -14,6 +15,9 @@ class MapStateManager {
   private boolean persistMapState = true;
   private LngLat position = new LngLat(0, 0);
   private MapStyle mapStyle = new BubbleWrapStyle();
+  private int labelLevel = 0;
+  private int lod = 0;
+  private ThemeColor themeColor = null;
   private float zoom = 0;
   private float rotation = 0;
   private float tilt = 0;
@@ -46,6 +50,30 @@ public MapStyle getMapStyle() {
     return this.mapStyle;
   }
 
+  public void setLabelLevel(int labelLevel) {
+    this.labelLevel = labelLevel;
+  }
+
+  public int getLabelLevel() {
+    return this.labelLevel;
+  }
+
+  public void setLod(int lod) {
+    this.lod = lod;
+  }
+
+  public int getLod() {
+    return this.lod;
+  }
+
+  public void setThemeColor(ThemeColor color) {
+    this.themeColor = color;
+  }
+
+  public ThemeColor getThemeColor() {
+    return this.themeColor;
+  }
+
   public void setZoom(float zoom) {
     this.zoom = zoom;
   }