[annotation] - make options generic, improve basic crud definition on annotation manager

Author: tobrun

app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java

@@ -36,7 +36,7 @@ private void setupAnnotation() {
     Timber.i("Retrieving layer");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       CircleManager circleManager = new CircleManager(mapboxMap);
-      circle = circleManager.createCircle(new CircleOptions().withLatLng(new LatLng()));
+      circle = circleManager.create(new CircleOptions().withLatLng(new LatLng()));
     });
   }
 

app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java

@@ -42,7 +42,7 @@ private void setupAnnotation() {
       innerLatLngs.add(new LatLng(-1,-1));
       List<List<LatLng>>latLngs = new ArrayList<>();
       latLngs.add(innerLatLngs);
-      fill = fillManager.createFill(new FillOptions().withLatLngs(latLngs));
+      fill = fillManager.create(new FillOptions().withLatLngs(latLngs));
     });
   }
 

app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java

@@ -39,7 +39,7 @@ private void setupAnnotation() {
       List<LatLng>latLngs = new ArrayList<>();
       latLngs.add(new LatLng());
       latLngs.add(new LatLng(1,1));
-      line = lineManager.createLine(new LineOptions().withLatLngs(latLngs));
+      line = lineManager.create(new LineOptions().withLatLngs(latLngs));
     });
   }
 

app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java

@@ -36,7 +36,7 @@ private void setupAnnotation() {
     Timber.i("Retrieving layer");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       SymbolManager symbolManager = new SymbolManager(mapboxMap);
-      symbol = symbolManager.createSymbol(new SymbolOptions().withLatLng(new LatLng()));
+      symbol = symbolManager.create(new SymbolOptions().withLatLng(new LatLng()));
     });
   }
 

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java

@@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
         .withLatLng(new LatLng(6.687337, 0.381457))
         .withCircleColor(PropertyFactory.colorToRgbaString(Color.YELLOW))
         .withCircleRadius(12f);
-      circleManager.createCircle(circleOptions);
+      circleManager.create(circleOptions);
 
       // random add circles across the globe
       List<CircleOptions> circleOptionsList = new ArrayList<>();
@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
           .withCircleRadius(8f)
         );
       }
-      circleManager.createCircles(circleOptionsList);
+      circleManager.create(circleOptionsList);
     });
   }
 

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java

@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
       FillOptions fillOptions = new FillOptions()
         .withLatLngs(latLngs)
         .withFillColor(PropertyFactory.colorToRgbaString(Color.RED));
-      fillManager.createFill(fillOptions);
+      fillManager.create(fillOptions);
 
       // random add fills across the globe
       List<FillOptions> fillOptionsList = new ArrayList<>();
@@ -66,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
           .withFillColor(PropertyFactory.colorToRgbaString(color))
         );
       }
-      fillManager.createFills(fillOptionsList);
+      fillManager.create(fillOptionsList);
     });
   }
 

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java

@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
         .withLatLngs(latLngs)
         .withLineColor(PropertyFactory.colorToRgbaString(Color.RED))
         .withLineWidth(5.0f);
-      lineManager.createLine(lineOptions);
+      lineManager.create(lineOptions);
 
       // random add lines across the globe
       List<List<LatLng>> lists = new ArrayList<>();
@@ -66,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
         int color = Color.argb(255, random.nextInt(256), random.nextInt(256), random.nextInt(256));
         lineOptionsList.add(new LineOptions().withLatLngs(list).withLineColor(PropertyFactory.colorToRgbaString(color)));
       }
-      lineManager.createLines(lineOptionsList);
+      lineManager.create(lineOptionsList);
     });
   }
 

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java

@@ -64,14 +64,14 @@ protected void onCreate(Bundle savedInstanceState) {
         .withLatLng(new LatLng(6.687337, 0.381457))
         .withIconImage(MAKI_ICON_AIRPORT)
         .withIconSize(1.3f);
-      symbol = symbolManager.createSymbol(symbolOptions);
+      symbol = symbolManager.create(symbolOptions);
 
       // random add symbols across the globe
       List<SymbolOptions> symbolOptionsList = new ArrayList<>();
       for (int i = 0; i < 20; i++) {
         symbolOptionsList.add(new SymbolOptions().withLatLng(createRandomLatLng()).withIconImage(MAKI_ICON_CAR));
       }
-      symbolManager.createSymbols(symbolOptionsList);
+      symbolManager.create(symbolOptionsList);
     });
   }
 

plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs

@@ -41,20 +41,20 @@ public class <%- camelize(type) %>Test extends BaseActivityTest {
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       <%- camelize(type) %>Manager <%- type %>Manager = new <%- camelize(type) %>Manager(mapboxMap);
 <% if (type === "circle" || type === "symbol") { -%>
-      <%- type %> = <%- type %>Manager.create<%- camelize(type) %>(new <%- camelize(type) %>Options().withLatLng(new LatLng()));
+      <%- type %> = <%- type %>Manager.create(new <%- camelize(type) %>Options().withLatLng(new LatLng()));
 <% } else if (type === "line") { -%>
       List<LatLng>latLngs = new ArrayList<>();
       latLngs.add(new LatLng());
       latLngs.add(new LatLng(1,1));
-      <%- type %> = <%- type %>Manager.create<%- camelize(type) %>(new <%- camelize(type) %>Options().withLatLngs(latLngs));
+      <%- type %> = <%- type %>Manager.create(new <%- camelize(type) %>Options().withLatLngs(latLngs));
 <% } else { -%>
       List<LatLng>innerLatLngs = new ArrayList<>();
       innerLatLngs.add(new LatLng());
       innerLatLngs.add(new LatLng(1,1));
       innerLatLngs.add(new LatLng(-1,-1));
       List<List<LatLng>>latLngs = new ArrayList<>();
       latLngs.add(innerLatLngs);
-      <%- type %> = <%- type %>Manager.create<%- camelize(type) %>(new <%- camelize(type) %>Options().withLatLngs(latLngs));
+      <%- type %> = <%- type %>Manager.create(new <%- camelize(type) %>Options().withLatLngs(latLngs));
 <% } -%>
     });
   }

plugin-annotation/scripts/annotation_manager.java.ejs

@@ -34,7 +34,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
 /**
  * The <%- type %> manager allows to add <%- type %>s to a map.
  */
-public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize(type) %>, On<%- camelize(type) %>ClickListener, On<%- camelize(type) %>LongClickListener> {
+public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize(type) %>, <%- camelize(type) %>Options, On<%- camelize(type) %>ClickListener, On<%- camelize(type) %>LongClickListener> {
 
   public static final String ID_GEOJSON_SOURCE = "mapbox-android-<%- type %>-source";
   public static final String ID_GEOJSON_LAYER = "mapbox-android-<%- type %>-layer";
@@ -116,39 +116,6 @@ public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize
     return <%- camelize(type) %>.ID_KEY;
   }
 
-  /**
-   * Create a <%- type %> on the map from a <%- type %> options.
-   *
-   * @param options the <%- type %> options to add to the map
-   * @return the newly created <%- type %>
-   */
-  @UiThread
-  public <%- camelize(type) %> create<%- camelize(type) %>(@NonNull <%- camelize(type) %>Options options) {
-    <%- camelize(type) %> <%- type %> = options.build(currentId);
-    add(<%- type %>);
-    updateSource();
-    return <%- type %>;
-  }
-
-  /**
-   * Create <%- type %>s on the map from a list of option instances.
-   *
-   * @param options the list of <%- type %> options to add to the map
-   * @return a list of the newly created <%- type %>s
-   */
-  @UiThread
-  public List<<%- camelize(type) %>> create<%- camelize(type) %>s(@NonNull List<<%- camelize(type) %>Options> options) {
-    List<<%- camelize(type) %>> <%- type %>s = new ArrayList<>();
-    <%- camelize(type) %> <%- type %>;
-    for (<%- camelize(type) %>Options option : options) {
-      <%- type %> = option.build(currentId);
-      <%- type %>s.add(<%- type %>);
-      add(<%- type %>);
-    }
-    updateSource();
-    return <%- type %>s;
-  }
-
   private static PropertyValue<?>[] getLayerDefinition() {
     return new PropertyValue[]{
 <% for (const property of properties) { -%>