porting external PR #836 (#839)

Author: osana

services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/MapboxStaticMap.java

@@ -103,11 +103,11 @@ public HttpUrl url() {
 
     List<String> annotations = new ArrayList<>();
     if (staticMarkerAnnotations() != null) {
-      String[] markerStringArray = new String[staticMarkerAnnotations().size()];
+      List<String> markerStrings = new ArrayList<>(staticMarkerAnnotations().size());
       for (StaticMarkerAnnotation marker : staticMarkerAnnotations()) {
-        markerStringArray[staticMarkerAnnotations().indexOf(marker)] = marker.url();
+        markerStrings.add(marker.url());
       }
-      annotations.addAll(Arrays.asList(markerStringArray));
+      annotations.addAll(markerStrings);
     }
 
     if (staticPolylineAnnotations() != null) {

services-staticmap/src/main/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotation.java

@@ -50,12 +50,12 @@ public String url() {
         Locale.US, "url-%s(%f,%f)", iconUrl(), lnglat().longitude(), lnglat().latitude());
     }
 
-    if (color() != null && label() != null && !TextUtils.isEmpty(label())) {
+    if (color() != null && !TextUtils.isEmpty(label())) {
       url = String.format(Locale.US, "%s-%s+%s", name(), label(), color());
-    } else if (label() != null && !TextUtils.isEmpty(label())) {
+    } else if (!TextUtils.isEmpty(label())) {
       url = String.format(Locale.US, "%s-%s", name(), label());
     } else if (color() != null) {
-      url = String.format(Locale.US, "%s-%s", name(), color());
+      url = String.format(Locale.US, "%s+%s", name(), color());
     } else {
       url = name();
     }

services-staticmap/src/test/java/com/mapbox/api/staticmap/v1/models/StaticMarkerAnnotationTest.java

@@ -63,7 +63,7 @@ public void url_withColorOnlyFormattedCorrectly() throws Exception {
         Color.BLUE.getGreen(),
         Color.BLUE.getBlue())
       .build();
-    assertTrue(staticMarkerAnnotation.url().contains("pin-m-0000FF(1.000000,2.000000)"));
+    assertTrue(staticMarkerAnnotation.url().contains("pin-m+0000FF(1.000000,2.000000)"));
   }
 
   @Test