Update Stylesheets (#465)

* migrate all styles to use themed repos

* fix tests and temporarily comment out two

* tmp deploy sdk for this branch

* update style switcher example

* deploy samples temporarily

* disable location in sample on destroy

* tangram 0.8.1

* refill default lod 10

* autoselect theme defaults when style switched

* yaml generator cleanup

* update zinc lod default

* update test

* https for submodules

* fix MapInitializerTests

* add test coverage for themes

* rm tmp circle branch deployment

* deprecate zinc style

* rm log

Author: sarahsnow1

.gitmodules

@@ -1,18 +1,15 @@
 [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/cinnabar-more-labels"]
-	path = core/src/main/assets/styles/cinnabar-more-labels
-	url = https://github.com/tangrams/cinnabar-style-more-labels.git
-[submodule "core/src/main/assets/styles/walkabout-style-more-labels"]
-	path = core/src/main/assets/styles/walkabout-style-more-labels
-	url = https://github.com/tangrams/walkabout-style-more-labels.git
-[submodule "core/src/main/assets/styles/zinc-style-more-labels"]
-	path = core/src/main/assets/styles/zinc-style-more-labels
-	url = https://github.com/tangrams/zinc-style-more-labels.git
 [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
+[submodule "core/src/main/assets/styles/cinnabar-style"]
+	path = core/src/main/assets/styles/cinnabar-style
+	url = https://github.com/tangrams/cinnabar-style.git
+[submodule "core/src/main/assets/styles/walkabout-style"]
+	path = core/src/main/assets/styles/walkabout-style
+	url = https://github.com/tangrams/walkabout-style.git

core/build.gradle

@@ -19,7 +19,7 @@ group = GROUP
 version = VERSION_NAME
 project.archivesBaseName = POM_ARTIFACT_ID
 
-ext.tangram_version = "0.8.0"
+ext.tangram_version = "0.8.1"
 
 def SDK_VERSION = hasProperty('version') ? '"' + version + '"' : "null";
 
@@ -64,7 +64,7 @@ task checkstyle(type: Checkstyle) {
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
 task submodules {
-  def folder = new File( 'core/src/main/assets/styles/walkabout-style-more-labels/walkabout-style-more-labels.yaml' )
+  def folder = new File( 'core/src/main/assets/styles/walkabout-style/walkabout-style.yaml' )
   if(!folder.exists()) {
     throw new GradleException("Submodules aren't present, please run:\n`git submodule init`, " +
         "\n`git submodule update`\nfrom your root directory")

core/src/main/assets/styles/bubble-wrap

@@ -3,6 +3,8 @@
 import com.mapzen.android.graphics.model.ThemeColor;
 import com.mapzen.android.graphics.model.ThemedMapStyle;
 
+import static com.mapzen.android.graphics.model.ThemedMapStyle.NONE;
+
 /**
  * Handles creating fully qualified import yaml for a given {@link ThemedMapStyle} so that
  * it can be applied by {@link MapzenMap}.
@@ -17,26 +19,45 @@ class ImportYamlGenerator {
    */
   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
-        + " ] }";
+    StringBuilder importBuilder = new StringBuilder()
+        .append("{ import: [ ")
+        .append(themedMapStyle.getBaseStyleFilename())
+        .append(", ");
+
+    if (labelLevel != NONE) {
+      importBuilder.append(themedMapStyle.getThemesPath());
+      importBuilder.append("label-");
+      importBuilder.append(labelLevel);
+      importBuilder.append(".yaml");
+    }
+
+    if (labelLevel != NONE && (detailLevel != NONE || colorExists(color))) {
+      importBuilder.append(", ");
+    }
+
+    if (detailLevel != NONE) {
+      importBuilder.append(themedMapStyle.getThemesPath());
+      importBuilder.append("detail-");
+      importBuilder.append(detailLevel);
+      importBuilder.append(".yaml");
+    }
+
+    if (detailLevel != NONE && colorExists(color)) {
+      importBuilder.append(", ");
+    }
+
+    if (colorExists(color)) {
+      importBuilder.append(themedMapStyle.getThemesPath());
+      importBuilder.append("color-");
+      importBuilder.append(color.toString());
+      importBuilder.append(".yaml");
+    }
+
+    importBuilder.append(" ] }");
+    return importBuilder.toString();
+  }
+
+  private boolean colorExists(ThemeColor color) {
+    return color != null && color != ThemeColor.NONE;
   }
 }