From b8283e838ecd98003b0580f036e52fab2cf2c3d7 Mon Sep 17 00:00:00 2001 From: Antonio Zugaldia Date: Thu, 9 Mar 2017 12:08:27 -0800 Subject: [PATCH] [android] renames MultiPoint to BasePointCollection --- .../{MultiPoint.java => BasePointCollection.java} | 6 +++--- .../main/java/com/mapbox/mapboxsdk/annotations/Polygon.java | 2 +- .../java/com/mapbox/mapboxsdk/annotations/Polyline.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/{MultiPoint.java => BasePointCollection.java} (90%) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java similarity index 90% rename from platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java index 2bd3c8278..e57821b54 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java @@ -8,12 +8,12 @@ import java.util.List; /** * Multipoint is an abstract annotation for combining geographical locations. */ -public abstract class MultiPoint extends Annotation { +public abstract class BasePointCollection extends Annotation { private List points; private float alpha = 1.0f; - protected MultiPoint() { + protected BasePointCollection() { super(); points = new ArrayList<>(); } @@ -58,7 +58,7 @@ public abstract class MultiPoint extends Annotation { } /** - * Set this {@link MultiPoint}s alpha. + * Set this {@link BasePointCollection}s alpha. * * @param alpha float value between 0 and 1. */ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java index 7b9de86bc..4a72cb7d8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java @@ -7,7 +7,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; /** * Polygon is a geometry annotation that's a closed loop of coordinates. */ -public final class Polygon extends MultiPoint { +public final class Polygon extends BasePointCollection { private int fillColor = Color.BLACK; // default fillColor is black private int strokeColor = Color.BLACK; // default strokeColor is black diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java index a430d1100..6cea29ef8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java @@ -7,7 +7,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; /** * Polyline is a geometry feature with an unclosed list of coordinates drawn as a line */ -public final class Polyline extends MultiPoint { +public final class Polyline extends BasePointCollection { private int color = Color.BLACK; // default color is black private float width = 10; // As specified by Google API Docs (in pixels)