[annotation] - add geojson compatible api

Author: tobrun

plugin-annotation/scripts/annotation.java.ejs

@@ -88,6 +88,46 @@ public class <%- camelize(type) %> extends Annotation {
     geometry = Polygon.fromLngLats(points);
   }
 <% } -%>
+<% if (type === "circle" || type === "symbol") { -%>
+
+  /**
+   * Set the Geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   * <p>
+   * To update the <%- type %> on the map use {@link <%- camelize(type) %>Manager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the <%- type %>
+   */
+  public void setGeometry(Point geometry) {
+    this.geometry = geometry;
+  }
+<% } else if (type === "line") { -%>
+
+  /**
+   * Set the Geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   * <p>
+   * To update the <%- type %> on the map use {@link <%- camelize(type) %>Manager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the <%- type %>
+   */
+  public void setGeometry(LineString geometry) {
+    this.geometry = geometry;
+  }
+<% } else { -%>
+
+  /**
+   * Set the Geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   * <p>
+   * To update the <%- type %> on the map use {@link <%- camelize(type) %>Manager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the <%- type %>
+   */
+  public void setGeometry(Polygon geometry) {
+    this.geometry = geometry;
+  }
+<% } -%>
 <% if (type === "symbol") { -%>
 
   ///**

plugin-annotation/scripts/annotation_options.java.ejs

@@ -66,6 +66,17 @@ public class <%- camelize(type) %>Options extends Options<<%- camelize(type) %>>
     geometry = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
     return this;
   }
+
+  /**
+   * Set the geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   *
+   * @param geometry the location of the <%- type %>
+   * @return this
+   */
+  public <%- camelize(type) %>Options withGeometry(Point geometry) {
+    this.geometry = geometry;
+    return this;
+  }
 <% } else if (type === "line") { -%>
 
   /**
@@ -82,6 +93,17 @@ public class <%- camelize(type) %>Options extends Options<<%- camelize(type) %>>
     geometry = LineString.fromLngLats(points);
     return this;
   }
+
+  /**
+   * Set the geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   *
+   * @param geometry the location of the <%- type %>
+   * @return this
+   */
+  public <%- camelize(type) %>Options withGeometry(LineString geometry) {
+    this.geometry = geometry;
+    return this;
+  }
 <% } else { -%>
 
   /**
@@ -102,6 +124,17 @@ public class <%- camelize(type) %>Options extends Options<<%- camelize(type) %>>
     geometry = Polygon.fromLngLats(points);
     return this;
   }
+
+  /**
+   * Set the geometry of the <%- type %>, which represents the location of the <%- type %> on the map
+   *
+   * @param geometry the location of the <%- type %>
+   * @return this
+   */
+  public <%- camelize(type) %>Options withGeometry(Polygon geometry) {
+    this.geometry = geometry;
+    return this;
+  }
 <% } -%>
 
   @Override

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

@@ -38,6 +38,18 @@ public void setLatLng(LatLng latLng) {
     geometry = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
   }
 
+  /**
+   * Set the Geometry of the circle, which represents the location of the circle on the map
+   * <p>
+   * To update the circle on the map use {@link CircleManager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the circle
+   */
+  public void setGeometry(Point geometry) {
+    this.geometry = geometry;
+  }
+
   // Property accessors
   /**
    * Get the CircleRadius property

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

@@ -179,6 +179,17 @@ public CircleOptions withLatLng(LatLng latLng) {
     return this;
   }
 
+  /**
+   * Set the geometry of the circle, which represents the location of the circle on the map
+   *
+   * @param geometry the location of the circle
+   * @return this
+   */
+  public CircleOptions withGeometry(Point geometry) {
+    this.geometry = geometry;
+    return this;
+  }
+
   @Override
   Circle build(long id) {
     if (geometry == null) {

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

@@ -46,6 +46,18 @@ public void setLatLngs(List<List<LatLng>> latLngs) {
     geometry = Polygon.fromLngLats(points);
   }
 
+  /**
+   * Set the Geometry of the fill, which represents the location of the fill on the map
+   * <p>
+   * To update the fill on the map use {@link FillManager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the fill
+   */
+  public void setGeometry(Polygon geometry) {
+    this.geometry = geometry;
+  }
+
   // Property accessors
   /**
    * Get the FillOpacity property

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

@@ -124,6 +124,17 @@ public FillOptions withLatLngs(List<List<LatLng>> latLngs) {
     return this;
   }
 
+  /**
+   * Set the geometry of the fill, which represents the location of the fill on the map
+   *
+   * @param geometry the location of the fill
+   * @return this
+   */
+  public FillOptions withGeometry(Polygon geometry) {
+    this.geometry = geometry;
+    return this;
+  }
+
   @Override
   Fill build(long id) {
     if (geometry == null) {

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

@@ -42,6 +42,18 @@ public void setLatLngs(List<LatLng> latLngs) {
     geometry = LineString.fromLngLats(points);
   }
 
+  /**
+   * Set the Geometry of the line, which represents the location of the line on the map
+   * <p>
+   * To update the line on the map use {@link LineManager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the line
+   */
+  public void setGeometry(LineString geometry) {
+    this.geometry = geometry;
+  }
+
   // Property accessors
   /**
    * Get the LineJoin property

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

@@ -204,6 +204,17 @@ public LineOptions withLatLngs(List<LatLng> latLngs) {
     return this;
   }
 
+  /**
+   * Set the geometry of the line, which represents the location of the line on the map
+   *
+   * @param geometry the location of the line
+   * @return this
+   */
+  public LineOptions withGeometry(LineString geometry) {
+    this.geometry = geometry;
+    return this;
+  }
+
   @Override
   Line build(long id) {
     if (geometry == null) {

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

@@ -40,6 +40,18 @@ public void setLatLng(LatLng latLng) {
     geometry = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
   }
 
+  /**
+   * Set the Geometry of the symbol, which represents the location of the symbol on the map
+   * <p>
+   * To update the symbol on the map use {@link SymbolManager#update(Annotation)}.
+   * <p>
+   *
+   * @param geometry the geometry of the symbol
+   */
+  public void setGeometry(Point geometry) {
+    this.geometry = geometry;
+  }
+
   ///**
   // * Set the z-index of a symbol.
   // * <p>

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

@@ -557,6 +557,17 @@ public SymbolOptions withLatLng(LatLng latLng) {
     return this;
   }
 
+  /**
+   * Set the geometry of the symbol, which represents the location of the symbol on the map
+   *
+   * @param geometry the location of the symbol
+   * @return this
+   */
+  public SymbolOptions withGeometry(Point geometry) {
+    this.geometry = geometry;
+    return this;
+  }
+
   @Override
   Symbol build(long id) {
     if (geometry == null) {