[annotation] - remove self update mechanism

Author: tobrun

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

@@ -109,6 +109,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     } else {
       return super.onOptionsItemSelected(item);
     }
+    symbolManager.update(symbol);
     return true;
   }
 

plugin-annotation/scripts/annotation.java.ejs

@@ -23,45 +23,19 @@ public class <%- camelize(type) %> extends Annotation {
 <% if (type === "symbol") { -%>
   //public static final String Z_INDEX = "z-index";
 <% } -%>
-  private final <%- camelize(type) %>Manager <%- type %>Manager;
-
-  /**
-   * Create a <%- type %>.
-   *
-   * @param manager the <%- type %> manager created and managing the <%- type %>
-   * @param id            the id of the <%- type %>
-   */
-  <%- camelize(type) %>(<%- camelize(type) %>Manager manager, long id) {
-    super(id);
-    this.<%- type %>Manager = manager;
-<% if (type === "symbol") { -%>
-    //this.jsonObject.addProperty(Z_INDEX, 0);
-<% } -%>
-  }
-
   /**
    * Create a <%- type %>.
    *
-   * @param manager the <%- type %> manager created and managing the <%- type %>
    * @param id            the id of the <%- type %>
    * @param jsonObject the features of the annotation
    * @param geometry the geometry of the annotation
    */
-  <%- camelize(type) %>(<%- camelize(type) %>Manager manager, long id, JsonObject jsonObject, Geometry geometry) {
+  <%- camelize(type) %>(long id, JsonObject jsonObject, Geometry geometry) {
     super(id, jsonObject, geometry);
-    this.<%- type %>Manager = manager;
 <% if (type === "symbol") { -%>
     //this.jsonObject.addProperty(Z_INDEX, 0);
 <% } -%>
   }
-
-  /**
-   * Called to update the underlying data source.
-   */
-  @Override
-  public void update() {
-    <%- type %>Manager.updateSource();
-  }
 <% if (type === "circle" || type === "symbol") { -%>
 
   /**
@@ -70,20 +44,7 @@ public class <%- camelize(type) %> extends Annotation {
    * @param latLng the location of the <%- type %> in a longitude and latitude pair
    */
   public void setLatLng(LatLng latLng) {
-    setLatLng(latLng, true);
-  }
-
-  /**
-   * Set the LatLng of the <%- type %>, which represents the location of the <%- type %> on the map
-   *
-   * @param latLng the location of the <%- type %> in a longitude and latitude pair
-   * @param updateSource flag to indicate the source instantly
-   */
-  public void setLatLng(LatLng latLng, boolean updateSource) {
     geometry = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
-    if (updateSource) {
-       <%- type %>Manager.updateSource();
-    }
   }
 <% } else if (type === "line") { -%>
 
@@ -93,24 +54,11 @@ public class <%- camelize(type) %> extends Annotation {
    * @param latLngs a list of the locations of the line in a longitude and latitude pairs
    */
   public void setLatLngs(List<LatLng> latLngs) {
-    setLatLngs(latLngs, true);
-  }
-
-  /**
-   * Set a list of LatLng for the line, which represents the locations of the line on the map
-   *
-   * @param latLngs a list of the locations of the line in a longitude and latitude pairs
-   * @param updateSource flag to indicate the source instantly
-   */
-  public void setLatLngs(List<LatLng> latLngs, boolean updateSource) {
     List<Point>points = new ArrayList<>();
     for (LatLng latLng : latLngs) {
       points.add(Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()));
     }
     geometry = LineString.fromLngLats(points);
-    if (updateSource) {
-      lineManager.updateSource();
-    }
   }
 <% } else { -%>
 
@@ -120,16 +68,6 @@ public class <%- camelize(type) %> extends Annotation {
    * @param latLngs a list of a lists of the locations of the line in a longitude and latitude pairs
    */
   public void setLatLngs(List<List<LatLng>> latLngs) {
-    setLatLngs(latLngs, true);
-  }
-
-  /**
-   * Set a list of lists of LatLng for the fill, which represents the locations of the fill on the map
-   *
-   * @param latLngs a list of a lists of the locations of the line in a longitude and latitude pairs
-   * @param updateSource flag to indicate the source instantly
-   */
-  public void setLatLngs(List<List<LatLng>> latLngs, boolean updateSource) {
     List<List<Point>> points = new ArrayList<>();
     for (List<LatLng> innerLatLngs : latLngs) {
       List<Point>innerList = new ArrayList<>();
@@ -139,9 +77,6 @@ public class <%- camelize(type) %> extends Annotation {
       points.add(innerList);
     }
     geometry = Polygon.fromLngLats(points);
-    if (updateSource) {
-      fillManager.updateSource();
-    }
   }
 <% } -%>
 <% if (type === "symbol") { -%>
@@ -201,7 +136,6 @@ public class <%- camelize(type) %> extends Annotation {
       jsonArray.add(element);
     }
     jsonObject.add("<%-property.name %>", jsonArray);
-    <%- type %>Manager.updateSource();
   }
 
 <% } else { -%>
@@ -221,7 +155,6 @@ public class <%- camelize(type) %> extends Annotation {
    */
   public void set<%- camelize(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyType(property) %> value) {
     jsonObject.addProperty("<%- property.name %>", value);
-    <%- type %>Manager.updateSource();
   }
 
 <% } -%>

plugin-annotation/scripts/annotation_manager.java.ejs

@@ -124,8 +124,9 @@ public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize
    */
   @UiThread
   public <%- camelize(type) %> create<%- camelize(type) %>(@NonNull <%- camelize(type) %>Options options) {
-    <%- camelize(type) %> <%- type %> = options.build(this, currentId);
+    <%- camelize(type) %> <%- type %> = options.build(currentId);
     add(<%- type %>);
+    updateSource();
     return <%- type %>;
   }
 
@@ -140,7 +141,7 @@ public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize
     List<<%- camelize(type) %>> <%- type %>s = new ArrayList<>();
     <%- camelize(type) %> <%- type %>;
     for (<%- camelize(type) %>Options option : options) {
-      <%- type %> = option.build(this, currentId);
+      <%- type %> = option.build(currentId);
       <%- type %>s.add(<%- type %>);
       add(<%- type %>);
     }

plugin-annotation/scripts/annotation_options.java.ejs

@@ -106,7 +106,7 @@ public class <%- camelize(type) %>Options {
   }
 <% } -%>
 
-  <%- camelize(type) %> build(<%- camelize(type) %>Manager <%- type %>Manager, long id) {
+  <%- camelize(type) %> build(long id) {
     if (geometry == null) {
       throw new RuntimeException("geometry field is required");
     }
@@ -120,6 +120,6 @@ public class <%- camelize(type) %>Options {
 <% } -%>
 <% } -%>
 <% } -%>
-    return new <%- camelize(type) %>(<%- type %>Manager, id, jsonObject, geometry);
+    return new <%- camelize(type) %>(id, jsonObject, geometry);
   }
 }

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java

@@ -37,6 +37,4 @@ public long getId() {
   JsonObject getFeature() {
     return jsonObject;
   }
-
-  abstract void update();
 }

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java

@@ -14,6 +14,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Generic AnnotationManager, can be used to create annotation specific managers.
+ *
+ * @param <T> type of annotation
+ * @param <U> type of annotation click listener, depends on generic T
+ * @param <V> type of annotation long click listener, depends on generic T
+ */
 public abstract class AnnotationManager<
   T extends Annotation,
   U extends OnAnnotationClickListener<T>,
@@ -49,20 +56,61 @@ public LongSparseArray<T> getAnnotations() {
     return annotations;
   }
 
+  /**
+   * Adds an annotatiokn to the map.
+   *
+   * @param annotation annotation to be added
+   */
   @UiThread
-  void add(@NonNull T t) {
-    annotations.put(currentId, t);
+  void add(@NonNull T annotation) {
+    annotations.put(annotation.getId(), annotation);
     currentId++;
   }
 
+  /**
+   * Adds annotations to the map.
+   *
+   * @param annotationList list of annotation to be added
+   */
+  @UiThread
+  void add(@NonNull List<T> annotationList) {
+    for (T annotation : annotationList) {
+      annotations.put(annotation.getId(), annotation);
+    }
+  }
+
   /**
    * Delete an annotation from the map.
    *
-   * @param t annotation to be deleted
+   * @param annotation annotation to be deleted
    */
   @UiThread
-  public void delete(T t){
-    annotations.remove(t.getId());
+  public void delete(T annotation) {
+    annotations.remove(annotation.getId());
+    updateSource();
+  }
+
+  /**
+   * Update an annotation on the map.
+   *
+   * @param annotation annotation to be updated
+   */
+  @UiThread
+  public void update(T annotation) {
+    annotations.put(annotation.getId(), annotation);
+    updateSource();
+  }
+
+  /**
+   * Update annotations on the map.
+   *
+   * @param annotationList list of annotation to be updated
+   */
+  @UiThread
+  public void update(List<T> annotationList) {
+    for (T annotation : annotationList) {
+      annotations.put(annotation.getId(), annotation);
+    }
     updateSource();
   }
 
@@ -157,7 +205,7 @@ public void onMapClick(@NonNull LatLng point) {
         return;
       }
 
-      T annotation= queryMapForFeatures(point);
+      T annotation = queryMapForFeatures(point);
       if (annotation != null) {
         for (U clickListener : clickListeners) {
           clickListener.onAnnotationClick(annotation);
@@ -171,7 +219,7 @@ public void onMapLongClick(@NonNull LatLng point) {
         return;
       }
 
-      T annotation= queryMapForFeatures(point);
+      T annotation = queryMapForFeatures(point);
       if (annotation != null) {
         for (V clickListener : longClickListeners) {
           clickListener.onAnnotationLongClick(annotation);