diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src')
73 files changed, 5629 insertions, 856 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml index 0307d462c8..c848e61e6c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ package="com.mapbox.mapboxsdk"> <uses-feature android:glEsVersion="0x00020000" android:required="true" /> + <uses-feature android:name="android.hardware.wifi" android:required="false" /> <!-- Implied by ACCESS_WIFI_STATE. --> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java index 211590653a..8f2597c60a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java @@ -2,8 +2,10 @@ package com.mapbox.mapboxsdk; import android.content.Context; import android.text.TextUtils; + import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException; +import com.mapbox.mapboxsdk.exceptions.MapboxAccountManagerNotStartedException; import com.mapbox.mapboxsdk.telemetry.MapboxEventManager; public class MapboxAccountManager { @@ -16,8 +18,9 @@ public class MapboxAccountManager { /** * MapboxAccountManager should NOT be instantiated directly. * Use @see MapboxAccountManager#getInstance() instead. + * * @param applicationContext Context used to get ApplicationContext - * @param accessToken Mapbox Access Token + * @param accessToken Mapbox Access Token */ private MapboxAccountManager(Context applicationContext, String accessToken) { super(); @@ -29,7 +32,7 @@ public class MapboxAccountManager { * Primary entry point to Mapbox for implementing developers. * Must be configured in either Application.onCreate() or Launch Activity.onCreate() * - * @param context Context used to get Application Context + * @param context Context used to get Application Context * @param accessToken Mapbox Access Token. You can get one on the Mapbox Web site. * @return MapboxAccountManager instance for app */ @@ -49,11 +52,16 @@ public class MapboxAccountManager { * @return MapboxAccountManager instance for app. May be NULL if not configured yet. */ public static MapboxAccountManager getInstance() { + if (mapboxAccountManager == null) { + throw new MapboxAccountManagerNotStartedException(); + } + return mapboxAccountManager; } /** * Access Token for this application + * * @return Mapbox Access Token */ public String getAccessToken() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java index 36d56591c8..3c4868c84b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java @@ -23,6 +23,7 @@ public abstract class Annotation implements Comparable<Annotation> { */ private long id = -1; // -1 unless added to a MapView protected MapboxMap mapboxMap; + protected MapView mapView; protected Annotation() { } @@ -68,6 +69,22 @@ public abstract class Annotation implements Comparable<Annotation> { return mapboxMap; } + /** + * Don not use this method. Used internally by the SDK. + */ + public void setMapView(MapView mapView) { + this.mapView = mapView; + } + + /** + * Gets the associated MapView + * + * @return The MapView + */ + protected MapView getMapView() { + return mapView; + } + @Override public int compareTo(@NonNull Annotation annotation) { if (id < annotation.getId()) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java index fc2022f9e1..3adeb52ea7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerOptions.java @@ -39,6 +39,22 @@ public abstract class BaseMarkerOptions<U extends Marker, T extends BaseMarkerOp return getThis(); } + public T setIcon(Icon icon) { + return icon(icon); + } + + public T setPosition(LatLng position) { + return position(position); + } + + public T setSnippet(String snippet) { + return snippet(snippet); + } + + public T setTitle(String title) { + return title(title); + } + public abstract T getThis(); public abstract U getMarker(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java index 0cd54fc0f0..a5c6397b6f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java @@ -1,7 +1,7 @@ package com.mapbox.mapboxsdk.annotations; import android.os.Parcelable; -import android.support.annotation.AnimatorRes; +import android.support.annotation.FloatRange; import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -26,10 +26,10 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base protected float anchorV = 1f; protected float infoWindowAnchorU = 0.5f; protected float infoWindowAnchorV = 0.0f; - protected int selectAnimRes; - protected int deselectAnimRes; - protected int rotation; + protected float rotation; protected boolean visible = true; + protected boolean selected; + protected float alpha = 1.0f; /** * Default constructor @@ -99,7 +99,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base * @param v the v-value * @return the object for which the method was called */ - public T anchor(float u, float v) { + public T anchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) { this.anchorU = u; this.anchorV = v; return getThis(); @@ -112,53 +112,42 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base * @param v the v-values * @return the object for which the method was called */ - public T infoWindowAnchor(float u, float v) { + public T infoWindowAnchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) { this.infoWindowAnchorU = u; this.infoWindowAnchorV = v; return getThis(); } /** - * Set the animator resource to be used when an MarkerView is selected. + * Set the rotation of the MarkerView. * - * @param selectAnimRes the used animator resource + * @param rotation the rotation value * @return the object for which the method was called */ - public T selectAnimatorResource(@AnimatorRes int selectAnimRes) { - this.selectAnimRes = selectAnimRes; + public T rotation(float rotation) { + this.rotation = rotation; return getThis(); } /** - * Set the animator resource to be used when an MarkerView is deselected. + * Set the visibility state of the MarkerView. * - * @param deselectAnimRes the used animator resource + * @param visible the visible state * @return the object for which the method was called */ - public T deselectAnimatorResource(@AnimatorRes int deselectAnimRes) { - this.deselectAnimRes = deselectAnimRes; + public T visible(boolean visible) { + this.visible = visible; return getThis(); } /** - * Set the rotation of the MarkerView. + * Set the alpha of the MarkerView. * - * @param rotation the rotation value + * @param alpha the alpha value * @return the object for which the method was called */ - public T rotation(int rotation) { - this.rotation = rotation; - return getThis(); - } - - /** - * Set the visibility state of the MarkerView. - * - * @param visible the visible state - * @return the object for which the method was calleds - */ - public T visible(boolean visible) { - this.visible = visible; + public T alpha(float alpha) { + this.alpha = alpha; return getThis(); } @@ -244,29 +233,11 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base } /** - * Get the animator resource used for selecting the MarkerView. - * - * @return the animator resource - */ - public int getSelectAnimRes() { - return selectAnimRes; - } - - /** - * Get the animator resource used for deselecting the MarkerView. - * - * @return the animator resource - */ - public int getDeselectAnimRes() { - return deselectAnimRes; - } - - /** * Get the rotation of the MarkerView. * * @return the rotation value */ - public int getRotation() { + public float getRotation() { return rotation; } @@ -280,6 +251,15 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base } /** + * Get the alpha of the MarkerView. + * + * @return the alpha value + */ + public float getAlpha() { + return alpha; + } + + /** * Get the instance of the object for which this method was called. * * @return the object for which the this method was called diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java index d7d41b98be..93c6deddc9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java @@ -33,6 +33,7 @@ public final class IconFactory { private Context mContext; private static IconFactory sInstance; private Icon mDefaultMarker; + private Icon mDefaultMarkerView; private BitmapFactory.Options mOptions; private int mNextId = 0; @@ -121,6 +122,13 @@ public final class IconFactory { return mDefaultMarker; } + public Icon defaultMarkerView() { + if (mDefaultMarkerView == null) { + mDefaultMarkerView = fromResource(R.drawable.default_markerview); + } + return mDefaultMarkerView; + } + private Icon fromInputStream(@NonNull InputStream is) { Bitmap bitmap = BitmapFactory.decodeStream(is, null, mOptions); return fromBitmap(bitmap); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java index 7452ab8fac..9af459e8a0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.annotations; import android.content.res.Resources; import android.graphics.PointF; import android.support.annotation.LayoutRes; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -222,9 +223,22 @@ public class InfoWindow { } mMapboxMap = new WeakReference<>(mapboxMap); String title = overlayItem.getTitle(); - ((TextView) view.findViewById(R.id.infowindow_title)).setText(title); + TextView titleTextView = ((TextView) view.findViewById(R.id.infowindow_title)); + if (!TextUtils.isEmpty(title)) { + titleTextView.setText(title); + titleTextView.setVisibility(View.VISIBLE); + } else { + titleTextView.setVisibility(View.GONE); + } + String snippet = overlayItem.getSnippet(); - ((TextView) view.findViewById(R.id.infowindow_description)).setText(snippet); + TextView snippetTextView = ((TextView) view.findViewById(R.id.infowindow_description)); + if (!TextUtils.isEmpty(snippet)) { + snippetTextView.setText(snippet); + snippetTextView.setVisibility(View.VISIBLE); + } else { + snippetTextView.setVisibility(View.GONE); + } } InfoWindow setBoundMarker(Marker boundMarker) { @@ -245,11 +259,20 @@ public class InfoWindow { View view = mView.get(); if (mapboxMap != null && marker != null && view != null) { mCoordinates = mapboxMap.getProjection().toScreenLocation(marker.getPosition()); - view.setX(mCoordinates.x + mViewWidthOffset - mMarkerWidthOffset); + + if (view instanceof InfoWindowView) { + view.setX(mCoordinates.x + mViewWidthOffset - mMarkerWidthOffset); + } else { + view.setX(mCoordinates.x - (view.getMeasuredWidth() / 2) - mMarkerWidthOffset); + } view.setY(mCoordinates.y + mMarkerHeightOffset); } } + public View getView() { + return mView != null ? mView.get() : null; + } + boolean isVisible() { return mIsVisible; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 16b219684f..d24f020a18 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -3,7 +3,6 @@ package com.mapbox.mapboxsdk.annotations; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; - import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; @@ -91,8 +90,9 @@ public class Marker extends Annotation { } } - void setSnippet(String snippet) { + public void setSnippet(String snippet) { this.snippet = snippet; + refreshInfoWindowContent(); } /** @@ -112,8 +112,30 @@ public class Marker extends Annotation { return icon; } - void setTitle(String title) { + public void setTitle(String title) { this.title = title; + refreshInfoWindowContent(); + } + + @Nullable + public InfoWindow getInfoWindow() { + return infoWindow; + } + + /** + * Update only for default Marker's InfoWindow content for Title and Snippet + */ + private void refreshInfoWindowContent() { + if (isInfoWindowShown() && mapView != null && mapboxMap != null && mapboxMap.getInfoWindowAdapter() == null) { + InfoWindow infoWindow = getInfoWindow(mapView); + if (mapView.getContext() != null) { + infoWindow.adaptDefaultMarker(this, mapboxMap, mapView); + } + MapboxMap map = getMapboxMap(); + if (map != null) { + map.updateMarker(this); + } + } } /** @@ -121,6 +143,7 @@ public class Marker extends Annotation { */ public InfoWindow showInfoWindow(@NonNull MapboxMap mapboxMap, @NonNull MapView mapView) { setMapboxMap(mapboxMap); + setMapView(mapView); MapboxMap.InfoWindowAdapter infoWindowAdapter = getMapboxMap().getInfoWindowAdapter(); if (infoWindowAdapter != null) { // end developer is using a custom InfoWindowAdapter diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java index 7ca3687b0d..e0f3b86fc2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java @@ -4,6 +4,7 @@ import android.graphics.Bitmap; import android.os.Parcel; import android.os.Parcelable; +import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -70,6 +71,10 @@ public final class MarkerOptions extends BaseMarkerOptions<Marker, MarkerOptions * @return Marker The build marker */ public Marker getMarker() { + if (position == null) { + throw new InvalidMarkerPositionException(); + } + marker.setPosition(position); marker.setSnippet(snippet); marker.setTitle(title); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java index 3e51044643..a577550635 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java @@ -1,6 +1,18 @@ package com.mapbox.mapboxsdk.annotations; +import android.animation.AnimatorSet; +import android.graphics.Bitmap; +import android.graphics.PointF; +import android.support.annotation.FloatRange; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.view.View; +import android.view.animation.AnimationUtils; + +import com.mapbox.mapboxsdk.constants.MapboxConstants; +import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.utils.AnimatorUtils; /** * MarkerView is an annotation that shows an View at a geographical location. @@ -19,8 +31,8 @@ public class MarkerView extends Marker { private float anchorU; private float anchorV; - private float offsetX; - private float offsetY; + private float offsetX = -1; + private float offsetY = -1; private float infoWindowAnchorU; private float infoWindowAnchorV; @@ -28,13 +40,14 @@ public class MarkerView extends Marker { private boolean flat; private boolean visible = true; - private int selectAnimRes; - private int deselectAnimRes; - private float tiltValue; private float rotation; private float alpha = 1; + private Icon markerViewIcon; + + private boolean selected; + /** * Publicly hidden default constructor */ @@ -53,12 +66,11 @@ public class MarkerView extends Marker { this.infoWindowAnchorU = baseMarkerViewOptions.getInfoWindowAnchorU(); this.infoWindowAnchorV = baseMarkerViewOptions.getInfoWindowAnchorV(); this.flat = baseMarkerViewOptions.isFlat(); - this.selectAnimRes = baseMarkerViewOptions.getSelectAnimRes(); - this.deselectAnimRes = baseMarkerViewOptions.getDeselectAnimRes(); this.infoWindowAnchorU = baseMarkerViewOptions.infoWindowAnchorU; this.infoWindowAnchorV = baseMarkerViewOptions.infoWindowAnchorV; this.anchorU = baseMarkerViewOptions.anchorU; this.anchorV = baseMarkerViewOptions.anchorV; + this.selected = baseMarkerViewOptions.selected; } /** @@ -71,9 +83,10 @@ public class MarkerView extends Marker { * @param u u-coordinate of the anchor, as a ratio of the image width (in the range [0, 1]) * @param v v-coordinate of the anchor, as a ratio of the image height (in the range [0, 1]) */ - public void setAnchor(float u, float v) { + public void setAnchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) { this.anchorU = u; this.anchorV = v; + setOffset(-1, -1); } /** @@ -95,26 +108,16 @@ public class MarkerView extends Marker { } /** - * Internal method to set the horizontal calculated offset. + * Internal method to set the calculated offset. * <p> * These are calculated based on the View bounds and the provided anchor. * </p> * * @param x the x-value of the offset - */ - void setOffsetX(float x) { - offsetX = x; - } - - /** - * Internal method to set the vertical calculated offset. - * <p> - * These are calculated based on the View bounds and the provided anchor. - * </p> - * * @param y the y-value of the offset */ - void setOffsetY(float y) { + void setOffset(float x, float y) { + offsetX = x; offsetY = y; } @@ -149,7 +152,7 @@ public class MarkerView extends Marker { * @param v v-coordinate of the info window anchor, as a ratio of the image height (in the range [0, 1]) * @see #setAnchor(float, float) for more details. */ - public void setInfoWindowAnchor(float u, float v) { + public void setInfoWindowAnchor(@FloatRange(from = 0.0, to = 1.0) float u, @FloatRange(from = 0.0, to = 1.0) float v) { this.infoWindowAnchorU = u; this.infoWindowAnchorV = v; } @@ -191,42 +194,6 @@ public class MarkerView extends Marker { } /** - * Get the animator resource used to animate to the selected state of a MarkerView. - * - * @return the animator resource used - */ - public int getSelectAnimRes() { - return selectAnimRes; - } - - /** - * Set the animator resource used to animate to the deselected state of a MarkerView. - * - * @param selectAnimRes the animator resource used - */ - public void setSelectAnimRes(int selectAnimRes) { - this.selectAnimRes = selectAnimRes; - } - - /** - * Get the animator resource used to animate to the deslected state of a MarkerView. - * - * @return the animator resource used - */ - public int getDeselectAnimRes() { - return deselectAnimRes; - } - - /** - * Set the animator resource used to animate to the selected state of a MarkerView. - * - * @param deselectAnimRes the animator resource used - */ - public void setDeselectAnimRes(int deselectAnimRes) { - this.deselectAnimRes = deselectAnimRes; - } - - /** * Internal method to get the current tilted value of a MarkerView. * * @return the tilted value @@ -240,7 +207,7 @@ public class MarkerView extends Marker { * * @param tiltValue the tilted value to set */ - void setTilt(float tiltValue) { + void setTilt(@FloatRange(from = 0.0, to = MapboxConstants.MAXIMUM_TILT) float tiltValue) { this.tiltValue = tiltValue; } @@ -308,7 +275,7 @@ public class MarkerView extends Marker { * * @param alpha the alpha value to animate to */ - public void setAlpha(float alpha) { + public void setAlpha(@FloatRange(from = 0.0, to = 255.0) float alpha) { this.alpha = alpha; if (markerViewManager != null) { markerViewManager.animateAlpha(this, alpha); @@ -316,6 +283,53 @@ public class MarkerView extends Marker { } /** + * Set the icon of the MarkerView. + * + * @param icon the icon to be used as Marker image + */ + @Override + public void setIcon(@Nullable Icon icon) { + if (icon != null) { + markerViewIcon = IconFactory.recreate("icon", icon.getBitmap()); + } + Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888); + Icon transparentIcon = IconFactory.recreate("markerViewSettings", bitmap); + if (markerViewManager != null) { + markerViewManager.updateIcon(this); + } + super.setIcon(transparentIcon); + } + + @Override + public void setPosition(LatLng position) { + super.setPosition(position); + if (markerViewManager != null) { + markerViewManager.update(); + } + } + + public boolean isSelected() { + return selected; + } + + /** + * For internal use only, use {@link MapboxMap#selectMarker(Marker)} instead. + */ + void setSelected(boolean selected) { + this.selected = selected; + } + + /** + * Get the icon of the MarkerView. + * + * @return the icon use as Marker image + */ + @Override + public Icon getIcon() { + return markerViewIcon; + } + + /** * Set the MapboxMap associated tot the MapView containing the MarkerView. * <p> * This method is used to instantiate the MarkerView and provide an instance of {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter} @@ -326,6 +340,12 @@ public class MarkerView extends Marker { @Override public void setMapboxMap(MapboxMap mapboxMap) { super.setMapboxMap(mapboxMap); + + if(isFlat()) { + // initial tilt value if MapboxMap is started with a tilt attribute + tiltValue = (float) mapboxMap.getCameraPosition().tilt; + } + markerViewManager = mapboxMap.getMarkerViewManager(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java index d9fc9e62ae..d138ded963 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java @@ -1,12 +1,16 @@ package com.mapbox.mapboxsdk.annotations; +import android.content.Context; import android.graphics.PointF; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.util.Pools; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Projection; @@ -26,12 +30,13 @@ import java.util.Map; */ public class MarkerViewManager { - private Map<MarkerView, View> mMarkerViewMap; + private Map<MarkerView, View> markerViewMap; private MapboxMap mapboxMap; private MapView mapView; private List<MapboxMap.MarkerViewAdapter> markerViewAdapters; - private long mViewMarkerBoundsUpdateTime; + private long viewMarkerBoundsUpdateTime; private MapboxMap.OnMarkerViewClickListener onMarkerViewClickListener; + private ImageMarkerViewAdapter defaultMarkerViewAdapter; /** * Creates an instance of MarkerViewManager. @@ -43,7 +48,9 @@ public class MarkerViewManager { this.mapboxMap = mapboxMap; this.markerViewAdapters = new ArrayList<>(); this.mapView = mapView; - mMarkerViewMap = new HashMap<>(); + this.markerViewMap = new HashMap<>(); + this.defaultMarkerViewAdapter = new ImageMarkerViewAdapter(mapView.getContext()); + this.markerViewAdapters.add(defaultMarkerViewAdapter); } /** @@ -56,7 +63,7 @@ public class MarkerViewManager { * @param rotation the rotation value */ public void animateRotation(@NonNull MarkerView marker, float rotation) { - View convertView = mMarkerViewMap.get(marker); + View convertView = markerViewMap.get(marker); if (convertView != null) { AnimatorUtils.rotate(convertView, rotation); } @@ -72,7 +79,7 @@ public class MarkerViewManager { * @param alpha the alpha value */ public void animateAlpha(@NonNull MarkerView marker, float alpha) { - View convertView = mMarkerViewMap.get(marker); + View convertView = markerViewMap.get(marker); if (convertView != null) { AnimatorUtils.alpha(convertView, alpha); } @@ -88,7 +95,7 @@ public class MarkerViewManager { * @param visible the flag indicating if MarkerView is visible */ public void animateVisible(@NonNull MarkerView marker, boolean visible) { - View convertView = mMarkerViewMap.get(marker); + View convertView = markerViewMap.get(marker); if (convertView != null) { convertView.setVisibility(visible ? View.VISIBLE : View.GONE); } @@ -103,20 +110,24 @@ public class MarkerViewManager { * </p> */ public void update() { - View convertView; - for (MarkerView marker : mMarkerViewMap.keySet()) { - convertView = mMarkerViewMap.get(marker); + for (final MarkerView marker : markerViewMap.keySet()) { + final View convertView = markerViewMap.get(marker); if (convertView != null) { PointF point = mapboxMap.getProjection().toScreenLocation(marker.getPosition()); - int x = (int) (marker.getAnchorU() * convertView.getMeasuredWidth()); - int y = (int) (marker.getAnchorV() * convertView.getMeasuredHeight()); - - marker.setOffsetX(x); - marker.setOffsetY(y); + if (marker.getOffsetX() == -1) { + // ensure view is measured first + if (convertView.getMeasuredWidth() == 0) { + convertView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); + } + int x = (int) (marker.getAnchorU() * convertView.getMeasuredWidth()); + int y = (int) (marker.getAnchorV() * convertView.getMeasuredHeight()); + marker.setOffset(x, y); + } - convertView.setX(point.x - x); - convertView.setY(point.y - y); + convertView.setX(point.x - marker.getOffsetX()); + convertView.setY(point.y - marker.getOffsetY()); + // animate visibility if (marker.isVisible() && convertView.getVisibility() == View.GONE) { convertView.animate().cancel(); convertView.setAlpha(0); @@ -133,9 +144,9 @@ public class MarkerViewManager { */ public void setTilt(float tilt) { View convertView; - for (MarkerView markerView : mMarkerViewMap.keySet()) { + for (MarkerView markerView : markerViewMap.keySet()) { if (markerView.isFlat()) { - convertView = mMarkerViewMap.get(markerView); + convertView = markerViewMap.get(markerView); if (convertView != null) { markerView.setTilt(tilt); convertView.setRotationX(tilt); @@ -145,69 +156,167 @@ public class MarkerViewManager { } /** + * + */ + public void updateIcon(@NonNull MarkerView markerView) { + View convertView = markerViewMap.get(markerView); + if (convertView != null && convertView instanceof ImageView) { + ((ImageView) convertView).setImageBitmap(markerView.getIcon().getBitmap()); + } + } + + /** * Animate a MarkerView to a deselected state. * <p> - * The {@link MarkerView#getDeselectAnimRes()} will be called to get the related animation. - * If non are provided, no animation will be started. + * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onDeselect(MarkerView, View)} will be called to execute an animation. * </p> * * @param marker the MarkerView to deselect */ public void deselect(@NonNull MarkerView marker) { - final View convertView = mMarkerViewMap.get(marker); + deselect(marker, true); + } + + /** + * Animate a MarkerView to a deselected state. + * <p> + * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onDeselect(MarkerView, View)} will be called to execute an animation. + * </p> + * + * @param marker the MarkerView to deselect + * @param callbackToMap indicates if deselect marker must be called on MapboxMap + */ + public void deselect(@NonNull MarkerView marker, boolean callbackToMap) { + final View convertView = markerViewMap.get(marker); + if (convertView != null) { + for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) { + if (adapter.getMarkerClass().equals(marker.getClass())) { + adapter.onDeselect(marker, convertView); + } + } + if (callbackToMap) { + mapboxMap.deselectMarker(marker); + } + marker.setSelected(false); + } + } + + /** + * Animate a MarkerView to a selected state. + * + * @param marker the MarkerView object to select + */ + public void select(@NonNull MarkerView marker) { + select(marker, true); + } + + /** + * Animate a MarkerView to a selected state. + * + * @param marker the MarkerView object to select + * @param callbackToMap indicates if select marker must be called on MapboxMap + */ + public void select(@NonNull MarkerView marker, boolean callbackToMap) { + final View convertView = markerViewMap.get(marker); + for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) { + if (adapter.getMarkerClass().equals(marker.getClass())) { + select(marker, convertView, adapter, callbackToMap); + } + } + } + + /** + * Animate a MarkerView to a selected state. + * <p> + * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onSelect(MarkerView, View, boolean)} will be called to execute an animation. + * </p> + * + * @param marker the MarkerView object to select + * @param convertView the View presentation of the MarkerView + * @param adapter the adapter used to adapt the marker to the convertView + */ + public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter) { + select(marker, convertView, adapter, true); + } + + + /** + * Animate a MarkerView to a selected state. + * <p> + * The {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter#onSelect(MarkerView, View, boolean)} will be called to execute an animation. + * </p> + * + * @param marker the MarkerView object to select + * @param convertView the View presentation of the MarkerView + * @param adapter the adapter used to adapt the marker to the convertView + * @param callbackToMap indicates if select marker must be called on MapboxMap + */ + public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter, boolean callbackToMap) { if (convertView != null) { - int deselectAnimatorRes = marker.getDeselectAnimRes(); - if (deselectAnimatorRes != 0) { - AnimatorUtils.animate(convertView, deselectAnimatorRes); + if (adapter.onSelect(marker, convertView, false)) { + if (callbackToMap) { + mapboxMap.selectMarker(marker); + } } + marker.setSelected(true); + convertView.bringToFront(); } } /** + * Get view representation from a MarkerView. + * <p> + * If marker is not found in current viewport, null is returned. + * </p> + * + * @param marker the marker to get the view for + * @return the android SDK View object + */ + @Nullable + public View getView(MarkerView marker) { + return markerViewMap.get(marker); + } + + /** * Remove a MarkerView from a map. * <p> * The {@link MarkerView} will be removed using an alpha animation and related {@link View} - * will be released to the {@link android.support.v4.util.Pools.SimplePool} from the related + * will be released to the android.support.v4.util.Pools.SimplePool from the related * {@link com.mapbox.mapboxsdk.maps.MapboxMap.MarkerViewAdapter}. It's possible to remove * the {@link MarkerView} from the underlying collection if needed. * </p> * - * @param marker the MarkerView to remove - * @param removeFromMap flag indicating if a MarkerView will be removed from the collection. + * @param marker the MarkerView to remove */ - public void removeMarkerView(MarkerView marker, boolean removeFromMap) { - final View viewHolder = mMarkerViewMap.get(marker); + public void removeMarkerView(MarkerView marker) { + final View viewHolder = markerViewMap.get(marker); if (viewHolder != null && marker != null) { for (final MapboxMap.MarkerViewAdapter<?> adapter : markerViewAdapters) { - if (adapter.getMarkerClass() == marker.getClass()) { - - // get pool of Views associated to an adapter - final Pools.SimplePool<View> viewPool = adapter.getViewReusePool(); - - // cancel ongoing animations - viewHolder.animate().cancel(); - viewHolder.setAlpha(1); - AnimatorUtils.alpha(viewHolder, 0, new AnimatorUtils.OnAnimationEndListener() { - @Override - public void onAnimationEnd() { - viewHolder.setVisibility(View.GONE); - viewPool.release(viewHolder); - } - }); + if (adapter.getMarkerClass().equals(marker.getClass())) { + if (adapter.prepareViewForReuse(marker, viewHolder)) { + // reset offset for reuse + marker.setOffset(-1, -1); + adapter.releaseView(viewHolder); + } } } } - if (removeFromMap) { - mMarkerViewMap.remove(marker); - } + markerViewMap.remove(marker); } /** - * Add a MarkerViewAdapter. + * Add a MarkerViewAdapter to the MarkerViewManager. + * <p> + * The provided MarkerViewAdapter must use supply a generic subclass of MarkerView. + * </p> * * @param markerViewAdapter the MarkerViewAdapter to add */ - public void addMarkerViewAdapter(@Nullable MapboxMap.MarkerViewAdapter markerViewAdapter) { + public void addMarkerViewAdapter(MapboxMap.MarkerViewAdapter markerViewAdapter) { + if (markerViewAdapter.getMarkerClass().equals(MarkerView.class)) { + throw new RuntimeException("Providing a custom MarkerViewAdapter requires subclassing MarkerView"); + } + if (!markerViewAdapters.contains(markerViewAdapter)) { markerViewAdapters.add(markerViewAdapter); invalidateViewMarkersInBounds(); @@ -223,7 +332,6 @@ public class MarkerViewManager { return markerViewAdapters; } - /** * Register a callback to be invoked when this view is clicked. * @@ -243,11 +351,11 @@ public class MarkerViewManager { public void scheduleViewMarkerInvalidation() { if (!markerViewAdapters.isEmpty()) { long currentTime = SystemClock.elapsedRealtime(); - if (currentTime < mViewMarkerBoundsUpdateTime) { + if (currentTime < viewMarkerBoundsUpdateTime) { return; } invalidateViewMarkersInBounds(); - mViewMarkerBoundsUpdateTime = currentTime + 250; + viewMarkerBoundsUpdateTime = currentTime + 250; } } @@ -264,26 +372,27 @@ public class MarkerViewManager { View convertView; // remove old markers - Iterator<MarkerView> iterator = mMarkerViewMap.keySet().iterator(); + Iterator<MarkerView> iterator = markerViewMap.keySet().iterator(); while (iterator.hasNext()) { MarkerView m = iterator.next(); if (!markers.contains(m)) { // remove marker - convertView = mMarkerViewMap.get(m); - int deselectAnimRes = m.getDeselectAnimRes(); - if (deselectAnimRes != 0) { - AnimatorUtils.animate(convertView, deselectAnimRes, 0); + convertView = markerViewMap.get(m); + for (MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) { + if (adapter.getMarkerClass().equals(m.getClass())) { + adapter.prepareViewForReuse(m, convertView); + adapter.releaseView(convertView); + iterator.remove(); + } } - removeMarkerView(m, false); - iterator.remove(); } } // introduce new markers for (final MarkerView marker : markers) { - if (!mMarkerViewMap.containsKey(marker)) { + if (!markerViewMap.containsKey(marker)) { for (final MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) { - if (adapter.getMarkerClass() == marker.getClass()) { + if (adapter.getMarkerClass().equals(marker.getClass())) { convertView = (View) adapter.getViewReusePool().acquire(); final View adaptedView = adapter.getView(marker, convertView, mapView); if (adaptedView != null) { @@ -298,18 +407,16 @@ public class MarkerViewManager { adaptedView.setAlpha(marker.getAlpha()); // visible - adaptedView.setVisibility(marker.isVisible() ? View.VISIBLE : View.GONE); + adaptedView.setVisibility(View.GONE); if (mapboxMap.getSelectedMarkers().contains(marker)) { // if a marker to be shown was selected // replay that animation with duration 0 - int selectAnimRes = marker.getSelectAnimRes(); - if (selectAnimRes != 0) { - AnimatorUtils.animate(convertView, selectAnimRes, 0); + if (adapter.onSelect(marker, adaptedView, true)) { + mapboxMap.selectMarker(marker); } } - final int animSelectRes = marker.getSelectAnimRes(); adaptedView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View v) { @@ -319,34 +426,93 @@ public class MarkerViewManager { } if (!clickHandled) { - // InfoWindow offset - int infoWindowOffsetX = (int) ((adaptedView.getWidth() * marker.getInfoWindowAnchorU()) - marker.getOffsetX()); - int infoWindowOffsetY = (int) ((adaptedView.getHeight() * marker.getInfoWindowAnchorV()) - marker.getOffsetY()); - marker.setTopOffsetPixels(infoWindowOffsetY); - marker.setRightOffsetPixels(infoWindowOffsetX); - - if (animSelectRes != 0) { - AnimatorUtils.animate(v, animSelectRes, new AnimatorUtils.OnAnimationEndListener() { - @Override - public void onAnimationEnd() { - mapboxMap.selectMarker(marker); - } - }); - } else { - mapboxMap.selectMarker(marker); - } + ensureInfoWindowOffset(marker); + select(marker, v, adapter); } } }); - mMarkerViewMap.put(marker, adaptedView); + markerViewMap.put(marker, adaptedView); if (convertView == null) { - mapView.addView(adaptedView); + adaptedView.setVisibility(View.GONE); + mapView.getMarkerViewContainer().addView(adaptedView); } } } } } } + // trigger update to make newly added ViewMarker visible, + // these would only be updated when the map is moved. + update(); + } + + //TODO: This whole method is a stopgap for: https://github.com/mapbox/mapbox-gl-native/issues/5384 + public void ensureInfoWindowOffset(MarkerView marker) { + View view = null; + if (markerViewMap.containsKey(marker)) { + view = markerViewMap.get(marker); + } else { + for (final MapboxMap.MarkerViewAdapter adapter : markerViewAdapters) { + if (adapter.getMarkerClass().equals(marker.getClass())) { + View convertView = (View) adapter.getViewReusePool().acquire(); + view = adapter.getView(marker, convertView, mapView); + break; + } + } + } + + if (view != null) { + //Ensure the marker's view is measured first + if (view.getMeasuredWidth() == 0) { + view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); + } + + // update position on map + if (marker.getOffsetX() == -1) { + int x = (int) (marker.getAnchorU() * view.getMeasuredWidth()); + int y = (int) (marker.getAnchorV() * view.getMeasuredHeight()); + marker.setOffset(x, y); + } + + // InfoWindow offset + int infoWindowOffsetX = (int) ((view.getMeasuredWidth() * marker.getInfoWindowAnchorU()) - marker.getOffsetX()); + int infoWindowOffsetY = (int) ((view.getMeasuredHeight() * marker.getInfoWindowAnchorV()) - marker.getOffsetY()); + marker.setTopOffsetPixels(infoWindowOffsetY); + marker.setRightOffsetPixels(infoWindowOffsetX); + } + } + + /** + * Default MarkerViewAdapter used for base class of MarkerView to adapt a MarkerView to an ImageView + */ + public static class ImageMarkerViewAdapter extends MapboxMap.MarkerViewAdapter<MarkerView> { + + private LayoutInflater inflater; + + public ImageMarkerViewAdapter(Context context) { + super(context); + inflater = LayoutInflater.from(context); + } + + @Nullable + @Override + public View getView(@NonNull MarkerView marker, @Nullable View convertView, @NonNull ViewGroup parent) { + ViewHolder viewHolder; + if (convertView == null) { + viewHolder = new ViewHolder(); + convertView = inflater.inflate(R.layout.view_image_marker, parent, false); + viewHolder.imageView = (ImageView) convertView.findViewById(R.id.image); + convertView.setTag(viewHolder); + } else { + viewHolder = (ViewHolder) convertView.getTag(); + } + viewHolder.imageView.setImageBitmap(marker.getIcon().getBitmap()); + return convertView; + } + + private static class ViewHolder { + ImageView imageView; + } } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java index 0c9faed355..86ad873347 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java @@ -4,6 +4,7 @@ import android.graphics.Bitmap; import android.os.Parcel; import android.os.Parcelable; +import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException; import com.mapbox.mapboxsdk.geometry.LatLng; /** @@ -28,10 +29,9 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV flat(in.readByte() != 0); anchor(in.readFloat(), in.readFloat()); infoWindowAnchor(in.readFloat(), in.readFloat()); - selectAnimatorResource(in.readInt()); - deselectAnimatorResource(in.readInt()); - rotation(in.readInt()); + rotation(in.readFloat()); visible(in.readByte() != 0); + alpha(in.readFloat()); if (in.readByte() != 0) { // this means we have an icon String iconId = in.readString(); @@ -61,10 +61,9 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV out.writeFloat(getAnchorV()); out.writeFloat(getInfoWindowAnchorU()); out.writeFloat(getInfoWindowAnchorV()); - out.writeInt(getSelectAnimRes()); - out.writeInt(getDeselectAnimRes()); - out.writeInt(getRotation()); + out.writeFloat(getRotation()); out.writeByte((byte) (isVisible() ? 1 : 0)); + out.writeFloat(alpha); Icon icon = getIcon(); out.writeByte((byte) (icon != null ? 1 : 0)); if (icon != null) { @@ -75,6 +74,10 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV @Override public MarkerView getMarker() { + if (position == null) { + throw new InvalidMarkerPositionException(); + } + marker.setPosition(position); marker.setSnippet(snippet); marker.setTitle(title); @@ -82,10 +85,9 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV marker.setFlat(flat); marker.setAnchor(anchorU, anchorV); marker.setInfoWindowAnchor(infoWindowAnchorU, infoWindowAnchorV); - marker.setSelectAnimRes(selectAnimRes); - marker.setDeselectAnimRes(deselectAnimRes); marker.setRotation(rotation); marker.setVisible(visible); + marker.setAlpha(alpha); return marker; } 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/MultiPoint.java index d2aaea1d17..a76238fdcb 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/MultiPoint.java @@ -34,19 +34,24 @@ public abstract class MultiPoint extends Annotation { * * @param points the points of the polyline */ - void setPoints(List<LatLng> points) { + public void setPoints(List<LatLng> points) { this.points = new ArrayList<>(points); + update(); } - void addPoint(LatLng point) { + public void addPoint(LatLng point) { points.add(point); + update(); } public float getAlpha() { return alpha; } - void setAlpha(float alpha) { + public void setAlpha(float alpha) { this.alpha = alpha; + update(); } + + abstract void update(); } 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 4a07b16827..78e3a99e96 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 @@ -2,10 +2,7 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; -import com.mapbox.mapboxsdk.geometry.LatLng; - -import java.util.ArrayList; -import java.util.List; +import com.mapbox.mapboxsdk.maps.MapboxMap; /** * Polygon is a geometry annotation that's a closed loop of coordinates. @@ -19,19 +16,49 @@ public final class Polygon extends MultiPoint { super(); } + /** + * Get the color of the fill region of the polygon. + * + * @return the color of the fill + */ public int getFillColor() { return fillColor; } + /** + * Get the color fo the stroke of the polygon. + * + * @return the color of the stroke + */ public int getStrokeColor() { return strokeColor; } - void setFillColor(int color) { + /** + * Sets the color of the fill region of the polygon. + * + * @param color - the color in ARGB format + */ + public void setFillColor(int color) { fillColor = color; + update(); } - void setStrokeColor(int color) { + /** + * Sets the color of the stroke of the polygon. + * + * @param color - the color in ARGB format + */ + public void setStrokeColor(int color) { strokeColor = color; + update(); + } + + @Override + void update() { + MapboxMap mapboxMap = getMapboxMap(); + if (mapboxMap != null) { + mapboxMap.updatePolygon(this); + } } } 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 cfaf0d21d9..4bf3242d57 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 @@ -2,6 +2,8 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; +import com.mapbox.mapboxsdk.maps.MapboxMap; + /** * Polyline is a geometry feature with an unclosed list of coordinates drawn as a line */ @@ -14,10 +16,20 @@ public final class Polyline extends MultiPoint { super(); } + /** + * Returns the Polyline tint color. + * + * @return the tint color + */ public int getColor() { return color; } + /** + * Returns the Polyline width. + * + * @return the width + */ public float getWidth() { return width; } @@ -27,8 +39,9 @@ public final class Polyline extends MultiPoint { * * @param color - the color in ARGB format */ - void setColor(int color) { + public void setColor(int color) { this.color = color; + update(); } /** @@ -36,7 +49,16 @@ public final class Polyline extends MultiPoint { * * @param width in pixels */ - void setWidth(float width) { + public void setWidth(float width) { this.width = width; + update(); + } + + @Override + void update() { + MapboxMap mapboxMap = getMapboxMap(); + if (mapboxMap != null) { + mapboxMap.updatePolyline(this); + } } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java index ece992ad54..3993615eb9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java @@ -31,6 +31,16 @@ public class MapboxConstants { public static final String KEY_META_DATA_STAGING_ACCESS_TOKEN = "com.mapbox.TestEventsAccessToken"; /** + * Key used to switch storage to external in AndroidManifest.xml + */ + public final static String KEY_META_DATA_SET_STORAGE_EXTERNAL = "com.mapbox.SetStorageExternal"; + + /** + * Default value for KEY_META_DATA_SET_STORAGE_EXTERNAL (default is internal storage) + */ + public final static boolean DEFAULT_SET_STORAGE_EXTERNAL = false; + + /** * Default animation time */ public static final int ANIMATION_DURATION = 300; @@ -116,4 +126,6 @@ public class MapboxConstants { public static final String MAPBOX_SHARED_PREFERENCES_FILE = "MapboxSharedPreferences"; public static final String MAPBOX_SHARED_PREFERENCE_KEY_VENDORID = "mapboxVendorId"; public static final String MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_ENABLED = "mapboxTelemetryEnabled"; + public static final String MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_URL = "mapboxTelemetryStagingUrl"; + public static final String MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_ACCESS_TOKEN = "mapboxTelemetryStagingAccessToken"; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java index aa24d58656..51eb038052 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java @@ -1,7 +1,9 @@ package com.mapbox.mapboxsdk.constants; import android.support.annotation.StringDef; + import com.mapbox.mapboxsdk.maps.MapView; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -15,169 +17,33 @@ import java.lang.annotation.RetentionPolicy; */ public class Style { - /** - * Mapbox Streets: A complete basemap, perfect for incorporating your own data. - */ - private static final String MAPBOX_STREETS_BASE = "mapbox://styles/mapbox/streets-v%d"; - /** - * Outdoors: A general-purpose style tailored to outdoor activities. - */ - private static final String OUTDOORS_BASE = "mapbox://styles/mapbox/outdoors-v%d"; - /** - * Light: Subtle light backdrop for data visualizations. - */ - private static final String LIGHT_BASE = "mapbox://styles/mapbox/light-v%d"; - /** - * Dark: Subtle dark backdrop for data visualizations. - */ - private static final String DARK_BASE = "mapbox://styles/mapbox/dark-v%d"; - /** - * Satellite: A beautiful global satellite and aerial imagery layer. - */ - private static final String SATELLITE_BASE = "mapbox://styles/mapbox/satellite-v%d"; - /** - * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels. - */ - private static final String SATELLITE_STREETS_BASE = "mapbox://styles/mapbox/satellite-streets-v%d"; - - /** - * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels (Version 8). - */ - private static final String SATELLITE_STREETS_V8 = "mapbox://styles/mapbox/satellite-hybrid-v8"; - - /** - * Get versioned url of Mapbox streets style. - * <p> - * <ul> - * <li>Current default version is 9.</li> - * </ul - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from - */ - public static String getMapboxStreetsUrl(int version) { - return String.format(MapboxConstants.MAPBOX_LOCALE, MAPBOX_STREETS_BASE, version); - } - - /** - * Get versioned url of Outdoors streets style. - * <p> - * <ul> - * <li>Current version is 9.</li> - * </ul> - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from - */ - public static String getOutdoorsStyleUrl(int version) { - return String.format(MapboxConstants.MAPBOX_LOCALE, OUTDOORS_BASE, version); - } - - /** - * Get versioned url of Light style. - * <p> - * <ul> - * <li>Current default version is 9.</li> - * </ul> - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from - */ - public static String getLightStyleUrl(int version) { - return String.format(MapboxConstants.MAPBOX_LOCALE, LIGHT_BASE, version); - } - - /** - * Get versioned url of Dark style. - * <p> - * <ul> - * <li>Current default version is 9.</li> - * </ul> - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from - */ - public static String getDarkStyleUrl(int version) { - return String.format(MapboxConstants.MAPBOX_LOCALE, DARK_BASE, version); - } - - /** - * Get versioned url of Satellite style. - * <p> - * <ul> - * <li>Current version is 9.</li> - * </ul> - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from - */ - public static String getSatelliteStyleUrl(int version) { - return String.format(MapboxConstants.MAPBOX_LOCALE, SATELLITE_BASE, version); - } /** - * Get versioned url of Satellite streets style. - * <p> - * <ul> - * <li>Current version is 9.</li> - * </ul> - * </p> - * <p> - * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles - * </p> - * - * @param version the version of the style. - * @return uri to load style from + * Indicates the parameter accepts one of the values from {@link Style}. Using one of these + * constants means your map style will always use the latest version and may change as we + * improve the style */ - public static String getSatelliteStreetsStyleUrl(int version) { - if (version == 8) { - return SATELLITE_STREETS_V8; - } - return String.format(MapboxConstants.MAPBOX_LOCALE, SATELLITE_STREETS_BASE, version); - } - - /** - * Indicates the parameter accepts one of the values from {@link Style}. - * - * @deprecated use dedicated versioned methods in {@link Style} instead. - */ - @StringDef({MAPBOX_STREETS, EMERALD, LIGHT, DARK, SATELLITE, SATELLITE_STREETS}) + @StringDef({MAPBOX_STREETS, OUTDOORS, EMERALD, LIGHT, DARK, SATELLITE, SATELLITE_STREETS}) @Retention(RetentionPolicy.SOURCE) - @Deprecated public @interface StyleUrl { } // IMPORTANT: If you change any of these you also need to edit them in strings.xml /** - * Mapbox Streets: A complete basemap, perfect for incorporating your own data. - * - * @deprecated use {@link #getMapboxStreetsUrl(int)} instead. + * Mapbox Streets: A complete basemap, perfect for incorporating your own data. Using this + * constant means your map style will always use the latest version and may change as we + * improve the style. */ - @Deprecated public static final String MAPBOX_STREETS = "mapbox://styles/mapbox/streets-v9"; /** + * Outdoors: A general-purpose style tailored to outdoor activities. Using this constant means + * your map style will always use the latest version and may change as we improve the style. + */ + public static final String OUTDOORS = "mapbox://styles/mapbox/outdoors-v9"; + + /** * Emerald: A versatile style, with emphasis on road networks and public transit. * * @deprecated this style has been deprecated and will be removed in future versions. @@ -186,34 +52,27 @@ public class Style { public static final String EMERALD = "mapbox://styles/mapbox/emerald-v8"; /** - * Light: Subtle light backdrop for data visualizations. - * - * @deprecated use {@link #getLightStyleUrl(int)} instead. + * Light: Subtle light backdrop for data visualizations. Using this constant means your map + * style will always use the latest version and may change as we improve the style. */ - @Deprecated public static final String LIGHT = "mapbox://styles/mapbox/light-v9"; /** - * Dark: Subtle dark backdrop for data visualizations. - * - * @deprecated use {@link #getDarkStyleUrl(int)} (int)} instead. + * Dark: Subtle dark backdrop for data visualizations. Using this constant means your map style + * will always use the latest version and may change as we improve the style. */ - @Deprecated public static final String DARK = "mapbox://styles/mapbox/dark-v9"; /** - * Satellite: A beautiful global satellite and aerial imagery layer. - * - * @deprecated use {@link #getSatelliteStyleUrl(int)} instead. + * Satellite: A beautiful global satellite and aerial imagery layer. Using this constant means + * your map style will always use the latest version and may change as we improve the style. */ - @Deprecated public static final String SATELLITE = "mapbox://styles/mapbox/satellite-v9"; /** - * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels. - * - * @deprecated use {@link #getSatelliteStreetsStyleUrl(int)} (int)} instead. + * Satellite Streets: Global satellite and aerial imagery with unobtrusive labels. Using this + * constant means your map style will always use the latest version and may change as we + * improve the style. */ - @Deprecated public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v9"; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java new file mode 100644 index 0000000000..87656db2a9 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/ConversionException.java @@ -0,0 +1,22 @@ +package com.mapbox.mapboxsdk.exceptions; + +/** + * Thrown on conversion errors + */ +public class ConversionException extends RuntimeException { + + public ConversionException() { + } + + public ConversionException(String detailMessage) { + super(detailMessage); + } + + public ConversionException(String detailMessage, Throwable throwable) { + super(detailMessage, throwable); + } + + public ConversionException(Throwable throwable) { + super(throwable); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java new file mode 100644 index 0000000000..8dc98118b1 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidMarkerPositionException.java @@ -0,0 +1,10 @@ +package com.mapbox.mapboxsdk.exceptions; + +public class InvalidMarkerPositionException extends RuntimeException { + + public InvalidMarkerPositionException() { + super("Adding an invalid Marker to a Map. " + + "Missing the required position field. " + + "Provide a non null LatLng as position to the Marker."); + } +}
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java new file mode 100644 index 0000000000..4954098f15 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java @@ -0,0 +1,23 @@ +package com.mapbox.mapboxsdk.exceptions; + + +import android.content.Context; +import android.os.Bundle; + +import com.mapbox.mapboxsdk.MapboxAccountManager; +import com.mapbox.mapboxsdk.maps.MapView; + +/** + * A MapboxAccountManagerNotStartedException is thrown by {@link com.mapbox.mapboxsdk.maps.MapView} + * when {@link MapboxAccountManager} is not started before {@link MapView#onCreate(Bundle)}. + * + * @see MapView#onCreate(Bundle) + * @see MapboxAccountManager#start(Context, String) + */ +public class MapboxAccountManagerNotStartedException extends RuntimeException { + + public MapboxAccountManagerNotStartedException() { + super("\nMapboxAccountManager was not started correctly. Use MapboxAccountManager#start(Context, String) to initialise. " + + "\nMore information in this guide https://www.mapbox.com/help/first-steps-android-sdk/#access-tokens."); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java index 5251ab4d6d..2fd28202af 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java @@ -290,6 +290,13 @@ public class LatLngBounds implements Parcelable { return LatLngBounds.fromLatLngs(mLatLngList); } + public Builder includes(List<LatLng> latLngs){ + for (LatLng point : latLngs) { + mLatLngList.add(point); + } + return this; + } + public Builder include(@NonNull LatLng latLng) { mLatLngList.add(latLng); return this; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java deleted file mode 100644 index 30efd59a6e..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mapbox.mapboxsdk.layers; - -public class CustomLayer { - - public String mID; - public long mContext; - public long mInitializeFunction; - public long mRenderFunction; - public long mDeinitializeFunction; - - public CustomLayer(String id, - long context, - long initializeFunction, - long renderFunction, - long deinitializeFunction) { - this.mID = id; - this.mContext = context; - this.mInitializeFunction = initializeFunction; - this.mRenderFunction = renderFunction; - this.mDeinitializeFunction = deinitializeFunction; - } - -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java deleted file mode 100644 index 4c58308c47..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Do not use this package. Experimental feature. - */ -package com.mapbox.mapboxsdk.layers; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java index 08f18892d2..4fade484b4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java @@ -18,12 +18,10 @@ import java.util.concurrent.CopyOnWriteArrayList; /** * Manages locational updates. Contains methods to register and unregister location listeners. - * <p> * <ul> * <li>You can register a {@link LocationListener} with {@link #addLocationListener(LocationListener)} to receive location updates.</li> * <li> You can unregister a {@link LocationListener} with {@link #removeLocationListener(LocationListener)}.</li> * </ul> - * <p/> * <p> * Note: If registering a listener in your Activity.onResume() implementation, you should unregister it in Activity.onPause(). * (You won't receive location updates when paused, and this will cut down on unnecessary system overhead). diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index b34b947a2a..6b0c207a1a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -13,11 +13,10 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Canvas; -import android.graphics.Matrix; import android.graphics.PointF; import android.graphics.RectF; -import android.graphics.SurfaceTexture; import android.graphics.drawable.ColorDrawable; import android.location.Location; import android.net.ConnectivityManager; @@ -45,9 +44,11 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.Surface; -import android.view.TextureView; +import android.view.SurfaceHolder; +import android.view.SurfaceView; import android.view.View; import android.view.ViewConfiguration; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.FrameLayout; @@ -77,7 +78,6 @@ import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.exceptions.IconBitmapChangedException; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; -import com.mapbox.mapboxsdk.layers.CustomLayer; import com.mapbox.mapboxsdk.location.LocationListener; import com.mapbox.mapboxsdk.location.LocationServices; import com.mapbox.mapboxsdk.maps.widgets.CompassView; @@ -124,6 +124,7 @@ public class MapView extends FrameLayout { private NativeMapView mNativeMapView; private boolean mHasSurface = false; + private ViewGroup mMarkerViewContainer; private CompassView mCompassView; private ImageView mLogoView; private ImageView mAttributionsView; @@ -142,6 +143,7 @@ public class MapView extends FrameLayout { private ShoveGestureDetector mShoveGestureDetector; private boolean mTwoTap = false; private boolean mZoomStarted = false; + private boolean mDragStarted = false; private boolean mQuickZoom = false; private boolean mScrollInProgress = false; @@ -150,9 +152,13 @@ public class MapView extends FrameLayout { private int mContentPaddingRight; private int mContentPaddingBottom; - private StyleInitializer mStyleInitializer; + private PointF mFocalPoint; + + private String mStyleUrl; + private String mInitalStyle; private List<OnMapReadyCallback> mOnMapReadyCallbackList; + private SnapshotRequest mSnapshotRequest; @UiThread public MapView(@NonNull Context context) { @@ -184,7 +190,6 @@ public class MapView extends FrameLayout { mOnMapChangedListener = new CopyOnWriteArrayList<>(); mMapboxMap = new MapboxMap(this); mIcons = new ArrayList<>(); - mStyleInitializer = new StyleInitializer(context); View view = LayoutInflater.from(context).inflate(R.layout.mapview_internal, this); if (!isInEditMode()) { @@ -192,8 +197,7 @@ public class MapView extends FrameLayout { } // Reference the TextureView - TextureView textureView = (TextureView) view.findViewById(R.id.textureView); - textureView.setSurfaceTextureListener(new SurfaceTextureListener()); + SurfaceView surfaceView = (SurfaceView) view.findViewById(R.id.surfaceView); // Check if we are in Android Studio UI editor to avoid error in layout preview if (isInEditMode()) { @@ -209,6 +213,8 @@ public class MapView extends FrameLayout { setFocusableInTouchMode(true); requestFocus(); + surfaceView.getHolder().addCallback(new SurfaceCallback()); + // Touch gesture detectors mGestureDetector = new GestureDetectorCompat(context, new GestureListener()); mGestureDetector.setIsLongpressEnabled(true); @@ -224,6 +230,8 @@ public class MapView extends FrameLayout { // Connectivity onConnectivityChanged(isConnected()); + mMarkerViewContainer = (ViewGroup) view.findViewById(R.id.markerViewContainer); + mMyLocationView = (MyLocationView) view.findViewById(R.id.userLocationView); mMyLocationView.setMapboxMap(mMapboxMap); @@ -252,23 +260,19 @@ public class MapView extends FrameLayout { CameraPosition position = options.getCamera(); if (position != null) { mMapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position)); + mMyLocationView.setTilt(position.tilt); } - String accessToken = null; - if (MapboxAccountManager.getInstance() != null) { - accessToken = MapboxAccountManager.getInstance().getAccessToken(); - } else { - accessToken = options.getAccessToken(); + // access token + String accessToken = options.getAccessToken(); + if (!TextUtils.isEmpty(accessToken)) { + mMapboxMap.setAccessToken(accessToken); } + // style url String style = options.getStyle(); - if (!TextUtils.isEmpty(accessToken)) { - mMapboxMap.setAccessToken(accessToken); - if (style != null) { - setStyleUrl(style); - } - } else { - mStyleInitializer.setStyle(style, true); + if (!TextUtils.isEmpty(style)) { + mInitalStyle = style; } // MyLocationView @@ -356,8 +360,17 @@ public class MapView extends FrameLayout { */ @UiThread public void onCreate(@Nullable Bundle savedInstanceState) { + String accessToken = mMapboxMap.getAccessToken(); + if (TextUtils.isEmpty(accessToken)) { + accessToken = MapboxAccountManager.getInstance().getAccessToken(); + mMapboxMap.setAccessToken(accessToken); + } else { + // user provided access token through xml attributes, need to start MapboxAccountManager + MapboxAccountManager.start(getContext(), accessToken); + } + // Force a check for an access token - MapboxAccountManager.validateAccessToken(getAccessToken()); + MapboxAccountManager.validateAccessToken(accessToken); if (savedInstanceState != null && savedInstanceState.getBoolean(MapboxConstants.STATE_HAS_SAVED_STATE)) { @@ -407,7 +420,6 @@ public class MapView extends FrameLayout { // User location try { - //noinspection ResourceType mMapboxMap.setMyLocationEnabled(savedInstanceState.getBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED)); } catch (SecurityException ignore) { // User did not accept location permissions @@ -445,10 +457,20 @@ public class MapView extends FrameLayout { callback.onMapReady(mMapboxMap); iterator.remove(); } + mMapboxMap.getMarkerViewManager().scheduleViewMarkerInvalidation(); } } else if (change == REGION_IS_CHANGING || change == REGION_DID_CHANGE || change == DID_FINISH_LOADING_MAP) { mMapboxMap.getMarkerViewManager().scheduleViewMarkerInvalidation(); + + mCompassView.update(getDirection()); + mMyLocationView.update(); + mMapboxMap.getMarkerViewManager().update(); + + for (InfoWindow infoWindow : mMapboxMap.getInfoWindows()) { + infoWindow.update(); + } } + } }); @@ -473,7 +495,7 @@ public class MapView extends FrameLayout { outState.putBoolean(MapboxConstants.STATE_HAS_SAVED_STATE, true); outState.putParcelable(MapboxConstants.STATE_CAMERA_POSITION, mMapboxMap.getCameraPosition()); outState.putBoolean(MapboxConstants.STATE_DEBUG_ACTIVE, mMapboxMap.isDebugActive()); - outState.putString(MapboxConstants.STATE_STYLE_URL, mStyleInitializer.getStyle()); + outState.putString(MapboxConstants.STATE_STYLE_URL, mStyleUrl); outState.putBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED, mMapboxMap.isMyLocationEnabled()); // TrackingSettings @@ -504,7 +526,7 @@ public class MapView extends FrameLayout { // UiSettings - Logo outState.putInt(MapboxConstants.STATE_LOGO_GRAVITY, uiSettings.getLogoGravity()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_LEFT, uiSettings.getLogoMarginLeft()); - outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_TOP, uiSettings.getCompassMarginTop()); + outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_TOP, uiSettings.getLogoMarginTop()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_RIGHT, uiSettings.getLogoMarginRight()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_BOTTOM, uiSettings.getLogoMarginBottom()); outState.putBoolean(MapboxConstants.STATE_LOGO_ENABLED, uiSettings.isLogoEnabled()); @@ -555,10 +577,23 @@ public class MapView extends FrameLayout { mNativeMapView.update(); mMyLocationView.onResume(); - if (mStyleInitializer.isDefaultStyle()) { + if (mStyleUrl == null) { + // user supplied style through xml // user has failed to supply a style url - setStyleUrl(mStyleInitializer.getStyle()); + setStyleUrl(mInitalStyle == null ? Style.MAPBOX_STREETS : mInitalStyle); + } + } + + void setFocalPoint(PointF focalPoint) { + if (focalPoint == null) { + // resetting focal point, + UiSettings uiSettings = mMapboxMap.getUiSettings(); + // need to validate if we need to reset focal point with user provided one + if (uiSettings.getFocalPoint() != null) { + focalPoint = uiSettings.getFocalPoint(); + } } + mFocalPoint = focalPoint; } /** @@ -648,6 +683,7 @@ public class MapView extends FrameLayout { if (mDestroyed) { return; } + mMyLocationView.setBearing(0); mNativeMapView.cancelTransitions(); mNativeMapView.resetNorth(); } @@ -672,11 +708,11 @@ public class MapView extends FrameLayout { return mContentPaddingBottom; } - int getContentWidth(){ + int getContentWidth() { return getWidth() - mContentPaddingLeft - mContentPaddingRight; } - int getContentHeight(){ + int getContentHeight() { return getHeight() - mContentPaddingBottom - mContentPaddingTop; } @@ -783,7 +819,7 @@ public class MapView extends FrameLayout { * <li>{@code asset://...}: * reads the style from the APK {@code assets/} directory. * This is used to load a style bundled with your app.</li> - * <li>{@code null}: loads the default {@link Style#getMapboxStreetsUrl(int)} style.</li> + * <li>{@code null}: loads the default {@link Style#MAPBOX_STREETS} style.</li> * </ul> * <p> * This method is asynchronous and will return immediately before the style finishes loading. @@ -799,7 +835,7 @@ public class MapView extends FrameLayout { if (mDestroyed) { return; } - mStyleInitializer.setStyle(url); + mStyleUrl = url; mNativeMapView.setStyleUrl(url); } @@ -833,7 +869,7 @@ public class MapView extends FrameLayout { @UiThread @NonNull public String getStyleUrl() { - return mStyleInitializer.getStyle(); + return mStyleUrl; } // @@ -874,7 +910,7 @@ public class MapView extends FrameLayout { * <p> * DEPRECATED @see MapboxAccountManager#getAccessToken() * </p> - * <p/> + * <p> * Returns the current Mapbox access token used to load map styles and tiles. * </p> * @@ -991,12 +1027,53 @@ public class MapView extends FrameLayout { if (updatedMarker.getId() == -1) { Log.w(MapboxConstants.TAG, "marker has an id of -1, possibly was not added yet, doing nothing"); + return; + } + + if (!(updatedMarker instanceof MarkerView)) { + ensureIconLoaded(updatedMarker); } - ensureIconLoaded(updatedMarker); mNativeMapView.updateMarker(updatedMarker); } + + void updatePolygon(Polygon polygon) { + if (mDestroyed) { + return; + } + + if (polygon == null) { + Log.w(MapboxConstants.TAG, "polygon was null, doing nothing"); + return; + } + + if (polygon.getId() == -1) { + Log.w(MapboxConstants.TAG, "polygon has an id of -1, indicating the polygon was not added to the map yet."); + return; + } + + mNativeMapView.updatePolygon(polygon); + } + + void updatePolyline(Polyline polyline) { + if (mDestroyed) { + return; + } + + if (polyline == null) { + Log.w(MapboxConstants.TAG, "polygon was null, doing nothing"); + return; + } + + if (polyline.getId() == -1) { + Log.w(MapboxConstants.TAG, "polygon has an id of -1, indicating the polygon was not added to the map yet."); + return; + } + + mNativeMapView.updatePolyline(polyline); + } + private void ensureIconLoaded(Marker marker) { Icon icon = marker.getIcon(); if (icon == null) { @@ -1021,7 +1098,7 @@ public class MapView extends FrameLayout { } long addMarker(@NonNull Marker marker) { - if(mDestroyed){ + if (mDestroyed) { return 0l; } return mNativeMapView.addMarker(marker); @@ -1120,7 +1197,7 @@ public class MapView extends FrameLayout { int count = annotationList.size(); for (int i = 0; i < count; i++) { Annotation annotation = annotationList.get(i); - if (annotation instanceof MarkerView && idsList.contains(annotation.getId())) { + if (annotation instanceof MarkerView) { annotations.add((MarkerView) annotation); } } @@ -1128,6 +1205,13 @@ public class MapView extends FrameLayout { return new ArrayList<>(annotations); } + /** + * @return the ViewGroup containing the marker views + */ + public ViewGroup getMarkerViewContainer() { + return mMarkerViewContainer; + } + int getTopOffsetPixelsForIcon(Icon icon) { if (mDestroyed) { @@ -1317,93 +1401,66 @@ public class MapView extends FrameLayout { return mNativeMapView.getScale(); } - // This class handles TextureView callbacks - private class SurfaceTextureListener implements TextureView.SurfaceTextureListener { + private class SurfaceCallback implements SurfaceHolder.Callback { private Surface mSurface; - private View mViewHolder; - - private static final int VIEW_MARKERS_POOL_SIZE = 20; - - // Called when the native surface texture has been created - // Must do all EGL/GL ES initialization here @Override - public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) { - mNativeMapView.createSurface(mSurface = new Surface(surface)); - mNativeMapView.resizeFramebuffer(width, height); + public void surfaceCreated(SurfaceHolder holder) { + mNativeMapView.createSurface(mSurface = holder.getSurface()); mHasSurface = true; } - // Called when the native surface texture has been destroyed - // Must do all EGL/GL ES destruction here - @Override - public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) { - mHasSurface = false; - - if (mNativeMapView != null) { - mNativeMapView.destroySurface(); - } - mSurface.release(); - return true; - } - - // Called when the format or size of the native surface texture has been changed - // Must handle window resizing here. @Override - public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) { + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { if (mDestroyed) { return; } - mNativeMapView.resizeFramebuffer(width, height); } - // Called when the SurfaceTexure frame is drawn to screen - // Must sync with UI here @Override - public void onSurfaceTextureUpdated(SurfaceTexture surface) { - if (mDestroyed) { - return; - } - - mCompassView.update(getDirection()); - mMyLocationView.update(); - mMapboxMap.getMarkerViewManager().update(); + public void surfaceDestroyed(SurfaceHolder holder) { + mHasSurface = false; - for (InfoWindow infoWindow : mMapboxMap.getInfoWindows()) { - infoWindow.update(); + if (mNativeMapView != null) { + mNativeMapView.destroySurface(); } + mSurface.release(); } } - // Used by UserLocationView - void update() { - if (mDestroyed) { - return; - } - - mNativeMapView.update(); - } - CameraPosition invalidateCameraPosition() { if (mDestroyed) { return new CameraPosition.Builder().build(); } - return new CameraPosition.Builder(mNativeMapView.getCameraValues()).build(); + CameraPosition position = new CameraPosition.Builder(mNativeMapView.getCameraValues()).build(); + mMyLocationView.setCameraPosition(position); + return position; } double getBearing() { if (mDestroyed) { return 0; } - return mNativeMapView.getBearing(); + + double direction = -mNativeMapView.getBearing(); + + while (direction > 360) { + direction -= 360; + } + while (direction < 0) { + direction += 360; + } + + return direction; } void setBearing(float bearing) { if (mDestroyed) { return; } + mMyLocationView.setBearing(bearing); mNativeMapView.setBearing(bearing); } @@ -1411,9 +1468,18 @@ public class MapView extends FrameLayout { if (mDestroyed) { return; } + mMyLocationView.setBearing(bearing); mNativeMapView.setBearing(bearing, duration); } + void setBearing(double bearing, float focalX, float focalY) { + if (mDestroyed) { + return; + } + mMyLocationView.setBearing(bearing); + mNativeMapView.setBearing(bearing, focalX, focalY); + } + // // View events // @@ -1455,6 +1521,17 @@ public class MapView extends FrameLayout { private void trackGestureEvent(@NonNull String gestureId, @NonNull float xCoordinate, @NonNull float yCoordinate) { LatLng tapLatLng = fromScreenLocation(new PointF(xCoordinate, yCoordinate)); + // NaN and Infinite checks to prevent JSON errors at send to server time + if (Double.isNaN(tapLatLng.getLatitude()) || Double.isNaN(tapLatLng.getLongitude())) { + Log.d(MapView.class.getSimpleName(), "trackGestureEvent() has a NaN lat or lon. Returning."); + return; + } + + if (Double.isInfinite(tapLatLng.getLatitude()) || Double.isInfinite(tapLatLng.getLongitude())) { + Log.d(MapView.class.getSimpleName(), "trackGestureEvent() has an Infinite lat or lon. Returning."); + return; + } + Hashtable<String, Object> evt = new Hashtable<>(); evt.put(MapboxEvent.ATTRIBUTE_EVENT, MapboxEvent.TYPE_MAP_CLICK); evt.put(MapboxEvent.ATTRIBUTE_CREATED, MapboxEventManager.generateCreateDate()); @@ -1476,6 +1553,17 @@ public class MapView extends FrameLayout { private void trackGestureDragEndEvent(@NonNull float xCoordinate, @NonNull float yCoordinate) { LatLng tapLatLng = fromScreenLocation(new PointF(xCoordinate, yCoordinate)); + // NaN and Infinite checks to prevent JSON errors at send to server time + if (Double.isNaN(tapLatLng.getLatitude()) || Double.isNaN(tapLatLng.getLongitude())) { + Log.d(MapView.class.getSimpleName(), "trackGestureDragEndEvent() has a NaN lat or lon. Returning."); + return; + } + + if (Double.isInfinite(tapLatLng.getLatitude()) || Double.isInfinite(tapLatLng.getLongitude())) { + Log.d(MapView.class.getSimpleName(), "trackGestureDragEndEvent() has an Infinite lat or lon. Returning."); + return; + } + Hashtable<String, Object> evt = new Hashtable<>(); evt.put(MapboxEvent.ATTRIBUTE_EVENT, MapboxEvent.TYPE_MAP_DRAGEND); evt.put(MapboxEvent.ATTRIBUTE_CREATED, MapboxEventManager.generateCreateDate()); @@ -1533,8 +1621,12 @@ public class MapView extends FrameLayout { || mShoveGestureDetector.isInProgress(); if (mTwoTap && isTap && !inProgress) { - PointF focalPoint = TwoFingerGestureDetector.determineFocalPoint(event); - zoom(false, focalPoint.x, focalPoint.y); + if (mFocalPoint != null) { + zoom(false, mFocalPoint.x / mScreenDensity, mFocalPoint.y / mScreenDensity); + } else { + PointF focalPoint = TwoFingerGestureDetector.determineFocalPoint(event); + zoom(false, focalPoint.x, focalPoint.y); + } mTwoTap = false; return true; } @@ -1593,12 +1685,12 @@ public class MapView extends FrameLayout { } // Single finger double tap - if (mMapboxMap.getTrackingSettings().isLocationTrackingDisabled()) { + if (mFocalPoint != null) { + // User provided focal point + zoom(true, mFocalPoint.x, mFocalPoint.y); + } else { // Zoom in on gesture zoom(true, e.getX(), e.getY()); - } else { - // Zoom in on user location view - zoom(true, mMyLocationView.getCenterX(), mMyLocationView.getCenterY()); } break; } @@ -1673,8 +1765,10 @@ public class MapView extends FrameLayout { } } } else { - // deselect any selected marker - mMapboxMap.deselectMarkers(); + if (mMapboxMap.getUiSettings().isDeselectMarkersOnTap()) { + // deselect any selected marker + mMapboxMap.deselectMarkers(); + } // notify app of map click MapboxMap.OnMapClickListener listener = mMapboxMap.getOnMapClickListener(); @@ -1742,10 +1836,15 @@ public class MapView extends FrameLayout { return false; } + if (mDragStarted) { + return false; + } + + requestDisallowInterceptTouchEvent(true); + // reset tracking modes if gesture occurs resetTrackingModesIfRequired(); - // Cancel any animation mNativeMapView.cancelTransitions(); @@ -1816,29 +1915,28 @@ public class MapView extends FrameLayout { return false; } + if (mDragStarted) { + return false; + } + // Cancel any animation mNativeMapView.cancelTransitions(); // Gesture is a quickzoom if there aren't two fingers mQuickZoom = !mTwoTap; - TrackingSettings trackingSettings = mMapboxMap.getTrackingSettings(); - // Scale the map - if (uiSettings.isScrollGesturesEnabled() && !mQuickZoom && trackingSettings.isLocationTrackingDisabled()) { + if (mFocalPoint != null) { + // arround user provided focal point + mNativeMapView.scaleBy(detector.getScaleFactor(), mFocalPoint.x / mScreenDensity, mFocalPoint.y / mScreenDensity); + } else if (mQuickZoom) { + // around center map + mNativeMapView.scaleBy(detector.getScaleFactor(), (getWidth() / 2) / mScreenDensity, (getHeight() / 2) / mScreenDensity); + } else { // around gesture mNativeMapView.scaleBy(detector.getScaleFactor(), detector.getFocusX() / mScreenDensity, detector.getFocusY() / mScreenDensity); - } else { - if (trackingSettings.isLocationTrackingDisabled()) { - // around center map - mNativeMapView.scaleBy(detector.getScaleFactor(), (getWidth() / 2) / mScreenDensity, (getHeight() / 2) / mScreenDensity); - } else { - // around user location view - float x = mMyLocationView.getX() + mMyLocationView.getWidth() / 2; - float y = mMyLocationView.getY() + mMyLocationView.getHeight() / 2; - mNativeMapView.scaleBy(detector.getScaleFactor(), x / mScreenDensity, y / mScreenDensity); - } } + return true; } } @@ -1881,10 +1979,14 @@ public class MapView extends FrameLayout { return false; } + if (mDragStarted) { + return false; + } + // If rotate is large enough ignore a tap // Also is zoom already started, don't rotate mTotalAngle += detector.getRotationDegreesDelta(); - if (!mZoomStarted && ((mTotalAngle > 10.0f) || (mTotalAngle < -10.0f))) { + if (!mZoomStarted && ((mTotalAngle > 20.0f) || (mTotalAngle < -20.0f))) { mStarted = true; } @@ -1908,16 +2010,12 @@ public class MapView extends FrameLayout { bearing += detector.getRotationDegreesDelta(); // Rotate the map - if (mMapboxMap.getTrackingSettings().isLocationTrackingDisabled()) { - // around gesture - mNativeMapView.setBearing(bearing, - detector.getFocusX() / mScreenDensity, - detector.getFocusY() / mScreenDensity); + if (mFocalPoint != null) { + // User provided focal point + setBearing(bearing, mFocalPoint.x / mScreenDensity, mFocalPoint.y / mScreenDensity); } else { - // around center userlocation - float x = mMyLocationView.getX() + mMyLocationView.getWidth() / 2; - float y = mMyLocationView.getY() + mMyLocationView.getHeight() / 2; - mNativeMapView.setBearing(bearing, x / mScreenDensity, y / mScreenDensity); + // around gesture + setBearing(bearing, detector.getFocusX() / mScreenDensity, detector.getFocusY() / mScreenDensity); } return true; } @@ -1950,6 +2048,7 @@ public class MapView extends FrameLayout { mBeginTime = 0; mTotalDelta = 0.0f; mStarted = false; + mDragStarted = false; } @Override @@ -1988,6 +2087,8 @@ public class MapView extends FrameLayout { // Tilt the map mMapboxMap.setTilt(pitch); + mDragStarted = true; + return true; } } @@ -2409,6 +2510,13 @@ public class MapView extends FrameLayout { mMapboxMap.setMyLocationEnabled(true); } mMyLocationView.setMyLocationTrackingMode(myLocationTrackingMode); + + if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) { + setFocalPoint(new PointF(mMyLocationView.getCenterX(), mMyLocationView.getCenterY())); + } else { + setFocalPoint(null); + } + MapboxMap.OnMyLocationTrackingModeChangeListener listener = mMapboxMap.getOnMyLocationTrackingModeChangeListener(); if (listener != null) { listener.onMyLocationTrackingModeChange(myLocationTrackingMode); @@ -2514,45 +2622,19 @@ public class MapView extends FrameLayout { return mMapboxMap.getUiSettings().getAttributionTintColor(); } - // - // Custom layer - // - - @UiThread - void addCustomLayer(CustomLayer customLayer, String before) { - if (mDestroyed) { - return; - } - mNativeMapView.addCustomLayer(customLayer, before); - } - - @UiThread - void removeCustomLayer(String id) { - if (mDestroyed) { - return; - } - mNativeMapView.removeCustomLayer(id); - } - - @UiThread - void invalidateCustomLayers() { - if (mDestroyed) { - return; - } - mNativeMapView.update(); - } - /** * Sets a callback object which will be triggered when the {@link MapboxMap} instance is ready to be used. * * @param callback The callback object that will be triggered when the map is ready to be used. */ @UiThread - public void getMapAsync(@NonNull final OnMapReadyCallback callback) { - if (!mInitialLoad) { + public void getMapAsync(final OnMapReadyCallback callback) { + if (!mInitialLoad && callback != null) { callback.onMapReady(mMapboxMap); } else { - mOnMapReadyCallbackList.add(callback); + if (callback != null) { + mOnMapReadyCallbackList.add(callback); + } } } @@ -2568,20 +2650,55 @@ public class MapView extends FrameLayout { return mMyLocationView; } + NativeMapView getNativeMapView() { + return mNativeMapView; + } + + // + // Snapshot API + // + @UiThread void snapshot(@NonNull final MapboxMap.SnapshotReadyCallback callback, @Nullable final Bitmap bitmap) { - TextureView textureView = (TextureView) findViewById(R.id.textureView); - final boolean canUseBitmap = bitmap != null && textureView.getWidth() == bitmap.getWidth() && textureView.getHeight() == bitmap.getHeight(); + mSnapshotRequest = new SnapshotRequest(bitmap, callback); + mNativeMapView.scheduleTakeSnapshot(); + mNativeMapView.render(); + } - setDrawingCacheEnabled(true); - Bitmap content = Bitmap.createBitmap(getDrawingCache()); - setDrawingCacheEnabled(false); + // Called when the snapshot method was executed + // Called via JNI from NativeMapView + // Forward to any listeners + protected void onSnapshotReady(byte[] bytes) { + if (mSnapshotRequest != null && bytes != null) { + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inBitmap = mSnapshotRequest.getBitmap(); // the old Bitmap to be reused + options.inMutable = true; + options.inSampleSize = 1; + Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options); + + MapboxMap.SnapshotReadyCallback callback = mSnapshotRequest.getCallback(); + if (callback != null) { + callback.onSnapshotReady(bitmap); + } + } + } + + private class SnapshotRequest { + private Bitmap bitmap; + private MapboxMap.SnapshotReadyCallback callback; + + public SnapshotRequest(Bitmap bitmap, MapboxMap.SnapshotReadyCallback callback) { + this.bitmap = bitmap; + this.callback = callback; + } + + public Bitmap getBitmap() { + return bitmap; + } - Bitmap output = Bitmap.createBitmap(content.getWidth(), content.getHeight(), Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(output); - canvas.drawBitmap(canUseBitmap ? textureView.getBitmap(bitmap) : textureView.getBitmap(), 0, 0, null); - canvas.drawBitmap(content, new Matrix(), null); - callback.onSnapshotReady(output); + public MapboxMap.SnapshotReadyCallback getCallback() { + return callback; + } } // @@ -2700,41 +2817,6 @@ public class MapView extends FrameLayout { } /** - * Class responsible for managing state of Style loading. - */ - static class StyleInitializer { - - private String mStyle; - private boolean mDefaultStyle; - - StyleInitializer(@NonNull Context context) { - mStyle = Style.getMapboxStreetsUrl(context.getResources().getInteger(R.integer.style_version)); - mDefaultStyle = true; - } - - void setStyle(@NonNull String style) { - setStyle(style, false); - } - - void setStyle(@NonNull String style, boolean defaultStyle) { - if (style == null) { - // don't override default style - return; - } - mStyle = style; - mDefaultStyle = defaultStyle; - } - - public String getStyle() { - return mStyle; - } - - boolean isDefaultStyle() { - return mDefaultStyle; - } - } - - /** * Definition of a map change event. * * @see MapView.OnMapChangedListener#onMapChanged(int) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index fbe6a31f6a..26f13ed353 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -38,9 +38,10 @@ import com.mapbox.mapboxsdk.constants.MyBearingTracking; import com.mapbox.mapboxsdk.constants.MyLocationTracking; import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.layers.CustomLayer; -import com.mapbox.mapboxsdk.location.LocationListener; import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings; +import com.mapbox.mapboxsdk.style.layers.Layer; +import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException; +import com.mapbox.mapboxsdk.style.sources.Source; import java.lang.reflect.ParameterizedType; import java.util.ArrayList; @@ -53,10 +54,11 @@ import java.util.concurrent.TimeUnit; * you must obtain one from the getMapAsync() method on a MapFragment or MapView that you have * added to your application. * <p> - * Note: Similar to a View object, a GoogleMap should only be read and modified from the main thread. + * Note: Similar to a View object, a MapboxMap should only be read and modified from the main thread. * </p> */ public class MapboxMap { + private static final String TAG = MapboxMap.class.getSimpleName(); private MapView mMapView; private UiSettings mUiSettings; @@ -72,7 +74,6 @@ public class MapboxMap { private List<InfoWindow> mInfoWindows; private MapboxMap.InfoWindowAdapter mInfoWindowAdapter; - private Bitmap mViewMarkerBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888); private boolean mMyLocationEnabled; private boolean mAllowConcurrentMultipleInfoWindows; @@ -105,6 +106,54 @@ public class MapboxMap { mMarkerViewManager = new MarkerViewManager(this, mapView); } + // Style + + @Nullable + @UiThread + public Layer getLayer(@NonNull String layerId) { + return getMapView().getNativeMapView().getLayer(layerId); + } + + /** + * Tries to cast the Layer to T, returns null if it's another type + */ + @Nullable + @UiThread + public <T extends Layer> T getLayerAs(@NonNull String layerId) { + try { + //noinspection unchecked + return (T) getMapView().getNativeMapView().getLayer(layerId); + } catch (ClassCastException e) { + Log.e(TAG, String.format("Layer: %s is a different type: %s", layerId, e.getMessage())); + return null; + } + } + + @UiThread + public void addLayer(@NonNull Layer layer) { + addLayer(layer, null); + } + + @UiThread + public void addLayer(@NonNull Layer layer, String before) { + getMapView().getNativeMapView().addLayer(layer, before); + } + + @UiThread + public void removeLayer(@NonNull String layerId) throws NoSuchLayerException { + getMapView().getNativeMapView().removeLayer(layerId); + } + + @UiThread + public void addSource(@NonNull Source source) { + getMapView().getNativeMapView().addSource(source); + } + + @UiThread + public void removeSource(@NonNull String sourceId) { + getMapView().getNativeMapView().removeSource(sourceId); + } + // // MinZoom // @@ -291,7 +340,7 @@ public class MapboxMap { * it will return the current location of the camera in flight. * * @param update The change that should be applied to the camera. - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void easeCamera(CameraUpdate update) { @@ -306,7 +355,7 @@ public class MapboxMap { * @param update The change that should be applied to the camera. * @param durationMs The duration of the animation in milliseconds. This must be strictly * positive, otherwise an IllegalArgumentException will be thrown. - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void easeCamera(CameraUpdate update, int durationMs) { @@ -327,7 +376,7 @@ public class MapboxMap { * will be notified with onFinish(). If the animation stops due to interruption * by a later camera movement or a user gesture, onCancel() will be called. * Do not update or ease the camera from within onCancel(). - * @see {@link CameraUpdateFactory} for a set of camera updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void easeCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) { @@ -368,7 +417,7 @@ public class MapboxMap { * of the camera in flight. * * @param update The change that should be applied to the camera. - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void animateCamera(CameraUpdate update) { @@ -385,7 +434,7 @@ public class MapboxMap { * @param callback The callback to invoke from the main thread when the animation stops. If the * animation completes normally, onFinish() is called; otherwise, onCancel() is * called. Do not update or animate the camera from within onCancel(). - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void animateCamera(CameraUpdate update, MapboxMap.CancelableCallback callback) { @@ -401,7 +450,7 @@ public class MapboxMap { * @param update The change that should be applied to the camera. * @param durationMs The duration of the animation in milliseconds. This must be strictly * positive, otherwise an IllegalArgumentException will be thrown. - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void animateCamera(CameraUpdate update, int durationMs) { @@ -424,7 +473,7 @@ public class MapboxMap { * by a later camera movement or a user gesture, onCancel() will be called. * Do not update or animate the camera from within onCancel(). If a callback * isn't required, leave it as null. - * @see {@link CameraUpdateFactory} for a set of updates. + * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates. */ @UiThread public final void animateCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) { @@ -550,7 +599,7 @@ public class MapboxMap { * <li>{@code asset://...}: * reads the style from the APK {@code assets/} directory. * This is used to load a style bundled with your app.</li> - * <li>{@code null}: loads the default {@link Style#getMapboxStreetsUrl(int)} style.</li> + * <li>{@code null}: loads the default {@link Style#MAPBOX_STREETS} style.</li> * </ul> * <p> * This method is asynchronous and will return immediately before the style finishes loading. @@ -703,10 +752,11 @@ public class MapboxMap { @NonNull public MarkerView addMarker(@NonNull BaseMarkerViewOptions markerOptions) { MarkerView marker = prepareViewMarker(markerOptions); - long id = mMapView.addMarker(marker); marker.setMapboxMap(this); + long id = mMapView.addMarker(marker); marker.setId(id); mAnnotations.put(id, marker); + mMarkerViewManager.invalidateViewMarkersInBounds(); return marker; } @@ -777,6 +827,36 @@ public class MapboxMap { } /** + * Update a polygon on this map. + * + * @param polygon An updated polygon object. + */ + @UiThread + public void updatePolygon(Polygon polygon) { + mMapView.updatePolygon(polygon); + + int index = mAnnotations.indexOfKey(polygon.getId()); + if (index > -1) { + mAnnotations.setValueAt(index, polygon); + } + } + + /** + * Update a polyline on this map. + * + * @param polyline An updated polyline object. + */ + @UiThread + public void updatePolyline(Polyline polyline) { + mMapView.updatePolyline(polyline); + + int index = mAnnotations.indexOfKey(polyline.getId()); + if (index > -1) { + mAnnotations.setValueAt(index, polyline); + } + } + + /** * Adds a polyline to this map. * * @param polylineOptions A polyline options object that defines how to render the polyline. @@ -952,7 +1032,7 @@ public class MapboxMap { Marker marker = (Marker) annotation; marker.hideInfoWindow(); if (marker instanceof MarkerView) { - mMarkerViewManager.removeMarkerView((MarkerView) marker, true); + mMarkerViewManager.removeMarkerView((MarkerView) marker); } } long id = annotation.getId(); @@ -986,7 +1066,7 @@ public class MapboxMap { Marker marker = (Marker) annotation; marker.hideInfoWindow(); if (marker instanceof MarkerView) { - mMarkerViewManager.removeMarkerView((MarkerView) marker, true); + mMarkerViewManager.removeMarkerView((MarkerView) marker); } } ids[i] = annotationList.get(i).getId(); @@ -1012,7 +1092,7 @@ public class MapboxMap { Marker marker = (Marker) annotation; marker.hideInfoWindow(); if (marker instanceof MarkerView) { - mMarkerViewManager.removeMarkerView((MarkerView) marker, true); + mMarkerViewManager.removeMarkerView((MarkerView) marker); } } } @@ -1143,6 +1223,11 @@ public class MapboxMap { } if (!handledDefaultClick) { + if (marker instanceof MarkerView) { + mMarkerViewManager.select((MarkerView) marker, false); + mMarkerViewManager.ensureInfoWindowOffset((MarkerView) marker); + } + if (isInfoWindowValidForMarker(marker) || getInfoWindowAdapter() != null) { mInfoWindows.add(marker.showInfoWindow(this, mMapView)); } @@ -1166,7 +1251,7 @@ public class MapboxMap { } if (marker instanceof MarkerView) { - mMarkerViewManager.deselect((MarkerView) marker); + mMarkerViewManager.deselect((MarkerView) marker, false); } } @@ -1187,6 +1272,10 @@ public class MapboxMap { marker.hideInfoWindow(); } + if (marker instanceof MarkerView) { + mMarkerViewManager.deselect((MarkerView) marker, false); + } + mSelectedMarkers.remove(marker); } @@ -1209,7 +1298,11 @@ public class MapboxMap { private MarkerView prepareViewMarker(BaseMarkerViewOptions markerViewOptions) { MarkerView marker = markerViewOptions.getMarker(); - Icon icon = IconFactory.recreate("markerViewSettings", mViewMarkerBitmap); + + Icon icon = markerViewOptions.getIcon(); + if (icon == null) { + icon = IconFactory.getInstance(mMapView.getContext()).defaultMarkerView(); + } marker.setIcon(icon); return marker; } @@ -1287,9 +1380,11 @@ public class MapboxMap { // /** + * <p> * Sets the distance from the edges of the map view’s frame to the edges of the map * view’s logical viewport. - * <p/> + * </p> + * <p> * When the value of this property is equal to {0,0,0,0}, viewport * properties such as `centerCoordinate` assume a viewport that matches the map * view’s frame. Otherwise, those properties are inset, excluding part of the @@ -1533,10 +1628,8 @@ public class MapboxMap { * * @param listener The callback that's invoked when the user clicks on a marker. * To unset the callback, use null. - * @deprecated As of release 4.1.0, replaced by {@link com.mapbox.mapboxsdk.location.LocationServices#addLocationListener(LocationListener)})} */ @UiThread - @Deprecated public void setOnMyLocationChangeListener(@Nullable MapboxMap.OnMyLocationChangeListener listener) { mMapView.setOnMyLocationChangeListener(listener); } @@ -1573,34 +1666,6 @@ public class MapboxMap { return mOnMyBearingTrackingModeChangeListener; } - // - // Custom layer - // - - /** - * Do not use this method, experimental feature. - */ - @UiThread - public void addCustomLayer(CustomLayer customLayer, String before) { - mMapView.addCustomLayer(customLayer, before); - } - - /** - * Do not use this method, experimental feature. - */ - @UiThread - public void removeCustomLayer(String id) { - mMapView.removeCustomLayer(id); - } - - /** - * Do not use this method, experimental feature. - */ - @UiThread - public void invalidateCustomLayers() { - mMapView.invalidateCustomLayers(); - } - MapView getMapView() { return mMapView; } @@ -1621,7 +1686,7 @@ public class MapboxMap { * Triggers an invalidation of the map view. */ public void invalidate() { - mMapView.update(); + mMapView.invalidate(); } /** @@ -1826,7 +1891,7 @@ public class MapboxMap { public MarkerViewAdapter(Context context) { this.context = context; persistentClass = (Class<U>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; - mViewReusePool = new Pools.SimplePool<>(20); + mViewReusePool = new Pools.SimplePool<>(10000); } /** @@ -1841,11 +1906,56 @@ public class MapboxMap { public abstract View getView(@NonNull U marker, @NonNull View convertView, @NonNull ViewGroup parent); /** + * Called when an MarkerView is removed from the MapView or the View object is going to be reused. + * <p> + * <p> + * This method should be used to reset an animated view back to it's original state for view reuse. + * </p> + * <p> + * Returning true indicates you want to the view reuse to be handled automatically. + * Returning false indicates you want to perform an animation and you are required calling {@link #releaseView(View)} yourself. + * </p> + * + * @param marker the model representing the MarkerView + * @param convertView the reusable view + * @return true if you want reuse to occur automatically, false if you want to manage this yourself. + */ + public boolean prepareViewForReuse(@NonNull MarkerView marker, @NonNull View convertView) { + return true; + } + + /** + * Called when a MarkerView is selected from the MapView. + * <p> + * Returning true from this method indicates you want to move the MarkerView to the selected state. + * Returning false indicates you want to animate the View first an manually select the MarkerView when appropriate. + * </p> + * + * @param marker the model representing the MarkerView + * @param convertView the reusable view + * @param reselectionFromRecycling indicates if the onSelect callback is the initial selection + * callback or that selection occurs due to recreation of selected marker + * @return true if you want to select the Marker immediately, false if you want to manage this yourself. + */ + public boolean onSelect(@NonNull U marker, @NonNull View convertView, boolean reselectionFromRecycling) { + return true; + } + + /** + * Called when a MarkerView is deselected from the MapView. + * + * @param marker the model representing the MarkerView + * @param convertView the reusable view + */ + public void onDeselect(@NonNull U marker, @NonNull View convertView) { + } + + /** * Returns the generic type of the used MarkerView. * * @return the generic type */ - public Class<U> getMarkerClass() { + public final Class<U> getMarkerClass() { return persistentClass; } @@ -1854,7 +1964,7 @@ public class MapboxMap { * * @return the pool associated to this adapter */ - public Pools.SimplePool<View> getViewReusePool() { + public final Pools.SimplePool<View> getViewReusePool() { return mViewReusePool; } @@ -1863,9 +1973,19 @@ public class MapboxMap { * * @return the context used */ - public Context getContext() { + public final Context getContext() { return context; } + + /** + * Release a View to the ViewPool. + * + * @param view the view to be released + */ + public final void releaseView(View view) { + view.setVisibility(View.GONE); + mViewReusePool.release(view); + } } /** @@ -1890,9 +2010,7 @@ public class MapboxMap { * Interface definition for a callback to be invoked when the the My Location view changes location. * * @see MapboxMap#setOnMyLocationChangeListener(OnMyLocationChangeListener) - * @deprecated As of release 4.1.0, replaced by {@link com.mapbox.mapboxsdk.location.LocationListener} */ - @Deprecated public interface OnMyLocationChangeListener { /** * Called when the location of the My Location view has changed diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index 17593129e7..0fd6b1390d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -13,10 +13,12 @@ import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.Gravity; + import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.utils.ColorUtils; + import java.util.Arrays; /** @@ -176,17 +178,17 @@ public class MapboxMapOptions implements Parcelable { mapboxMapOptions.myLocationBackgroundTintColor(typedArray.getColor(R.styleable.MapView_my_location_background_tint, Color.TRANSPARENT)); Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.MapView_my_location_foreground); - if(foregroundDrawable==null){ - foregroundDrawable = ContextCompat.getDrawable(context,R.drawable.ic_mylocationview_normal); + if (foregroundDrawable == null) { + foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.ic_mylocationview_normal); } Drawable foregroundBearingDrawable = typedArray.getDrawable(R.styleable.MapView_my_location_foreground_bearing); - if(foregroundBearingDrawable==null){ - foregroundBearingDrawable = ContextCompat.getDrawable(context,R.drawable.ic_mylocationview_bearing); + if (foregroundBearingDrawable == null) { + foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.ic_mylocationview_bearing); } Drawable backgroundDrawable = typedArray.getDrawable(R.styleable.MapView_my_location_background); - if(backgroundDrawable==null){ + if (backgroundDrawable == null) { backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.ic_mylocationview_background); } @@ -223,6 +225,7 @@ public class MapboxMapOptions implements Parcelable { * * @param accessToken Token to be used to access the service * @return This + * @deprecated As of release 4.1.0, replaced by {@link com.mapbox.mapboxsdk.MapboxAccountManager#start(Context, String)} */ @Deprecated public MapboxMapOptions accessToken(String accessToken) { @@ -451,19 +454,39 @@ public class MapboxMapOptions implements Parcelable { } /** + * Set the foreground drawables of the MyLocationView. * - * @param myLocationForegroundDrawable - * @param myLocationBearingDrawable + * @param myLocationForegroundDrawable the drawable to show as foreground without bearing + * @param myLocationBearingDrawable the drawable to show as foreground when bearing is disabled * @return This */ - public MapboxMapOptions myLocationForegroundDrawables(Drawable myLocationForegroundDrawable, Drawable myLocationBearingDrawable ) { + public MapboxMapOptions myLocationForegroundDrawables(Drawable myLocationForegroundDrawable, Drawable myLocationBearingDrawable) { this.myLocationForegroundDrawable = myLocationForegroundDrawable; this.myLocationForegroundBearingDrawable = myLocationBearingDrawable; return this; } /** - * @param myLocationBackgroundDrawable + * Set the foreground drawable of the MyLocationView. + * <p> + * The same drawable will be used for both bearing as non bearing modes. + * </p> + * + * @param myLocationForegroundDrawable the drawable to show as foreground + * @return This + */ + public MapboxMapOptions myLocationForegroundDrawable(Drawable myLocationForegroundDrawable) { + this.myLocationForegroundDrawable = myLocationForegroundDrawable; + return this; + } + + /** + * Set the background drawable of MyLocationView. + * <p> + * Padding can be added to provide an offset to the background. + * </p> + * + * @param myLocationBackgroundDrawable the drawable to show as background * @return This */ public MapboxMapOptions myLocationBackgroundDrawable(Drawable myLocationBackgroundDrawable) { @@ -472,7 +495,12 @@ public class MapboxMapOptions implements Parcelable { } /** - * @param myLocationForegroundTintColor + * Set the foreground tint color of MyLocationView. + * <p> + * The color will tint both the foreground and the bearing foreground drawable. + * </p> + * + * @param myLocationForegroundTintColor the color to tint the foreground drawable * @return This */ public MapboxMapOptions myLocationForegroundTintColor(@ColorInt int myLocationForegroundTintColor) { @@ -481,7 +509,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * @param myLocationBackgroundTintColor + * Set the background tint color of MyLocationView. + * + * @param myLocationBackgroundTintColor the color to tint the background * @return This */ public MapboxMapOptions myLocationBackgroundTintColor(@ColorInt int myLocationBackgroundTintColor) { @@ -490,7 +520,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * @param myLocationBackgroundPadding + * Set the MyLocationView padding. + * + * @param myLocationBackgroundPadding the color to tint the background * @return This */ public MapboxMapOptions myLocationBackgroundPadding(int[] myLocationBackgroundPadding) { @@ -499,7 +531,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * @param myLocationAccuracyTintColor + * Set the MyLocationView accuracy circle tint color. + * + * @param myLocationAccuracyTintColor the color to tint the accuracy circle * @return This */ public MapboxMapOptions myLocationAccuracyTint(@ColorInt int myLocationAccuracyTintColor) { @@ -508,7 +542,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * @param alpha + * Set the MyLocationView accuracy alpha value. + * + * @param alpha the alpha value * @return This */ public MapboxMapOptions myLocationAccuracyAlpha(@IntRange(from = 0, to = 255) int alpha) { @@ -691,6 +727,11 @@ public class MapboxMapOptions implements Parcelable { return attributionMargins; } + /** + * Get the current configured tint color for attribution for a map view. + * + * @return the tint color + */ @ColorInt public int getAttributionTintColor() { return attributionTintColor; @@ -706,56 +747,72 @@ public class MapboxMapOptions implements Parcelable { } /** - * @return + * Get the current configured MyLocationView foreground drawable. + * + * @return the drawable used as foreground */ public Drawable getMyLocationForegroundDrawable() { return myLocationForegroundDrawable; } /** - * @return + * Get the current configured MyLocationView foreground bearing drawable. + * + * @return the drawable used as foreground when bearing is enabled */ public Drawable getMyLocationForegroundBearingDrawable() { return myLocationForegroundBearingDrawable; } /** - * @return + * Get the current configured MyLocationView background drawable. + * + * @return the drawable used as background */ public Drawable getMyLocationBackgroundDrawable() { return myLocationBackgroundDrawable; } /** - * @return + * Get the current configured MyLocationView foreground tint color. + * + * @return the tint color */ public int getMyLocationForegroundTintColor() { return myLocationForegroundTintColor; } /** - * @return + * Get the current configured MyLocationView background tint color. + * + * @return the tint color */ public int getMyLocationBackgroundTintColor() { return myLocationBackgroundTintColor; } /** - * @return + * Get the current configured MyLocationView background padding. + * + * @return an array describing the padding in a LTRB manner */ public int[] getMyLocationBackgroundPadding() { return myLocationBackgroundPadding; } /** - * @return + * Get the current configured MyLocationView accuracy circle color tint value. + * + * @return the tint color */ public int getMyLocationAccuracyTintColor() { return myLocationAccuracyTintColor; } /** - * @return + * Get the current configured MyLocationView accuracy circle alpha value. + * + * @return the alpha value */ public int getMyLocationAccuracyAlpha() { return myLocationAccuracyAlpha; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 6c092ee0c8..929f515d8d 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -5,15 +5,21 @@ import android.content.Context; import android.graphics.PointF; import android.graphics.RectF; import android.os.Build; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.view.Surface; +import com.mapbox.mapboxsdk.annotations.Icon; import com.mapbox.mapboxsdk.annotations.Marker; import com.mapbox.mapboxsdk.annotations.Polygon; import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.geometry.ProjectedMeters; -import com.mapbox.mapboxsdk.layers.CustomLayer; +import com.mapbox.mapboxsdk.offline.OfflineManager; +import com.mapbox.mapboxsdk.style.layers.Layer; +import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException; +import com.mapbox.mapboxsdk.style.sources.Source; import java.util.List; @@ -50,7 +56,7 @@ final class NativeMapView { public NativeMapView(MapView mapView) { Context context = mapView.getContext(); - String dataPath = context.getFilesDir().getAbsolutePath(); + String dataPath = OfflineManager.getDatabasePath(context); // With the availability of offline, we're unifying the ambient (cache) and the offline // databases to be in the same folder, outside cache, to avoid automatic deletion from @@ -230,7 +236,7 @@ final class NativeMapView { } public void setLatLng(LatLng latLng, long duration) { - nativeSetLatLng(mNativeMapViewPtr, latLng, duration); + nativeSetLatLng(mNativeMapViewPtr, latLng.getLatitude(), latLng.getLongitude(), duration); } public LatLng getLatLng() { @@ -343,7 +349,7 @@ final class NativeMapView { } public long addMarker(Marker marker) { - Marker[] markers = { marker }; + Marker[] markers = {marker}; return nativeAddMarkers(mNativeMapViewPtr, markers)[0]; } @@ -352,7 +358,7 @@ final class NativeMapView { } public long addPolyline(Polyline polyline) { - Polyline[] polylines = { polyline }; + Polyline[] polylines = {polyline}; return nativeAddPolylines(mNativeMapViewPtr, polylines)[0]; } @@ -361,7 +367,7 @@ final class NativeMapView { } public long addPolygon(Polygon polygon) { - Polygon[] polygons = { polygon }; + Polygon[] polygons = {polygon}; return nativeAddPolygons(mNativeMapViewPtr, polygons)[0]; } @@ -370,11 +376,25 @@ final class NativeMapView { } public void updateMarker(Marker marker) { - nativeUpdateMarker(mNativeMapViewPtr, marker); + LatLng position = marker.getPosition(); + Icon icon = marker.getIcon(); + nativeUpdateMarker(mNativeMapViewPtr, marker.getId(), position.getLatitude(), position.getLongitude(), icon.getId()); + } + + public void updatePolygon(Polygon polygon) { + //TODO remove new id assignment, https://github.com/mapbox/mapbox-gl-native/issues/5844 + long newId = nativeUpdatePolygon(mNativeMapViewPtr, polygon.getId(), polygon); + polygon.setId(newId); + } + + public void updatePolyline(Polyline polyline) { + //TODO remove new id assignment, https://github.com/mapbox/mapbox-gl-native/issues/5844 + long newId = nativeUpdatePolyline(mNativeMapViewPtr, polyline.getId(), polyline); + polyline.setId(newId); } public void removeAnnotation(long id) { - long[] ids = { id }; + long[] ids = {id}; removeAnnotations(ids); } @@ -423,19 +443,19 @@ final class NativeMapView { } public ProjectedMeters projectedMetersForLatLng(LatLng latLng) { - return nativeProjectedMetersForLatLng(mNativeMapViewPtr, latLng); + return nativeProjectedMetersForLatLng(mNativeMapViewPtr, latLng.getLatitude(), latLng.getLongitude()); } public LatLng latLngForProjectedMeters(ProjectedMeters projectedMeters) { - return nativeLatLngForProjectedMeters(mNativeMapViewPtr, projectedMeters); + return nativeLatLngForProjectedMeters(mNativeMapViewPtr, projectedMeters.getNorthing(), projectedMeters.getEasting()); } public PointF pixelForLatLng(LatLng latLng) { - return nativePixelForLatLng(mNativeMapViewPtr, latLng); + return nativePixelForLatLng(mNativeMapViewPtr, latLng.getLatitude(), latLng.getLongitude()); } public LatLng latLngForPixel(PointF pixel) { - return nativeLatLngForPixel(mNativeMapViewPtr, pixel); + return nativeLatLngForPixel(mNativeMapViewPtr, pixel.x, pixel.y); } public double getTopOffsetPixelsForAnnotationSymbol(String symbolName) { @@ -443,27 +463,46 @@ final class NativeMapView { } public void jumpTo(double angle, LatLng center, double pitch, double zoom) { - nativeJumpTo(mNativeMapViewPtr, angle, center, pitch, zoom); + nativeJumpTo(mNativeMapViewPtr, angle, center.getLatitude(), center.getLongitude(), pitch, zoom); } public void easeTo(double angle, LatLng center, long duration, double pitch, double zoom, boolean easingInterpolator) { - nativeEaseTo(mNativeMapViewPtr, angle, center, duration, pitch, zoom, easingInterpolator); + nativeEaseTo(mNativeMapViewPtr, angle, center.getLatitude(), center.getLongitude(), duration, pitch, zoom, easingInterpolator); } public void flyTo(double angle, LatLng center, long duration, double pitch, double zoom) { - nativeFlyTo(mNativeMapViewPtr, angle, center, duration, pitch, zoom); + nativeFlyTo(mNativeMapViewPtr, angle, center.getLatitude(), center.getLongitude(), duration, pitch, zoom); } - public void addCustomLayer(CustomLayer customLayer, String before) { - nativeAddCustomLayer(mNativeMapViewPtr, customLayer, before); + public double[] getCameraValues() { + return nativeGetCameraValues(mNativeMapViewPtr); } - public void removeCustomLayer(String id) { - nativeRemoveCustomLayer(mNativeMapViewPtr, id); + // Runtime style Api + + public Layer getLayer(String layerId) { + return nativeGetLayer(mNativeMapViewPtr, layerId); } - public double[] getCameraValues(){ - return nativeGetCameraValues(mNativeMapViewPtr); + public void addLayer(@NonNull Layer layer, @Nullable String before) { + nativeAddLayer(mNativeMapViewPtr, layer.getNativePtr(), before); + layer.invalidate(); + } + + public void removeLayer(@NonNull String layerId) throws NoSuchLayerException { + nativeRemoveLayer(mNativeMapViewPtr, layerId); + } + + public void addSource(@NonNull Source source) { + nativeAddSource(mNativeMapViewPtr, source.getId(), source); + } + + public void removeSource(@NonNull String sourceId) { + nativeRemoveSource(mNativeMapViewPtr, sourceId); + } + + public void scheduleTakeSnapshot() { + nativeScheduleTakeSnapshot(mNativeMapViewPtr); } // @@ -482,6 +521,10 @@ final class NativeMapView { mMapView.onFpsChanged(fps); } + protected void onSnapshotReady(byte[] bytes) { + mMapView.onSnapshotReady(bytes); + } + // // JNI methods // @@ -539,7 +582,7 @@ final class NativeMapView { private native void nativeMoveBy(long nativeMapViewPtr, double dx, double dy, long duration); - private native void nativeSetLatLng(long nativeMapViewPtr, LatLng latLng, + private native void nativeSetLatLng(long nativeMapViewPtr, double latitude, double longitude, long duration); private native LatLng nativeGetLatLng(long nativeMapViewPtr); @@ -588,7 +631,7 @@ final class NativeMapView { private native void nativeResetNorth(long nativeMapViewPtr); - private native void nativeUpdateMarker(long nativeMapViewPtr, Marker marker); + private native void nativeUpdateMarker(long nativeMapViewPtr, long markerId, double lat, double lon, String iconId); private native long[] nativeAddMarkers(long nativeMapViewPtr, Marker[] markers); @@ -620,25 +663,37 @@ final class NativeMapView { private native double nativeGetMetersPerPixelAtLatitude(long nativeMapViewPtr, double lat, double zoom); - private native ProjectedMeters nativeProjectedMetersForLatLng(long nativeMapViewPtr, LatLng latLng); + private native ProjectedMeters nativeProjectedMetersForLatLng(long nativeMapViewPtr, double latitude, double longitude); - private native LatLng nativeLatLngForProjectedMeters(long nativeMapViewPtr, ProjectedMeters projectedMeters); + private native LatLng nativeLatLngForProjectedMeters(long nativeMapViewPtr, double northing, double easting); - private native PointF nativePixelForLatLng(long nativeMapViewPtr, LatLng latLng); + private native PointF nativePixelForLatLng(long nativeMapViewPtr, double lat, double lon); - private native LatLng nativeLatLngForPixel(long nativeMapViewPtr, PointF pixel); + private native LatLng nativeLatLngForPixel(long nativeMapViewPtr, float x, float y); private native double nativeGetTopOffsetPixelsForAnnotationSymbol(long nativeMapViewPtr, String symbolName); - private native void nativeJumpTo(long nativeMapViewPtr, double angle, LatLng center, double pitch, double zoom); + private native void nativeJumpTo(long nativeMapViewPtr, double angle, double latitude, double longitude, double pitch, double zoom); - private native void nativeEaseTo(long nativeMapViewPtr, double angle, LatLng center, long duration, double pitch, double zoom, boolean easingInterpolator); + private native void nativeEaseTo(long nativeMapViewPtr, double angle, double latitude, double longitude, long duration, double pitch, double zoom, boolean easingInterpolator); - private native void nativeFlyTo(long nativeMapViewPtr, double angle, LatLng center, long duration, double pitch, double zoom); + private native void nativeFlyTo(long nativeMapViewPtr, double angle, double latitude, double longitude, long duration, double pitch, double zoom); - private native void nativeAddCustomLayer(long nativeMapViewPtr, CustomLayer customLayer, String before); + private native double[] nativeGetCameraValues(long mNativeMapViewPtr); - private native void nativeRemoveCustomLayer(long nativeMapViewPtr, String id); + private native Layer nativeGetLayer(long nativeMapViewPtr, String layerId); - private native double[] nativeGetCameraValues(long mNativeMapViewPtr); + private native void nativeAddLayer(long nativeMapViewPtr, long layerPtr, String before); + + private native void nativeRemoveLayer(long nativeMapViewPtr, String layerId) throws NoSuchLayerException; + + private native void nativeAddSource(long mNativeMapViewPtr, String id, Source source); + + private native void nativeRemoveSource(long mNativeMapViewPtr, String sourceId); + + private native long nativeUpdatePolygon(long nativeMapViewPtr, long polygonId, Polygon polygon); + + private native long nativeUpdatePolyline(long nativeMapviewPtr, long polylineId, Polyline polyline); + + private native void nativeScheduleTakeSnapshot(long nativeMapViewPtr); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java index d37c3a02ea..a41b2606a5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java @@ -31,7 +31,7 @@ public class Projection { * @param latitude The latitude for which to return the value. * @return The distance measured in meters. */ - public double getMetersPerPixelAtLatitude(@FloatRange(from = -180, to = 180) double latitude) { + public double getMetersPerPixelAtLatitude(@FloatRange(from = -90, to = 90) double latitude) { return mMapView.getMetersPerPixelAtLatitude(latitude); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java index 30492bc421..f2a49f102b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java @@ -101,7 +101,7 @@ public class TrackingSettings { * * @return True to indicate the tracking modes will be dismissed. * @deprecated use @link #isAllDismissTrackingOnGestureinstead - */ + */ @Deprecated public boolean isDismissTrackingOnGesture() { return dismissLocationTrackingOnGesture && dismissBearingTrackingOnGesture; @@ -215,7 +215,7 @@ public class TrackingSettings { private void validateGesturesForBearingTrackingMode() { int myBearingTrackingMode = getMyBearingTrackingMode(); if (!dismissBearingTrackingOnGesture) { - if (myBearingTrackingMode == MyBearingTracking.NONE) { + if (myBearingTrackingMode == MyBearingTracking.NONE || myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) { uiSettings.setRotateGesturesEnabled(true); } else { uiSettings.setRotateGesturesEnabled(false); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index 3cd9efb13e..4ce631fc3e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -1,7 +1,9 @@ package com.mapbox.mapboxsdk.maps; +import android.graphics.PointF; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.UiThread; import android.view.Gravity; import android.view.View; @@ -33,6 +35,10 @@ public class UiSettings { private boolean zoomControlsEnabled; + private boolean deselectMarkersOnTap = true; + + private PointF focalPoint; + UiSettings(@NonNull MapView mapView) { this.mapView = mapView; this.compassSettings = new ViewSettings(); @@ -484,6 +490,26 @@ public class UiSettings { } /** + * Gets whether the markers are automatically deselected (and therefore, their infowindows + * closed) when a map tap is detected. + + * @return If true, markers are deselected on a map tap. + */ + public boolean isDeselectMarkersOnTap() { + return deselectMarkersOnTap; + } + + /** + * Sets whether the markers are automatically deselected (and therefore, their infowindows + * closed) when a map tap is detected. + * + * @param deselectMarkersOnTap + */ + public void setDeselectMarkersOnTap(boolean deselectMarkersOnTap) { + this.deselectMarkersOnTap = deselectMarkersOnTap; + } + + /** * <p> * Changes whether the user may scroll around the map. * </p> @@ -542,6 +568,25 @@ public class UiSettings { } /** + * Sets the focal point used as center for a gesture + * + * @param focalPoint the focal point to be used. + */ + public void setFocalPoint(@Nullable PointF focalPoint) { + this.focalPoint = focalPoint; + mapView.setFocalPoint(focalPoint); + } + + /** + * Returns the gesture focal point + * + * @return The focal point + */ + public PointF getFocalPoint() { + return focalPoint; + } + + /** * Returns the measured height of the MapView * * @return height in pixels diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java index aed4e87c07..a37a717482 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java @@ -1,10 +1,11 @@ package com.mapbox.mapboxsdk.maps.widgets; -import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; +import android.graphics.Camera; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.PointF; import android.graphics.PorterDuff; @@ -15,6 +16,8 @@ import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.location.Location; +import android.os.Bundle; +import android.os.Parcelable; import android.os.SystemClock; import android.support.annotation.ColorInt; import android.support.annotation.FloatRange; @@ -22,8 +25,8 @@ import android.support.annotation.IntRange; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; +import android.view.ViewGroup; -import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.MyBearingTracking; @@ -33,7 +36,6 @@ import com.mapbox.mapboxsdk.location.LocationListener; import com.mapbox.mapboxsdk.location.LocationServices; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Projection; -import com.mapbox.mapboxsdk.maps.UiSettings; import java.lang.ref.WeakReference; @@ -45,7 +47,6 @@ public class MyLocationView extends View { private MyLocationBehavior myLocationBehavior; private MapboxMap mapboxMap; private Projection projection; - private int maxSize; private int[] contentPadding = new int[4]; private Location location; @@ -57,12 +58,20 @@ public class MyLocationView extends View { private float gpsDirection; private float previousDirection; - private float accuracy = 0; - private Paint accuracyPaint = new Paint(); + private float accuracy; + private Paint accuracyPaint; private ValueAnimator locationChangeAnimator; private ValueAnimator accuracyAnimator; - private ObjectAnimator directionAnimator; + private ValueAnimator directionAnimator; + + private ValueAnimator.AnimatorUpdateListener invalidateSelfOnUpdateListener = + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + invalidate(); + } + }; private Drawable foregroundDrawable; private Drawable foregroundBearingDrawable; @@ -79,6 +88,14 @@ public class MyLocationView extends View { private int backgroundOffsetRight; private int backgroundOffsetBottom; + private Matrix matrix; + private Camera camera; + private PointF screenLocation; + + // camera vars + private float bearing; + private float tilt; + @MyLocationTracking.Mode private int myLocationTrackingMode; @@ -104,16 +121,44 @@ public class MyLocationView extends View { } private void init(Context context) { + if(isInEditMode()){ + return; + } + setEnabled(false); + + // setup LayoutParams + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + setLayoutParams(lp); + + matrix = new Matrix(); + camera = new Camera(); + camera.setLocation(0, 0, -1000); + accuracyPaint = new Paint(); + myLocationBehavior = new MyLocationBehaviorFactory().getBehavioralModel(MyLocationTracking.TRACKING_NONE); compassListener = new CompassListener(context); - maxSize = (int) context.getResources().getDimension(R.dimen.my_locationview_size); } public final void setForegroundDrawables(Drawable defaultDrawable, Drawable bearingDrawable) { - if (defaultDrawable == null || bearingDrawable == null) { + if (defaultDrawable == null) { return; } + + if (bearingDrawable == null) { + // if user only provided one resource + // use same for bearing mode + bearingDrawable = defaultDrawable.getConstantState().newDrawable(); + } + + if (backgroundDrawable == null) { + // if the user didn't provide a background resource we will use the foreground resource instead, + // we need to create a new drawable to handle tinting correctly + backgroundDrawable = defaultDrawable.getConstantState().newDrawable(); + } + if (defaultDrawable.getIntrinsicWidth() != bearingDrawable.getIntrinsicWidth() || defaultDrawable.getIntrinsicHeight() != bearingDrawable.getIntrinsicHeight()) { throw new RuntimeException("The dimensions from location and bearing drawables should be match"); } @@ -151,7 +196,6 @@ public class MyLocationView extends View { backgroundOffsetTop = top; backgroundOffsetRight = right; backgroundOffsetBottom = bottom; - setShadowDrawableTint(backgroundTintColor); invalidateBounds(); @@ -187,19 +231,18 @@ public class MyLocationView extends View { int backgroundWidth = backgroundDrawable.getIntrinsicWidth(); int backgroundHeight = backgroundDrawable.getIntrinsicHeight(); - - int foregroundWidth = foregroundDrawable.getIntrinsicWidth(); - int foregroundHeight = foregroundDrawable.getIntrinsicHeight(); - int horizontalOffset = backgroundOffsetLeft - backgroundOffsetRight; int verticalOffset = backgroundOffsetTop - backgroundOffsetBottom; + backgroundBounds = new Rect(-backgroundWidth / 2 + horizontalOffset, -backgroundHeight / 2 + verticalOffset, backgroundWidth / 2 + horizontalOffset, backgroundHeight / 2 + verticalOffset); + backgroundDrawable.setBounds(backgroundBounds); - int accuracyWidth = 2 * maxSize; - - backgroundBounds = new Rect(accuracyWidth - (backgroundWidth / 2) + horizontalOffset, accuracyWidth + verticalOffset - (backgroundWidth / 2), accuracyWidth + (backgroundWidth / 2) + horizontalOffset, accuracyWidth + (backgroundHeight / 2) + verticalOffset); - foregroundBounds = new Rect(accuracyWidth - (foregroundWidth / 2), accuracyWidth - (foregroundHeight / 2), accuracyWidth + (foregroundWidth / 2), accuracyWidth + (foregroundHeight / 2)); + int foregroundWidth = foregroundDrawable.getIntrinsicWidth(); + int foregroundHeight = foregroundDrawable.getIntrinsicHeight(); + foregroundBounds = new Rect(-foregroundWidth / 2, -foregroundHeight / 2, foregroundWidth / 2, foregroundHeight / 2); + foregroundDrawable.setBounds(foregroundBounds); + foregroundBearingDrawable.setBounds(foregroundBounds); - // invoke a new measure + // invoke a new draw invalidate(); } @@ -207,23 +250,51 @@ public class MyLocationView extends View { protected void onDraw(Canvas canvas) { super.onDraw(canvas); - if (location == null || foregroundBounds == null || backgroundBounds == null || accuracyAnimator == null) { + if (location == null || foregroundBounds == null || backgroundBounds == null || accuracyAnimator == null || screenLocation == null) { // Not ready yet return; } - // Draw circle + final PointF pointF = screenLocation; + float metersPerPixel = (float) projection.getMetersPerPixelAtLatitude(location.getLatitude()); - float accuracyPixels = (Float) accuracyAnimator.getAnimatedValue() / metersPerPixel; + float accuracyPixels = (Float) accuracyAnimator.getAnimatedValue() / metersPerPixel / 2; float maxRadius = getWidth() / 2; - canvas.drawCircle(foregroundBounds.centerX(), foregroundBounds.centerY(), accuracyPixels <= maxRadius ? accuracyPixels : maxRadius, accuracyPaint); + accuracyPixels = accuracyPixels <= maxRadius ? accuracyPixels : maxRadius; + + // put matrix in origin + matrix.reset(); + + // apply tilt to camera + camera.save(); + camera.rotate(tilt, 0, bearing); + + // map camera matrix on our matrix + camera.getMatrix(matrix); + + // + if (myBearingTrackingMode != MyBearingTracking.NONE && directionAnimator != null) { + matrix.preRotate((Float) directionAnimator.getAnimatedValue()); + } + + // put matrix at location of MyLocationView + matrix.postTranslate(pointF.x, pointF.y); + + // concat our matrix on canvas + canvas.concat(matrix); - // Draw shadow + // restore orientation from camera + camera.restore(); + + // draw circle + canvas.drawCircle(0, 0, accuracyPixels, accuracyPaint); + + // draw shadow if (backgroundDrawable != null) { backgroundDrawable.draw(canvas); } - // Draw foreground + // draw foreground if (myBearingTrackingMode == MyBearingTracking.NONE) { if (foregroundDrawable != null) { foregroundDrawable.draw(canvas); @@ -233,31 +304,17 @@ public class MyLocationView extends View { } } - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - - if (foregroundDrawable != null && foregroundBounds != null) { - foregroundDrawable.setBounds(foregroundBounds); - } - - if (foregroundBearingDrawable != null && foregroundBounds != null) { - foregroundBearingDrawable.setBounds(foregroundBounds); - } - - if (backgroundDrawable != null && backgroundBounds != null) { - backgroundDrawable.setBounds(backgroundBounds); - } - - setMeasuredDimension(4 * maxSize, 4 * maxSize); + public void setTilt(@FloatRange(from = 0, to = 60.0f) double tilt) { + this.tilt = (float) tilt; } - public void setTilt(@FloatRange(from = 0, to = 60.0f) double tilt) { - setRotationX((float) tilt); + public void setBearing(double bearing) { + this.bearing = (float) bearing; } - void updateOnNextFrame() { - mapboxMap.invalidate(); + public void setCameraPosition(CameraPosition position) { + setTilt(position.tilt); + setBearing(position.bearing); } public void onPause() { @@ -294,6 +351,24 @@ public class MyLocationView extends View { toggleGps(enabled); } + @Override + protected Parcelable onSaveInstanceState() { + Bundle bundle = new Bundle(); + bundle.putParcelable("superState", super.onSaveInstanceState()); + bundle.putFloat("tilt", tilt); + return bundle; + } + + @Override + public void onRestoreInstanceState(Parcelable state){ + if (state instanceof Bundle){ + Bundle bundle = (Bundle) state; + tilt = bundle.getFloat("tilt"); + state = bundle.getParcelable("superState"); + } + super.onRestoreInstanceState(state); + } + /** * Enabled / Disable GPS location updates along with updating the UI * @@ -345,7 +420,7 @@ public class MyLocationView extends View { compassListener.onPause(); if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) { // always face north - gpsDirection = 0; + gpsDirection = bearing; setCompass(gpsDirection); } } @@ -385,8 +460,9 @@ public class MyLocationView extends View { } previousDirection = newDir; - directionAnimator = ObjectAnimator.ofFloat(this, View.ROTATION, oldDir, newDir); - directionAnimator.setDuration(1000); + directionAnimator = ValueAnimator.ofFloat(oldDir, newDir); + directionAnimator.setDuration(375); + directionAnimator.addUpdateListener(invalidateSelfOnUpdateListener); directionAnimator.start(); } @@ -469,29 +545,24 @@ public class MyLocationView extends View { return; } - long currentTime = SystemClock.elapsedRealtime(); - if (currentTime < mCompassUpdateNextTimestamp) { - return; - } - int type = event.sensor.getType(); - float[] data; if (type == Sensor.TYPE_ACCELEROMETER) { - data = mGData; + System.arraycopy(event.values, 0, mGData, 0, 3); } else if (type == Sensor.TYPE_MAGNETIC_FIELD) { - data = mMData; + System.arraycopy(event.values, 0, mMData, 0, 3); } else { // we should not be here. return; } - for (int i = 0; i < 3; i++) { - data[i] = event.values[i]; + long currentTime = SystemClock.elapsedRealtime(); + if (currentTime < mCompassUpdateNextTimestamp) { + return; } SensorManager.getRotationMatrix(mR, mI, mGData, mMData); SensorManager.getOrientation(mR, mOrientation); - setCompass((int) (mOrientation[0] * 180.0f / Math.PI)); + setCompass(mCurrentDegree = (int) (mOrientation[0] * 180.0f / Math.PI)); mCompassUpdateNextTimestamp = currentTime + UPDATE_RATE_MS; } @@ -530,7 +601,7 @@ public class MyLocationView extends View { double latitude = fromLat + (toLat - fromLat) * frac; double longitude = fromLng + (toLng - fromLng) * frac; behavior.updateLatLng(latitude, longitude); - updateOnNextFrame(); + update(); } } @@ -607,7 +678,7 @@ public class MyLocationView extends View { if (location.hasBearing()) { builder.bearing(location.getBearing()); } - gpsDirection = 0; + gpsDirection = location.getBearing(); setCompass(gpsDirection); } else if (myBearingTrackingMode == MyBearingTracking.COMPASS) { if (!compassListener.isPaused()) { @@ -626,9 +697,9 @@ public class MyLocationView extends View { @Override void invalidate() { int[] mapPadding = mapboxMap.getPadding(); - UiSettings uiSettings = mapboxMap.getUiSettings(); - setX((uiSettings.getWidth() - getWidth() + mapPadding[0] - mapPadding[2]) / 2 + (contentPadding[0] - contentPadding[2]) / 2); - setY((uiSettings.getHeight() - getHeight() - mapPadding[3] + mapPadding[1]) / 2 + (contentPadding[1] - contentPadding[3]) / 2); + float x = (getWidth() + mapPadding[0] - mapPadding[2]) / 2 + (contentPadding[0] - contentPadding[2]) / 2; + float y = (getHeight() - mapPadding[3] + mapPadding[1]) / 2 + (contentPadding[1] - contentPadding[3]) / 2; + screenLocation = new PointF(x, y); MyLocationView.this.invalidate(); } } @@ -648,8 +719,8 @@ public class MyLocationView extends View { latLng = new LatLng(location); // update LatLng direction - if (location.hasBearing()) { - gpsDirection = clamp(location.getBearing() - (float) mapboxMap.getCameraPosition().bearing); + if (myBearingTrackingMode == MyBearingTracking.GPS && location.hasBearing()) { + gpsDirection = location.getBearing(); setCompass(gpsDirection); } @@ -659,7 +730,7 @@ public class MyLocationView extends View { // calculate updateLatLng time + add some extra offset to improve animation long previousUpdateTimeStamp = locationUpdateTimestamp; locationUpdateTimestamp = SystemClock.elapsedRealtime(); - long locationUpdateDuration = (long) ((locationUpdateTimestamp - previousUpdateTimeStamp) * 1.1); + long locationUpdateDuration = (long) ((locationUpdateTimestamp - previousUpdateTimeStamp) * 1.3); // calculate interpolated entity interpolatedLocation = new LatLng((latLng.getLatitude() + previousLocation.getLatitude()) / 2, (latLng.getLongitude() + previousLocation.getLongitude()) / 2); @@ -681,24 +752,9 @@ public class MyLocationView extends View { latLng = interpolatedLocation; } - private float clamp(float direction) { - float diff = previousDirection - direction; - if (diff > 180.0f) { - direction += 360.0f; - } else if (diff < -180.0f) { - direction -= 360.f; - } - previousDirection = direction; - return direction; - } - @Override void invalidate() { - PointF screenLocation = projection.toScreenLocation(latLng); - if (screenLocation != null) { - setX((screenLocation.x - getWidth() / 2)); - setY((screenLocation.y - getHeight() / 2)); - } + screenLocation = projection.toScreenLocation(latLng); MyLocationView.this.invalidate(); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java index 9ae96ebf7b..80bd1b3bef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java @@ -6,6 +6,9 @@ import android.support.annotation.IntRange; import com.mapbox.mapboxsdk.maps.MapView; +/** + * Settings to configure the visual appearance of the MyLocationView. + */ public class MyLocationViewSettings { private MapView mapView; @@ -52,43 +55,101 @@ public class MyLocationViewSettings { private int[] padding = new int[4]; + /** + * Creates an instance of MyLocationViewSettings + * + * @param mapView the MapView that hosts the MyLocationView + * @param myLocationView the MyLocationView to apply the settings to + * @see MyLocationView + */ public MyLocationViewSettings(MapView mapView, MyLocationView myLocationView) { this.mapView = mapView; this.myLocationView = myLocationView; } + /** + * Returns if the MyLocationView is enabled + * + * @return true if MyLocationView is enabled, + */ public boolean isEnabled() { return enabled; } + /** + * Set the enabled state of MyLocationView + * + * @param enabled true shows the MyLocationView on the map + */ public void setEnabled(boolean enabled) { this.enabled = enabled; myLocationView.setEnabled(enabled); } + /** + * Set the foreground drawable of the MyLocationView + * <p> + * The foreground drawable is the image visible on screen + * </p> + * + * @param foregroundDrawable the drawable to show as foreground without bearing + * @param foregroundBearingDrawable the drawable to show as foreground when bearing is enabled + */ public void setForegroundDrawable(Drawable foregroundDrawable, Drawable foregroundBearingDrawable) { this.foregroundDrawable = foregroundDrawable; this.foregroundBearingDrawable = foregroundBearingDrawable; myLocationView.setForegroundDrawables(foregroundDrawable, foregroundBearingDrawable); } + /** + * Get the foreground drawable when bearing is disabled. + * + * @return the drawable used as foreground + */ public Drawable getForegroundDrawable() { return foregroundDrawable; } + /** + * Get the foreground drawable when bearing is enabled. + * + * @return the bearing drawable used as foreground + */ public Drawable getForegroundBearingDrawable() { return foregroundBearingDrawable; } + /** + * Set the foreground tint color. + * <p> + * The color will tint both the foreground and the bearing foreground drawable. + * </p> + * + * @param foregroundTintColor the color to tint the foreground drawable + */ public void setForegroundTintColor(@ColorInt int foregroundTintColor) { this.foregroundTintColor = foregroundTintColor; myLocationView.setForegroundDrawableTint(foregroundTintColor); } + /** + * Get the foreground tint color. + * + * @return the foreground tint color + */ public int getForegroundTintColor() { return foregroundTintColor; } + /** + * Set the background drawable of MyLocationView + * <p> + * Padding can be added to provide an offset to the background + * </p> + * + * @param backgroundDrawable the drawable to show as background + * @param padding the padding added to the background + */ public void setBackgroundDrawable(Drawable backgroundDrawable, int[] padding) { this.backgroundDrawable = backgroundDrawable; this.backgroundOffset = padding; @@ -99,46 +160,99 @@ public class MyLocationViewSettings { } } + /** + * Get the background drawable of MyLocationView. + * + * @return the drawable used as background + */ public Drawable getBackgroundDrawable() { return backgroundDrawable; } + /** + * Set the background tint color. + * + * @param backgroundTintColor the color to tint the background + */ public void setBackgroundTintColor(@ColorInt int backgroundTintColor) { this.backgroundTintColor = backgroundTintColor; myLocationView.setShadowDrawableTint(backgroundTintColor); } + /** + * Get the background tint color. + * + * @return the background tint color + */ public int getBackgroundTintColor() { return backgroundTintColor; } + /** + * Get the background offset. + * + * @return the background offset + */ public int[] getBackgroundOffset() { return backgroundOffset; } + /** + * Set the MyLocationView padding. + * + * @param left the padding left of MyLocationView + * @param top the padding top of MyLocationView + * @param right the padding right of MyLocationView + * @param bottom the padding bottom of MyLocaionView + */ public void setPadding(int left, int top, int right, int bottom) { padding = new int[]{left, top, right, bottom}; myLocationView.setContentPadding(padding); mapView.invalidateContentPadding(); } + /** + * Get the MyLocationView padding. + * + * @return an array describing the padding in a LTRB manner + */ public int[] getPadding() { return padding; } + /** + * Get the alpha value of the accuracy circle of MyLocationView + * + * @return the alpha value + */ public int getAccuracyAlpha() { return accuracyAlpha; } - public void setAccuracyAlpha(@IntRange(from = 0, to = 255) int arruracyAlpha) { - this.accuracyAlpha = arruracyAlpha; - myLocationView.setAccuracyAlpha(arruracyAlpha); + /** + * Set the alpha value of the accuracy circle of MyLocationView + * + * @param accuracyAlpha the alpha value to set + */ + public void setAccuracyAlpha(@IntRange(from = 0, to = 255) int accuracyAlpha) { + this.accuracyAlpha = accuracyAlpha; + myLocationView.setAccuracyAlpha(accuracyAlpha); } + /** + * Get the accuracy tint color of MyLocationView. + * + * @return the tint color used for accuracy + */ public int getAccuracyTintColor() { return accuracyTintColor; } + /** + * Set the accuracy tint color of MyLocationView. + * + * @param accuracyTintColor the accuracy tint color + */ public void setAccuracyTintColor(@ColorInt int accuracyTintColor) { this.accuracyTintColor = accuracyTintColor; myLocationView.setAccuracyTint(accuracyTintColor); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index e81c366dba..ba6434e06d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -1,11 +1,17 @@ package com.mapbox.mapboxsdk.offline; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.support.annotation.NonNull; import android.util.Log; + import com.mapbox.mapboxsdk.MapboxAccountManager; +import com.mapbox.mapboxsdk.constants.MapboxConstants; + import java.io.File; /** @@ -88,7 +94,7 @@ public class OfflineManager { private OfflineManager(Context context) { // Get a pointer to the DefaultFileSource instance - String assetRoot = context.getFilesDir().getAbsolutePath(); + String assetRoot = getDatabasePath(context); String cachePath = assetRoot + File.separator + DATABASE_NAME; mDefaultFileSourcePtr = createDefaultFileSource(cachePath, assetRoot, DEFAULT_MAX_CACHE_SIZE); @@ -100,6 +106,61 @@ public class OfflineManager { deleteAmbientDatabase(context); } + public static String getDatabasePath(Context context) { + // Default value + boolean setStorageExternal = MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL; + + try { + // Try getting a custom value from the app Manifest + ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo( + context.getPackageName(), PackageManager.GET_META_DATA); + setStorageExternal = appInfo.metaData.getBoolean( + MapboxConstants.KEY_META_DATA_SET_STORAGE_EXTERNAL, + MapboxConstants.DEFAULT_SET_STORAGE_EXTERNAL); + } catch (PackageManager.NameNotFoundException e) { + Log.e(LOG_TAG, "Failed to read the package metadata: " + e.getMessage()); + } catch (Exception e) { + Log.e(LOG_TAG, "Failed to read the storage key: " + e.getMessage()); + } + + String databasePath = null; + if (setStorageExternal && isExternalStorageReadable()) { + try { + // Try getting the external storage path + databasePath = context.getExternalFilesDir(null).getAbsolutePath(); + } catch (NullPointerException e) { + Log.e(LOG_TAG, "Failed to obtain the external storage path: " + e.getMessage()); + } + } + + if (databasePath == null) { + // Default to internal storage + databasePath = context.getFilesDir().getAbsolutePath(); + } + + return databasePath; + } + + /** + * Checks if external storage is available to at least read. In order for this to work, make + * sure you include <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + * (or WRITE_EXTERNAL_STORAGE) for API level < 18 in your app Manifest. + * + * Code from https://developer.android.com/guide/topics/data/data-storage.html#filesExternal + */ + public static boolean isExternalStorageReadable() { + String state = Environment.getExternalStorageState(); + if (Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) { + return true; + } + + Log.w(LOG_TAG, "External storage was requested but it isn't readable. For API level < 18" + + " make sure you've requested READ_EXTERNAL_STORAGE or WRITE_EXTERNAL_STORAGE" + + " permissions in your app Manifest (defaulting to internal storage)."); + + return false; + } + private void deleteAmbientDatabase(final Context context) { // Delete the file in a separate thread to avoid affecting the UI new Thread(new Runnable() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java index 7f066e74d1..3756c93df2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java @@ -140,6 +140,34 @@ public class OfflineRegion { public static final int STATE_INACTIVE = 0; public static final int STATE_ACTIVE = 1; + // Keep track of the region state + private int state = STATE_INACTIVE; + + private boolean deliverInactiveMessages = false; + + /** + * Gets whether or not the `OfflineRegionObserver` will continue to deliver messages even if + * the region state has been set as STATE_INACTIVE. + */ + public boolean isDeliveringInactiveMessages() { + return deliverInactiveMessages; + } + + /** + * When set true, the `OfflineRegionObserver` will continue to deliver messages even if + * the region state has been set as STATE_INACTIVE (operations happen asynchronously). If set + * false, the client won't be notified of further messages. + */ + public void setDeliverInactiveMessages(boolean deliverInactiveMessages) { + this.deliverInactiveMessages = deliverInactiveMessages; + } + + private boolean deliverMessages() { + if (state == STATE_ACTIVE) return true; + if (isDeliveringInactiveMessages()) return true; + return false; + } + /* * Constructor */ @@ -180,32 +208,38 @@ public class OfflineRegion { setOfflineRegionObserver(new OfflineRegionObserver() { @Override public void onStatusChanged(final OfflineRegionStatus status) { - getHandler().post(new Runnable() { - @Override - public void run() { - observer.onStatusChanged(status); - } - }); + if (deliverMessages()) { + getHandler().post(new Runnable() { + @Override + public void run() { + observer.onStatusChanged(status); + } + }); + } } @Override public void onError(final OfflineRegionError error) { - getHandler().post(new Runnable() { - @Override - public void run() { - observer.onError(error); - } - }); + if (deliverMessages()) { + getHandler().post(new Runnable() { + @Override + public void run() { + observer.onError(error); + } + }); + } } @Override public void mapboxTileCountLimitExceeded(final long limit) { - getHandler().post(new Runnable() { - @Override - public void run() { - observer.mapboxTileCountLimitExceeded(limit); - } - }); + if (deliverMessages()) { + getHandler().post(new Runnable() { + @Override + public void run() { + observer.mapboxTileCountLimitExceeded(limit); + } + }); + } } }); } @@ -214,6 +248,7 @@ public class OfflineRegion { * Pause or resume downloading of regional resources. */ public void setDownloadState(@DownloadState int state) { + this.state = state; setOfflineRegionDownloadState(state); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java new file mode 100644 index 0000000000..fae68c518e --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -0,0 +1,73 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Background Layer + */ +public class BackgroundLayer extends Layer { + + public BackgroundLayer(long nativePtr) { + super(nativePtr); + } + + public BackgroundLayer(String layerId) { + initialize(layerId); + } + + protected native void initialize(String layerId); + + + public BackgroundLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<String> getBackgroundColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetBackgroundColor()); + } + /** + * The color with which the background will be drawn. + * @throws RuntimeException + */ + @ColorInt + public int getBackgroundColorAsInt() { + checkValidity(); + PropertyValue<String> value = getBackgroundColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("background-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<String> getBackgroundPattern() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetBackgroundPattern()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getBackgroundOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetBackgroundOpacity()); + } + + private native Object nativeGetBackgroundColor(); + + private native Object nativeGetBackgroundPattern(); + + private native Object nativeGetBackgroundOpacity(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java new file mode 100644 index 0000000000..ce0e9fd5bd --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -0,0 +1,135 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Circle Layer + */ +public class CircleLayer extends Layer { + + public CircleLayer(long nativePtr) { + super(nativePtr); + } + + public CircleLayer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public CircleLayer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } + + public void setFilter(Filter.Statement filter) { + checkValidity(); + this.setFilter(filter.toArray()); + } + + public void setFilter(Object[] filter) { + checkValidity(); + nativeSetFilter(filter); + } + + public CircleLayer withFilter(Object[] filter) { + setFilter(filter); + return this; + } + + public CircleLayer withFilter(Filter.Statement filter) { + setFilter(filter); + return this; + } + + + public CircleLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getCircleRadius() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetCircleRadius()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getCircleColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetCircleColor()); + } + /** + * The color of the circle. + * @throws RuntimeException + */ + @ColorInt + public int getCircleColorAsInt() { + checkValidity(); + PropertyValue<String> value = getCircleColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("circle-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getCircleBlur() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetCircleBlur()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getCircleOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetCircleOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getCircleTranslate() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetCircleTranslate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getCircleTranslateAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetCircleTranslateAnchor()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getCirclePitchScale() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetCirclePitchScale()); + } + + private native Object nativeGetCircleRadius(); + + private native Object nativeGetCircleColor(); + + private native Object nativeGetCircleBlur(); + + private native Object nativeGetCircleOpacity(); + + private native Object nativeGetCircleTranslate(); + + private native Object nativeGetCircleTranslateAnchor(); + + private native Object nativeGetCirclePitchScale(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java new file mode 100644 index 0000000000..f25d46dba9 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java @@ -0,0 +1,30 @@ +package com.mapbox.mapboxsdk.style.layers; + +/** + * Custom layer. + * <p/> + * Experimental feature. Do not use. + */ +public class CustomLayer extends Layer { + + public CustomLayer(String id, + long context, + long initializeFunction, + long renderFunction, + long deinitializeFunction) { + initialize(id, initializeFunction, renderFunction, deinitializeFunction, context); + } + + public CustomLayer(long nativePtr) { + super(nativePtr); + } + + public void invalidate() { + nativeUpdate(); + } + + protected native void initialize(String id, long initializeFunction, long renderFunction, long deinitializeFunction, long context); + + protected native void nativeUpdate(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java new file mode 100644 index 0000000000..d188129e2a --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -0,0 +1,150 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Fill Layer + */ +public class FillLayer extends Layer { + + public FillLayer(long nativePtr) { + super(nativePtr); + } + + public FillLayer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public FillLayer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } + + public void setFilter(Filter.Statement filter) { + checkValidity(); + this.setFilter(filter.toArray()); + } + + public void setFilter(Object[] filter) { + checkValidity(); + nativeSetFilter(filter); + } + + public FillLayer withFilter(Object[] filter) { + setFilter(filter); + return this; + } + + public FillLayer withFilter(Filter.Statement filter) { + setFilter(filter); + return this; + } + + + public FillLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getFillAntialias() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetFillAntialias()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getFillOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetFillOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getFillColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetFillColor()); + } + /** + * The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1px stroke, if it is used. + * @throws RuntimeException + */ + @ColorInt + public int getFillColorAsInt() { + checkValidity(); + PropertyValue<String> value = getFillColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("fill-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<String> getFillOutlineColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetFillOutlineColor()); + } + /** + * The outline color of the fill. Matches the value of `fill-color` if unspecified. + * @throws RuntimeException + */ + @ColorInt + public int getFillOutlineColorAsInt() { + checkValidity(); + PropertyValue<String> value = getFillOutlineColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("fill-outline-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getFillTranslate() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetFillTranslate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getFillTranslateAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetFillTranslateAnchor()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getFillPattern() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetFillPattern()); + } + + private native Object nativeGetFillAntialias(); + + private native Object nativeGetFillOpacity(); + + private native Object nativeGetFillColor(); + + private native Object nativeGetFillOutlineColor(); + + private native Object nativeGetFillTranslate(); + + private native Object nativeGetFillTranslateAnchor(); + + private native Object nativeGetFillPattern(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java new file mode 100644 index 0000000000..04da4da0cb --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java @@ -0,0 +1,115 @@ +package com.mapbox.mapboxsdk.style.layers; + +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Utility to build filter expressions more easily: + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#types-filter">Style spec</a> + */ +public class Filter { + + public abstract static class Statement { + protected final String operator; + + public Statement(String operator) { + this.operator = operator; + } + + public abstract Object[] toArray(); + } + + public static class SimpleStatement extends Statement { + private final String key; + private final Object[] values; + + public SimpleStatement(String operator, String key, Object... values) { + super(operator); + this.key = key; + this.values = values; + } + + + @Override + public Object[] toArray() { + ArrayList<Object> array = new ArrayList<>(2 + values.length); + array.add(operator); + array.add(key); + array.addAll(Arrays.asList(values)); + return array.toArray(); + } + } + + public static class CompoundStatement extends Statement { + private final Statement[] statements; + + public CompoundStatement(String operator, Statement... statements) { + super(operator); + this.statements = statements; + } + + @Override + public Object[] toArray() { + ArrayList<Object> array = new ArrayList<>(1 + statements.length); + array.add(operator); + for (Statement statement : statements) { + array.add(statement.toArray()); + } + return array.toArray(); + } + } + + public static Statement all(Statement... statements) { + return new CompoundStatement("all", statements); + } + + public static Statement any(Statement... statements) { + return new CompoundStatement("any", statements); + } + + public static Statement none(Statement... statements) { + return new CompoundStatement("none", statements); + } + + public static Statement has(String key) { + return new SimpleStatement("has", key); + } + + public static Statement notHas(String key) { + return new SimpleStatement("!has", key); + } + + public static Statement eq(String key, Object value) { + return new SimpleStatement("==", key, value); + } + + public static Statement neq(String key, Object value) { + return new SimpleStatement("!=", key, value); + } + + public static Statement gt(String key, Object value) { + return new SimpleStatement(">", key, value); + } + + public static Statement gte(String key, Object value) { + return new SimpleStatement(">=", key, value); + } + + public static Statement lt(String key, Object value) { + return new SimpleStatement("<", key, value); + } + + public static Statement lte(String key, Object value) { + return new SimpleStatement("<=", key, value); + } + + public static Statement in(String key, Object... values) { + return new SimpleStatement("in", key, values); + } + + public static Statement notIn(String key, Object... values) { + return new SimpleStatement("!in", key, values); + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java new file mode 100644 index 0000000000..c776f9ff23 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java @@ -0,0 +1,85 @@ +package com.mapbox.mapboxsdk.style.layers; + +import android.support.annotation.FloatRange; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.Size; + +import java.util.HashMap; +import java.util.Map; + +/** + * Representation of <a href="https://www.mapbox.com/mapbox-gl-style-spec/#types-function">Function</a> in the Mapbox style specification + * + * @param <T> the target property's value type. Make sure it matches. + */ +public class Function<T> { + + public static class Stop<I, O> { + public final I in; + public final O out; + + Stop(I in, O out) { + this.in = in; + this.out = out; + } + + Object[] toValueObject() { + return new Object[]{in, out}; + } + } + + @SafeVarargs + public static <T> Function<T> zoom(@NonNull @Size(min = 1) Stop<Float, T>... stops) { + return new Function<T>(stops); + } + + @SafeVarargs + public static <T> Function<T> zoom( + @FloatRange(from = 0, to = 1, fromInclusive = false, toInclusive = false) float base, + @NonNull @Size(min = 1) Stop<Float, T>... stops) { + return new Function<T>(stops) + .withBase(base); + } + + public static <T> Stop<Float, T> stop(float in, Property<T> output) { + return new Stop<>(in, output.value); + } + + private final Stop<Float, T>[] stops; + private Float base; + + Function(@NonNull @Size(min = 1) Stop<Float, T>[] stops) { + this.stops = stops; + } + + Function<T> withBase(float base) { + this.base = base; + return this; + } + + @Nullable + public Float getBase() { + return base; + } + + public Stop<Float, T>[] getStops() { + return stops; + } + + Map<String, Object> toValueObject() { + Object[] stopsValue = new Object[stops.length]; + + for (int i = 0; i < stopsValue.length; i++) { + Stop stop = stops[i]; + stopsValue[i] = stop.toValueObject(); + } + + Map<String, Object> value = new HashMap<>(); + if (base != null) { + value.put("base", base); + } + value.put("stops", stopsValue); + return value; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java new file mode 100644 index 0000000000..387cedbd6c --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -0,0 +1,112 @@ +package com.mapbox.mapboxsdk.style.layers; + +import android.support.annotation.NonNull; + +/** + * Base class for the different Layer types + */ +public abstract class Layer { + + private long nativePtr; + private boolean invalidated; + + public Layer(long nativePtr) { + this.nativePtr = nativePtr; + } + + public Layer() { + } + + public void setProperties(@NonNull Property<?>... properties) { + checkValidity(); + + if (properties.length == 0) { + return; + } + + boolean updateClasses = false; + for (Property<?> property : properties) { + if (property instanceof PaintProperty) { + updateClasses = true; + nativeSetPaintProperty(property.name, convertValue(property.value)); + } else { + nativeSetLayoutProperty(property.name, convertValue(property.value)); + } + } + + nativeUpdateStyle(updateClasses); + } + + public String getId() { + checkValidity(); + return nativeGetId(); + } + + public PropertyValue<String> getVisibility() { + checkValidity(); + return new PropertyValue<>(nativeGetVisibility()); + } + + public float getMinZoom() { + checkValidity(); + return nativeGetMinZoom(); + } + + public float getMaxZoom() { + checkValidity(); + return nativeGetMaxZoom(); + } + + public void setMinZoom(float zoom) { + checkValidity(); + nativeSetMinZoom(zoom); + } + + public void setMaxZoom(float zoom) { + checkValidity(); + nativeSetMaxZoom(zoom); + } + + @Override + protected native void finalize() throws Throwable; + + protected native String nativeGetId(); + + protected native Object nativeGetVisibility(); + + protected native void nativeSetLayoutProperty(String name, Object value); + + protected native void nativeSetPaintProperty(String name, Object value); + + protected native void nativeSetFilter(Object[] filter); + + protected native void nativeSetSourceLayer(String sourceLayer); + + protected native void nativeUpdateStyle(boolean updateClasses); + + protected native float nativeGetMinZoom(); + + protected native float nativeGetMaxZoom(); + + protected native void nativeSetMinZoom(float zoom); + + protected native void nativeSetMaxZoom(float zoom); + + public long getNativePtr() { + return nativePtr; + } + + private Object convertValue(Object value) { + return value != null && value instanceof Function ? ((Function) value).toValueObject() : value; + } + + protected void checkValidity() { + if (invalidated) { + throw new RuntimeException("Layer has been invalidated. Request a new reference after adding"); + } + } + + public void invalidate() { + this.invalidated = true; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutProperty.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutProperty.java new file mode 100644 index 0000000000..553554270e --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LayoutProperty.java @@ -0,0 +1,9 @@ +package com.mapbox.mapboxsdk.style.layers; + +class LayoutProperty<T> extends Property<T> { + + LayoutProperty(String name, T value) { + super(name, value); + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java new file mode 100644 index 0000000000..ab5dd0815e --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -0,0 +1,191 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Line Layer + */ +public class LineLayer extends Layer { + + public LineLayer(long nativePtr) { + super(nativePtr); + } + + public LineLayer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public LineLayer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } + + public void setFilter(Filter.Statement filter) { + checkValidity(); + this.setFilter(filter.toArray()); + } + + public void setFilter(Object[] filter) { + checkValidity(); + nativeSetFilter(filter); + } + + public LineLayer withFilter(Object[] filter) { + setFilter(filter); + return this; + } + + public LineLayer withFilter(Filter.Statement filter) { + setFilter(filter); + return this; + } + + + public LineLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<String> getLineCap() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetLineCap()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getLineJoin() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetLineJoin()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineMiterLimit() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineMiterLimit()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineRoundLimit() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineRoundLimit()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getLineColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetLineColor()); + } + /** + * The color with which the line will be drawn. + * @throws RuntimeException + */ + @ColorInt + public int getLineColorAsInt() { + checkValidity(); + PropertyValue<String> value = getLineColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("line-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getLineTranslate() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetLineTranslate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getLineTranslateAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetLineTranslateAnchor()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineWidth() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineWidth()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineGapWidth() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineGapWidth()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineOffset() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineOffset()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getLineBlur() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetLineBlur()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getLineDasharray() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetLineDasharray()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getLinePattern() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetLinePattern()); + } + + private native Object nativeGetLineCap(); + + private native Object nativeGetLineJoin(); + + private native Object nativeGetLineMiterLimit(); + + private native Object nativeGetLineRoundLimit(); + + private native Object nativeGetLineOpacity(); + + private native Object nativeGetLineColor(); + + private native Object nativeGetLineTranslate(); + + private native Object nativeGetLineTranslateAnchor(); + + private native Object nativeGetLineWidth(); + + private native Object nativeGetLineGapWidth(); + + private native Object nativeGetLineOffset(); + + private native Object nativeGetLineBlur(); + + private native Object nativeGetLineDasharray(); + + private native Object nativeGetLinePattern(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/NoSuchLayerException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/NoSuchLayerException.java new file mode 100644 index 0000000000..d6ef4f8824 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/NoSuchLayerException.java @@ -0,0 +1,11 @@ +package com.mapbox.mapboxsdk.style.layers; + +/** + * No such layer. + */ +public class NoSuchLayerException extends Exception { + + public NoSuchLayerException(String message) { + super(message); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintProperty.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintProperty.java new file mode 100644 index 0000000000..6f1a9a0a16 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PaintProperty.java @@ -0,0 +1,9 @@ +package com.mapbox.mapboxsdk.style.layers; + +class PaintProperty<T> extends Property<T> { + + PaintProperty(String name, T value) { + super(name, value); + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java new file mode 100644 index 0000000000..a31f1adb54 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Property.java @@ -0,0 +1,237 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import android.support.annotation.StringDef; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Paint/Layout properties for Layer + */ +public abstract class Property<T> { + + //visibility + public static final String VISIBLE = "visible"; + public static final String NONE = "none"; + + @StringDef({ + VISIBLE, + NONE + }) + @Retention(RetentionPolicy.SOURCE) + public @interface VISIBILITY {} + + //line-cap + public static final String LINE_CAP_BUTT = "butt"; + public static final String LINE_CAP_ROUND = "round"; + public static final String LINE_CAP_SQUARE = "square"; + + @StringDef({ + LINE_CAP_BUTT, + LINE_CAP_ROUND, + LINE_CAP_SQUARE, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface LINE_CAP {} + + //line-join + public static final String LINE_JOIN_BEVEL = "bevel"; + public static final String LINE_JOIN_ROUND = "round"; + public static final String LINE_JOIN_MITER = "miter"; + + @StringDef({ + LINE_JOIN_BEVEL, + LINE_JOIN_ROUND, + LINE_JOIN_MITER, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface LINE_JOIN {} + + //symbol-placement + public static final String SYMBOL_PLACEMENT_POINT = "point"; + public static final String SYMBOL_PLACEMENT_LINE = "line"; + + @StringDef({ + SYMBOL_PLACEMENT_POINT, + SYMBOL_PLACEMENT_LINE, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface SYMBOL_PLACEMENT {} + + //icon-rotation-alignment + public static final String ICON_ROTATION_ALIGNMENT_MAP = "map"; + public static final String ICON_ROTATION_ALIGNMENT_VIEWPORT = "viewport"; + + @StringDef({ + ICON_ROTATION_ALIGNMENT_MAP, + ICON_ROTATION_ALIGNMENT_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ICON_ROTATION_ALIGNMENT {} + + //icon-text-fit + public static final String ICON_TEXT_FIT_NONE = "none"; + public static final String ICON_TEXT_FIT_BOTH = "both"; + public static final String ICON_TEXT_FIT_WIDTH = "width"; + public static final String ICON_TEXT_FIT_HEIGHT = "height"; + + @StringDef({ + ICON_TEXT_FIT_NONE, + ICON_TEXT_FIT_BOTH, + ICON_TEXT_FIT_WIDTH, + ICON_TEXT_FIT_HEIGHT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ICON_TEXT_FIT {} + + //text-pitch-alignment + public static final String TEXT_PITCH_ALIGNMENT_MAP = "map"; + public static final String TEXT_PITCH_ALIGNMENT_VIEWPORT = "viewport"; + + @StringDef({ + TEXT_PITCH_ALIGNMENT_MAP, + TEXT_PITCH_ALIGNMENT_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_PITCH_ALIGNMENT {} + + //text-rotation-alignment + public static final String TEXT_ROTATION_ALIGNMENT_MAP = "map"; + public static final String TEXT_ROTATION_ALIGNMENT_VIEWPORT = "viewport"; + + @StringDef({ + TEXT_ROTATION_ALIGNMENT_MAP, + TEXT_ROTATION_ALIGNMENT_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_ROTATION_ALIGNMENT {} + + //text-justify + public static final String TEXT_JUSTIFY_LEFT = "left"; + public static final String TEXT_JUSTIFY_CENTER = "center"; + public static final String TEXT_JUSTIFY_RIGHT = "right"; + + @StringDef({ + TEXT_JUSTIFY_LEFT, + TEXT_JUSTIFY_CENTER, + TEXT_JUSTIFY_RIGHT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_JUSTIFY {} + + //text-anchor + public static final String TEXT_ANCHOR_CENTER = "center"; + public static final String TEXT_ANCHOR_LEFT = "left"; + public static final String TEXT_ANCHOR_RIGHT = "right"; + public static final String TEXT_ANCHOR_TOP = "top"; + public static final String TEXT_ANCHOR_BOTTOM = "bottom"; + public static final String TEXT_ANCHOR_TOP_LEFT = "top-left"; + public static final String TEXT_ANCHOR_TOP_RIGHT = "top-right"; + public static final String TEXT_ANCHOR_BOTTOM_LEFT = "bottom-left"; + public static final String TEXT_ANCHOR_BOTTOM_RIGHT = "bottom-right"; + + @StringDef({ + TEXT_ANCHOR_CENTER, + TEXT_ANCHOR_LEFT, + TEXT_ANCHOR_RIGHT, + TEXT_ANCHOR_TOP, + TEXT_ANCHOR_BOTTOM, + TEXT_ANCHOR_TOP_LEFT, + TEXT_ANCHOR_TOP_RIGHT, + TEXT_ANCHOR_BOTTOM_LEFT, + TEXT_ANCHOR_BOTTOM_RIGHT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_ANCHOR {} + + //text-transform + public static final String TEXT_TRANSFORM_NONE = "none"; + public static final String TEXT_TRANSFORM_UPPERCASE = "uppercase"; + public static final String TEXT_TRANSFORM_LOWERCASE = "lowercase"; + + @StringDef({ + TEXT_TRANSFORM_NONE, + TEXT_TRANSFORM_UPPERCASE, + TEXT_TRANSFORM_LOWERCASE, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_TRANSFORM {} + + //fill-translate-anchor + public static final String FILL_TRANSLATE_ANCHOR_MAP = "map"; + public static final String FILL_TRANSLATE_ANCHOR_VIEWPORT = "viewport"; + + @StringDef({ + FILL_TRANSLATE_ANCHOR_MAP, + FILL_TRANSLATE_ANCHOR_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface FILL_TRANSLATE_ANCHOR {} + + //line-translate-anchor + public static final String LINE_TRANSLATE_ANCHOR_MAP = "map"; + public static final String LINE_TRANSLATE_ANCHOR_VIEWPORT = "viewport"; + + @StringDef({ + LINE_TRANSLATE_ANCHOR_MAP, + LINE_TRANSLATE_ANCHOR_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface LINE_TRANSLATE_ANCHOR {} + + //icon-translate-anchor + public static final String ICON_TRANSLATE_ANCHOR_MAP = "map"; + public static final String ICON_TRANSLATE_ANCHOR_VIEWPORT = "viewport"; + + @StringDef({ + ICON_TRANSLATE_ANCHOR_MAP, + ICON_TRANSLATE_ANCHOR_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ICON_TRANSLATE_ANCHOR {} + + //text-translate-anchor + public static final String TEXT_TRANSLATE_ANCHOR_MAP = "map"; + public static final String TEXT_TRANSLATE_ANCHOR_VIEWPORT = "viewport"; + + @StringDef({ + TEXT_TRANSLATE_ANCHOR_MAP, + TEXT_TRANSLATE_ANCHOR_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface TEXT_TRANSLATE_ANCHOR {} + + //circle-translate-anchor + public static final String CIRCLE_TRANSLATE_ANCHOR_MAP = "map"; + public static final String CIRCLE_TRANSLATE_ANCHOR_VIEWPORT = "viewport"; + + @StringDef({ + CIRCLE_TRANSLATE_ANCHOR_MAP, + CIRCLE_TRANSLATE_ANCHOR_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface CIRCLE_TRANSLATE_ANCHOR {} + + //circle-pitch-scale + public static final String CIRCLE_PITCH_SCALE_MAP = "map"; + public static final String CIRCLE_PITCH_SCALE_VIEWPORT = "viewport"; + + @StringDef({ + CIRCLE_PITCH_SCALE_MAP, + CIRCLE_PITCH_SCALE_VIEWPORT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface CIRCLE_PITCH_SCALE {} + + + //Class definition + public final String name; + public final T value; + + /* package */ Property(String name, T value) { + this.name = name; + this.value = value; + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java new file mode 100644 index 0000000000..88587dbb5b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -0,0 +1,1300 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import android.annotation.SuppressLint; +import android.support.annotation.ColorInt; + +/** + * Constructs paint/layout properties for Layers + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#layers>Layer style documentation</a> + */ +public class PropertyFactory { + + /** + * Set visibility + */ + public static Property<String> visibility(@Property.VISIBILITY String value) { + return new LayoutProperty<>("visibility", value); + } + + /** + * Set visibility + */ + public static Property<Function<String>> visibility(Function<String> function) { + return new LayoutProperty<>("visibility", function); + } + + /** + * Whether or not the fill should be antialiased. + */ + public static Property<Boolean> fillAntialias(Boolean value) { + return new PaintProperty<>("fill-antialias", value); + } + + /** + * Whether or not the fill should be antialiased. + */ + public static Property<Function<Boolean>> fillAntialias(Function<Boolean> function) { + return new PaintProperty<>("fill-antialias", function); + } + + /** + * The opacity of the entire fill layer. In contrast to the fill-color, this value will also affect the 1px stroke around the fill, if the stroke is used. + */ + public static Property<Float> fillOpacity(Float value) { + return new PaintProperty<>("fill-opacity", value); + } + + /** + * The opacity of the entire fill layer. In contrast to the fill-color, this value will also affect the 1px stroke around the fill, if the stroke is used. + */ + public static Property<Function<Float>> fillOpacity(Function<Float> function) { + return new PaintProperty<>("fill-opacity", function); + } + + /** + * The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1px stroke, if it is used. + */ + public static Property<String> fillColor(@ColorInt int value) { + return new PaintProperty<>("fill-color", colorToRgbaString(value)); + } + + /** + * The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1px stroke, if it is used. + */ + public static Property<String> fillColor(String value) { + return new PaintProperty<>("fill-color", value); + } + + /** + * The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1px stroke, if it is used. + */ + public static Property<Function<String>> fillColor(Function<String> function) { + return new PaintProperty<>("fill-color", function); + } + + /** + * The outline color of the fill. Matches the value of `fill-color` if unspecified. + */ + public static Property<String> fillOutlineColor(@ColorInt int value) { + return new PaintProperty<>("fill-outline-color", colorToRgbaString(value)); + } + + /** + * The outline color of the fill. Matches the value of `fill-color` if unspecified. + */ + public static Property<String> fillOutlineColor(String value) { + return new PaintProperty<>("fill-outline-color", value); + } + + /** + * The outline color of the fill. Matches the value of `fill-color` if unspecified. + */ + public static Property<Function<String>> fillOutlineColor(Function<String> function) { + return new PaintProperty<>("fill-outline-color", function); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Float[]> fillTranslate(Float[] value) { + return new PaintProperty<>("fill-translate", value); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Function<Float[]>> fillTranslate(Function<Float[]> function) { + return new PaintProperty<>("fill-translate", function); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<String> fillTranslateAnchor(@Property.FILL_TRANSLATE_ANCHOR String value) { + return new PaintProperty<>("fill-translate-anchor", value); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<Function<String>> fillTranslateAnchor(Function<String> function) { + return new PaintProperty<>("fill-translate-anchor", function); + } + + /** + * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<String> fillPattern(String value) { + return new PaintProperty<>("fill-pattern", value); + } + + /** + * Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<Function<String>> fillPattern(Function<String> function) { + return new PaintProperty<>("fill-pattern", function); + } + + /** + * The opacity at which the line will be drawn. + */ + public static Property<Float> lineOpacity(Float value) { + return new PaintProperty<>("line-opacity", value); + } + + /** + * The opacity at which the line will be drawn. + */ + public static Property<Function<Float>> lineOpacity(Function<Float> function) { + return new PaintProperty<>("line-opacity", function); + } + + /** + * The color with which the line will be drawn. + */ + public static Property<String> lineColor(@ColorInt int value) { + return new PaintProperty<>("line-color", colorToRgbaString(value)); + } + + /** + * The color with which the line will be drawn. + */ + public static Property<String> lineColor(String value) { + return new PaintProperty<>("line-color", value); + } + + /** + * The color with which the line will be drawn. + */ + public static Property<Function<String>> lineColor(Function<String> function) { + return new PaintProperty<>("line-color", function); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Float[]> lineTranslate(Float[] value) { + return new PaintProperty<>("line-translate", value); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Function<Float[]>> lineTranslate(Function<Float[]> function) { + return new PaintProperty<>("line-translate", function); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<String> lineTranslateAnchor(@Property.LINE_TRANSLATE_ANCHOR String value) { + return new PaintProperty<>("line-translate-anchor", value); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<Function<String>> lineTranslateAnchor(Function<String> function) { + return new PaintProperty<>("line-translate-anchor", function); + } + + /** + * Stroke thickness. + */ + public static Property<Float> lineWidth(Float value) { + return new PaintProperty<>("line-width", value); + } + + /** + * Stroke thickness. + */ + public static Property<Function<Float>> lineWidth(Function<Float> function) { + return new PaintProperty<>("line-width", function); + } + + /** + * Draws a line casing outside of a line's actual path. Value indicates the width of the inner gap. + */ + public static Property<Float> lineGapWidth(Float value) { + return new PaintProperty<>("line-gap-width", value); + } + + /** + * Draws a line casing outside of a line's actual path. Value indicates the width of the inner gap. + */ + public static Property<Function<Float>> lineGapWidth(Function<Float> function) { + return new PaintProperty<>("line-gap-width", function); + } + + /** + * The line's offset perpendicular to its direction. Values may be positive or negative, where positive indicates "rightwards" (if you were moving in the direction of the line) and negative indicates "leftwards." + */ + public static Property<Float> lineOffset(Float value) { + return new PaintProperty<>("line-offset", value); + } + + /** + * The line's offset perpendicular to its direction. Values may be positive or negative, where positive indicates "rightwards" (if you were moving in the direction of the line) and negative indicates "leftwards." + */ + public static Property<Function<Float>> lineOffset(Function<Float> function) { + return new PaintProperty<>("line-offset", function); + } + + /** + * Blur applied to the line, in pixels. + */ + public static Property<Float> lineBlur(Float value) { + return new PaintProperty<>("line-blur", value); + } + + /** + * Blur applied to the line, in pixels. + */ + public static Property<Function<Float>> lineBlur(Function<Float> function) { + return new PaintProperty<>("line-blur", function); + } + + /** + * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to pixels, multiply the length by the current line width. + */ + public static Property<Float[]> lineDasharray(Float[] value) { + return new PaintProperty<>("line-dasharray", value); + } + + /** + * Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to pixels, multiply the length by the current line width. + */ + public static Property<Function<Float[]>> lineDasharray(Function<Float[]> function) { + return new PaintProperty<>("line-dasharray", function); + } + + /** + * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<String> linePattern(String value) { + return new PaintProperty<>("line-pattern", value); + } + + /** + * Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<Function<String>> linePattern(Function<String> function) { + return new PaintProperty<>("line-pattern", function); + } + + /** + * The opacity at which the icon will be drawn. + */ + public static Property<Float> iconOpacity(Float value) { + return new PaintProperty<>("icon-opacity", value); + } + + /** + * The opacity at which the icon will be drawn. + */ + public static Property<Function<Float>> iconOpacity(Function<Float> function) { + return new PaintProperty<>("icon-opacity", function); + } + + /** + * The color of the icon. This can only be used with sdf icons. + */ + public static Property<String> iconColor(@ColorInt int value) { + return new PaintProperty<>("icon-color", colorToRgbaString(value)); + } + + /** + * The color of the icon. This can only be used with sdf icons. + */ + public static Property<String> iconColor(String value) { + return new PaintProperty<>("icon-color", value); + } + + /** + * The color of the icon. This can only be used with sdf icons. + */ + public static Property<Function<String>> iconColor(Function<String> function) { + return new PaintProperty<>("icon-color", function); + } + + /** + * The color of the icon's halo. Icon halos can only be used with sdf icons. + */ + public static Property<String> iconHaloColor(@ColorInt int value) { + return new PaintProperty<>("icon-halo-color", colorToRgbaString(value)); + } + + /** + * The color of the icon's halo. Icon halos can only be used with sdf icons. + */ + public static Property<String> iconHaloColor(String value) { + return new PaintProperty<>("icon-halo-color", value); + } + + /** + * The color of the icon's halo. Icon halos can only be used with sdf icons. + */ + public static Property<Function<String>> iconHaloColor(Function<String> function) { + return new PaintProperty<>("icon-halo-color", function); + } + + /** + * Distance of halo to the icon outline. + */ + public static Property<Float> iconHaloWidth(Float value) { + return new PaintProperty<>("icon-halo-width", value); + } + + /** + * Distance of halo to the icon outline. + */ + public static Property<Function<Float>> iconHaloWidth(Function<Float> function) { + return new PaintProperty<>("icon-halo-width", function); + } + + /** + * Fade out the halo towards the outside. + */ + public static Property<Float> iconHaloBlur(Float value) { + return new PaintProperty<>("icon-halo-blur", value); + } + + /** + * Fade out the halo towards the outside. + */ + public static Property<Function<Float>> iconHaloBlur(Function<Float> function) { + return new PaintProperty<>("icon-halo-blur", function); + } + + /** + * Distance that the icon's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Float[]> iconTranslate(Float[] value) { + return new PaintProperty<>("icon-translate", value); + } + + /** + * Distance that the icon's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Function<Float[]>> iconTranslate(Function<Float[]> function) { + return new PaintProperty<>("icon-translate", function); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen). + */ + public static Property<String> iconTranslateAnchor(@Property.ICON_TRANSLATE_ANCHOR String value) { + return new PaintProperty<>("icon-translate-anchor", value); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen). + */ + public static Property<Function<String>> iconTranslateAnchor(Function<String> function) { + return new PaintProperty<>("icon-translate-anchor", function); + } + + /** + * The opacity at which the text will be drawn. + */ + public static Property<Float> textOpacity(Float value) { + return new PaintProperty<>("text-opacity", value); + } + + /** + * The opacity at which the text will be drawn. + */ + public static Property<Function<Float>> textOpacity(Function<Float> function) { + return new PaintProperty<>("text-opacity", function); + } + + /** + * The color with which the text will be drawn. + */ + public static Property<String> textColor(@ColorInt int value) { + return new PaintProperty<>("text-color", colorToRgbaString(value)); + } + + /** + * The color with which the text will be drawn. + */ + public static Property<String> textColor(String value) { + return new PaintProperty<>("text-color", value); + } + + /** + * The color with which the text will be drawn. + */ + public static Property<Function<String>> textColor(Function<String> function) { + return new PaintProperty<>("text-color", function); + } + + /** + * The color of the text's halo, which helps it stand out from backgrounds. + */ + public static Property<String> textHaloColor(@ColorInt int value) { + return new PaintProperty<>("text-halo-color", colorToRgbaString(value)); + } + + /** + * The color of the text's halo, which helps it stand out from backgrounds. + */ + public static Property<String> textHaloColor(String value) { + return new PaintProperty<>("text-halo-color", value); + } + + /** + * The color of the text's halo, which helps it stand out from backgrounds. + */ + public static Property<Function<String>> textHaloColor(Function<String> function) { + return new PaintProperty<>("text-halo-color", function); + } + + /** + * Distance of halo to the font outline. Max text halo width is 1/4 of the font-size. + */ + public static Property<Float> textHaloWidth(Float value) { + return new PaintProperty<>("text-halo-width", value); + } + + /** + * Distance of halo to the font outline. Max text halo width is 1/4 of the font-size. + */ + public static Property<Function<Float>> textHaloWidth(Function<Float> function) { + return new PaintProperty<>("text-halo-width", function); + } + + /** + * The halo's fadeout distance towards the outside. + */ + public static Property<Float> textHaloBlur(Float value) { + return new PaintProperty<>("text-halo-blur", value); + } + + /** + * The halo's fadeout distance towards the outside. + */ + public static Property<Function<Float>> textHaloBlur(Function<Float> function) { + return new PaintProperty<>("text-halo-blur", function); + } + + /** + * Distance that the text's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Float[]> textTranslate(Float[] value) { + return new PaintProperty<>("text-translate", value); + } + + /** + * Distance that the text's anchor is moved from its original placement. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Function<Float[]>> textTranslate(Function<Float[]> function) { + return new PaintProperty<>("text-translate", function); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen). + */ + public static Property<String> textTranslateAnchor(@Property.TEXT_TRANSLATE_ANCHOR String value) { + return new PaintProperty<>("text-translate-anchor", value); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen). + */ + public static Property<Function<String>> textTranslateAnchor(Function<String> function) { + return new PaintProperty<>("text-translate-anchor", function); + } + + /** + * Circle radius. + */ + public static Property<Float> circleRadius(Float value) { + return new PaintProperty<>("circle-radius", value); + } + + /** + * Circle radius. + */ + public static Property<Function<Float>> circleRadius(Function<Float> function) { + return new PaintProperty<>("circle-radius", function); + } + + /** + * The color of the circle. + */ + public static Property<String> circleColor(@ColorInt int value) { + return new PaintProperty<>("circle-color", colorToRgbaString(value)); + } + + /** + * The color of the circle. + */ + public static Property<String> circleColor(String value) { + return new PaintProperty<>("circle-color", value); + } + + /** + * The color of the circle. + */ + public static Property<Function<String>> circleColor(Function<String> function) { + return new PaintProperty<>("circle-color", function); + } + + /** + * Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. + */ + public static Property<Float> circleBlur(Float value) { + return new PaintProperty<>("circle-blur", value); + } + + /** + * Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. + */ + public static Property<Function<Float>> circleBlur(Function<Float> function) { + return new PaintProperty<>("circle-blur", function); + } + + /** + * The opacity at which the circle will be drawn. + */ + public static Property<Float> circleOpacity(Float value) { + return new PaintProperty<>("circle-opacity", value); + } + + /** + * The opacity at which the circle will be drawn. + */ + public static Property<Function<Float>> circleOpacity(Function<Float> function) { + return new PaintProperty<>("circle-opacity", function); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Float[]> circleTranslate(Float[] value) { + return new PaintProperty<>("circle-translate", value); + } + + /** + * The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively. + */ + public static Property<Function<Float[]>> circleTranslate(Function<Float[]> function) { + return new PaintProperty<>("circle-translate", function); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<String> circleTranslateAnchor(@Property.CIRCLE_TRANSLATE_ANCHOR String value) { + return new PaintProperty<>("circle-translate-anchor", value); + } + + /** + * Control whether the translation is relative to the map (north) or viewport (screen) + */ + public static Property<Function<String>> circleTranslateAnchor(Function<String> function) { + return new PaintProperty<>("circle-translate-anchor", function); + } + + /** + * Controls the scaling behavior of the circle when the map is pitched. The value `map` scales circles according to their apparent distance to the camera. The value `viewport` results in no pitch-related scaling. + */ + public static Property<String> circlePitchScale(@Property.CIRCLE_PITCH_SCALE String value) { + return new PaintProperty<>("circle-pitch-scale", value); + } + + /** + * Controls the scaling behavior of the circle when the map is pitched. The value `map` scales circles according to their apparent distance to the camera. The value `viewport` results in no pitch-related scaling. + */ + public static Property<Function<String>> circlePitchScale(Function<String> function) { + return new PaintProperty<>("circle-pitch-scale", function); + } + + /** + * The opacity at which the image will be drawn. + */ + public static Property<Float> rasterOpacity(Float value) { + return new PaintProperty<>("raster-opacity", value); + } + + /** + * The opacity at which the image will be drawn. + */ + public static Property<Function<Float>> rasterOpacity(Function<Float> function) { + return new PaintProperty<>("raster-opacity", function); + } + + /** + * Rotates hues around the color wheel. + */ + public static Property<Float> rasterHueRotate(Float value) { + return new PaintProperty<>("raster-hue-rotate", value); + } + + /** + * Rotates hues around the color wheel. + */ + public static Property<Function<Float>> rasterHueRotate(Function<Float> function) { + return new PaintProperty<>("raster-hue-rotate", function); + } + + /** + * Increase or reduce the brightness of the image. The value is the minimum brightness. + */ + public static Property<Float> rasterBrightnessMin(Float value) { + return new PaintProperty<>("raster-brightness-min", value); + } + + /** + * Increase or reduce the brightness of the image. The value is the minimum brightness. + */ + public static Property<Function<Float>> rasterBrightnessMin(Function<Float> function) { + return new PaintProperty<>("raster-brightness-min", function); + } + + /** + * Increase or reduce the brightness of the image. The value is the maximum brightness. + */ + public static Property<Float> rasterBrightnessMax(Float value) { + return new PaintProperty<>("raster-brightness-max", value); + } + + /** + * Increase or reduce the brightness of the image. The value is the maximum brightness. + */ + public static Property<Function<Float>> rasterBrightnessMax(Function<Float> function) { + return new PaintProperty<>("raster-brightness-max", function); + } + + /** + * Increase or reduce the saturation of the image. + */ + public static Property<Float> rasterSaturation(Float value) { + return new PaintProperty<>("raster-saturation", value); + } + + /** + * Increase or reduce the saturation of the image. + */ + public static Property<Function<Float>> rasterSaturation(Function<Float> function) { + return new PaintProperty<>("raster-saturation", function); + } + + /** + * Increase or reduce the contrast of the image. + */ + public static Property<Float> rasterContrast(Float value) { + return new PaintProperty<>("raster-contrast", value); + } + + /** + * Increase or reduce the contrast of the image. + */ + public static Property<Function<Float>> rasterContrast(Function<Float> function) { + return new PaintProperty<>("raster-contrast", function); + } + + /** + * Fade duration when a new tile is added. + */ + public static Property<Float> rasterFadeDuration(Float value) { + return new PaintProperty<>("raster-fade-duration", value); + } + + /** + * Fade duration when a new tile is added. + */ + public static Property<Function<Float>> rasterFadeDuration(Function<Float> function) { + return new PaintProperty<>("raster-fade-duration", function); + } + + /** + * The color with which the background will be drawn. + */ + public static Property<String> backgroundColor(@ColorInt int value) { + return new PaintProperty<>("background-color", colorToRgbaString(value)); + } + + /** + * The color with which the background will be drawn. + */ + public static Property<String> backgroundColor(String value) { + return new PaintProperty<>("background-color", value); + } + + /** + * The color with which the background will be drawn. + */ + public static Property<Function<String>> backgroundColor(Function<String> function) { + return new PaintProperty<>("background-color", function); + } + + /** + * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<String> backgroundPattern(String value) { + return new PaintProperty<>("background-pattern", value); + } + + /** + * Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). + */ + public static Property<Function<String>> backgroundPattern(Function<String> function) { + return new PaintProperty<>("background-pattern", function); + } + + /** + * The opacity at which the background will be drawn. + */ + public static Property<Float> backgroundOpacity(Float value) { + return new PaintProperty<>("background-opacity", value); + } + + /** + * The opacity at which the background will be drawn. + */ + public static Property<Function<Float>> backgroundOpacity(Function<Float> function) { + return new PaintProperty<>("background-opacity", function); + } + + /** + * The display of line endings. + */ + public static Property<String> lineCap(@Property.LINE_CAP String value) { + return new LayoutProperty<>("line-cap", value); + } + + /** + * The display of line endings. + */ + public static Property<Function<String>> lineCap(Function<String> function) { + return new LayoutProperty<>("line-cap", function); + } + + /** + * The display of lines when joining. + */ + public static Property<String> lineJoin(@Property.LINE_JOIN String value) { + return new LayoutProperty<>("line-join", value); + } + + /** + * The display of lines when joining. + */ + public static Property<Function<String>> lineJoin(Function<String> function) { + return new LayoutProperty<>("line-join", function); + } + + /** + * Used to automatically convert miter joins to bevel joins for sharp angles. + */ + public static Property<Float> lineMiterLimit(Float value) { + return new LayoutProperty<>("line-miter-limit", value); + } + + /** + * Used to automatically convert miter joins to bevel joins for sharp angles. + */ + public static Property<Function<Float>> lineMiterLimit(Function<Float> function) { + return new LayoutProperty<>("line-miter-limit", function); + } + + /** + * Used to automatically convert round joins to miter joins for shallow angles. + */ + public static Property<Float> lineRoundLimit(Float value) { + return new LayoutProperty<>("line-round-limit", value); + } + + /** + * Used to automatically convert round joins to miter joins for shallow angles. + */ + public static Property<Function<Float>> lineRoundLimit(Function<Float> function) { + return new LayoutProperty<>("line-round-limit", function); + } + + /** + * Label placement relative to its geometry. `line` can only be used on LineStrings and Polygons. + */ + public static Property<String> symbolPlacement(@Property.SYMBOL_PLACEMENT String value) { + return new LayoutProperty<>("symbol-placement", value); + } + + /** + * Label placement relative to its geometry. `line` can only be used on LineStrings and Polygons. + */ + public static Property<Function<String>> symbolPlacement(Function<String> function) { + return new LayoutProperty<>("symbol-placement", function); + } + + /** + * Distance between two symbol anchors. + */ + public static Property<Float> symbolSpacing(Float value) { + return new LayoutProperty<>("symbol-spacing", value); + } + + /** + * Distance between two symbol anchors. + */ + public static Property<Function<Float>> symbolSpacing(Function<Float> function) { + return new LayoutProperty<>("symbol-spacing", function); + } + + /** + * If true, the symbols will not cross tile edges to avoid mutual collisions. Recommended in layers that don't have enough padding in the vector tile to prevent collisions, or if it is a point symbol layer placed after a line symbol layer. + */ + public static Property<Boolean> symbolAvoidEdges(Boolean value) { + return new LayoutProperty<>("symbol-avoid-edges", value); + } + + /** + * If true, the symbols will not cross tile edges to avoid mutual collisions. Recommended in layers that don't have enough padding in the vector tile to prevent collisions, or if it is a point symbol layer placed after a line symbol layer. + */ + public static Property<Function<Boolean>> symbolAvoidEdges(Function<Boolean> function) { + return new LayoutProperty<>("symbol-avoid-edges", function); + } + + /** + * If true, the icon will be visible even if it collides with other previously drawn symbols. + */ + public static Property<Boolean> iconAllowOverlap(Boolean value) { + return new LayoutProperty<>("icon-allow-overlap", value); + } + + /** + * If true, the icon will be visible even if it collides with other previously drawn symbols. + */ + public static Property<Function<Boolean>> iconAllowOverlap(Function<Boolean> function) { + return new LayoutProperty<>("icon-allow-overlap", function); + } + + /** + * If true, other symbols can be visible even if they collide with the icon. + */ + public static Property<Boolean> iconIgnorePlacement(Boolean value) { + return new LayoutProperty<>("icon-ignore-placement", value); + } + + /** + * If true, other symbols can be visible even if they collide with the icon. + */ + public static Property<Function<Boolean>> iconIgnorePlacement(Function<Boolean> function) { + return new LayoutProperty<>("icon-ignore-placement", function); + } + + /** + * If true, text will display without their corresponding icons when the icon collides with other symbols and the text does not. + */ + public static Property<Boolean> iconOptional(Boolean value) { + return new LayoutProperty<>("icon-optional", value); + } + + /** + * If true, text will display without their corresponding icons when the icon collides with other symbols and the text does not. + */ + public static Property<Function<Boolean>> iconOptional(Function<Boolean> function) { + return new LayoutProperty<>("icon-optional", function); + } + + /** + * Orientation of icon when map is rotated. + */ + public static Property<String> iconRotationAlignment(@Property.ICON_ROTATION_ALIGNMENT String value) { + return new LayoutProperty<>("icon-rotation-alignment", value); + } + + /** + * Orientation of icon when map is rotated. + */ + public static Property<Function<String>> iconRotationAlignment(Function<String> function) { + return new LayoutProperty<>("icon-rotation-alignment", function); + } + + /** + * Scale factor for icon. 1 is original size, 3 triples the size. + */ + public static Property<Float> iconSize(Float value) { + return new LayoutProperty<>("icon-size", value); + } + + /** + * Scale factor for icon. 1 is original size, 3 triples the size. + */ + public static Property<Function<Float>> iconSize(Function<Float> function) { + return new LayoutProperty<>("icon-size", function); + } + + /** + * Position and scale an icon by the its corresponding text. + */ + public static Property<String> iconTextFit(@Property.ICON_TEXT_FIT String value) { + return new LayoutProperty<>("icon-text-fit", value); + } + + /** + * Position and scale an icon by the its corresponding text. + */ + public static Property<Function<String>> iconTextFit(Function<String> function) { + return new LayoutProperty<>("icon-text-fit", function); + } + + /** + * Size of padding area around the text-fit size in clockwise order: top, right, bottom, left. + */ + public static Property<Float[]> iconTextFitPadding(Float[] value) { + return new LayoutProperty<>("icon-text-fit-padding", value); + } + + /** + * Size of padding area around the text-fit size in clockwise order: top, right, bottom, left. + */ + public static Property<Function<Float[]>> iconTextFitPadding(Function<Float[]> function) { + return new LayoutProperty<>("icon-text-fit-padding", function); + } + + /** + * A string with {tokens} replaced, referencing the data property to pull from. + */ + public static Property<String> iconImage(String value) { + return new LayoutProperty<>("icon-image", value); + } + + /** + * A string with {tokens} replaced, referencing the data property to pull from. + */ + public static Property<Function<String>> iconImage(Function<String> function) { + return new LayoutProperty<>("icon-image", function); + } + + /** + * Rotates the icon clockwise. + */ + public static Property<Float> iconRotate(Float value) { + return new LayoutProperty<>("icon-rotate", value); + } + + /** + * Rotates the icon clockwise. + */ + public static Property<Function<Float>> iconRotate(Function<Float> function) { + return new LayoutProperty<>("icon-rotate", function); + } + + /** + * Size of the additional area around the icon bounding box used for detecting symbol collisions. + */ + public static Property<Float> iconPadding(Float value) { + return new LayoutProperty<>("icon-padding", value); + } + + /** + * Size of the additional area around the icon bounding box used for detecting symbol collisions. + */ + public static Property<Function<Float>> iconPadding(Function<Float> function) { + return new LayoutProperty<>("icon-padding", function); + } + + /** + * If true, the icon may be flipped to prevent it from being rendered upside-down. + */ + public static Property<Boolean> iconKeepUpright(Boolean value) { + return new LayoutProperty<>("icon-keep-upright", value); + } + + /** + * If true, the icon may be flipped to prevent it from being rendered upside-down. + */ + public static Property<Function<Boolean>> iconKeepUpright(Function<Boolean> function) { + return new LayoutProperty<>("icon-keep-upright", function); + } + + /** + * Offset distance of icon from its anchor. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Float[]> iconOffset(Float[] value) { + return new LayoutProperty<>("icon-offset", value); + } + + /** + * Offset distance of icon from its anchor. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Function<Float[]>> iconOffset(Function<Float[]> function) { + return new LayoutProperty<>("icon-offset", function); + } + + /** + * Aligns text to the plane of the `viewport` or the `map` when the map is pitched. Matches `text-rotation-alignment` if unspecified. + */ + public static Property<String> textPitchAlignment(@Property.TEXT_PITCH_ALIGNMENT String value) { + return new LayoutProperty<>("text-pitch-alignment", value); + } + + /** + * Aligns text to the plane of the `viewport` or the `map` when the map is pitched. Matches `text-rotation-alignment` if unspecified. + */ + public static Property<Function<String>> textPitchAlignment(Function<String> function) { + return new LayoutProperty<>("text-pitch-alignment", function); + } + + /** + * Orientation of text when map is rotated. + */ + public static Property<String> textRotationAlignment(@Property.TEXT_ROTATION_ALIGNMENT String value) { + return new LayoutProperty<>("text-rotation-alignment", value); + } + + /** + * Orientation of text when map is rotated. + */ + public static Property<Function<String>> textRotationAlignment(Function<String> function) { + return new LayoutProperty<>("text-rotation-alignment", function); + } + + /** + * Value to use for a text label. Feature properties are specified using tokens like {field_name}. + */ + public static Property<String> textField(String value) { + return new LayoutProperty<>("text-field", value); + } + + /** + * Value to use for a text label. Feature properties are specified using tokens like {field_name}. + */ + public static Property<Function<String>> textField(Function<String> function) { + return new LayoutProperty<>("text-field", function); + } + + /** + * Font stack to use for displaying text. + */ + public static Property<String[]> textFont(String[] value) { + return new LayoutProperty<>("text-font", value); + } + + /** + * Font stack to use for displaying text. + */ + public static Property<Function<String[]>> textFont(Function<String[]> function) { + return new LayoutProperty<>("text-font", function); + } + + /** + * Font size. + */ + public static Property<Float> textSize(Float value) { + return new LayoutProperty<>("text-size", value); + } + + /** + * Font size. + */ + public static Property<Function<Float>> textSize(Function<Float> function) { + return new LayoutProperty<>("text-size", function); + } + + /** + * The maximum line width for text wrapping. + */ + public static Property<Float> textMaxWidth(Float value) { + return new LayoutProperty<>("text-max-width", value); + } + + /** + * The maximum line width for text wrapping. + */ + public static Property<Function<Float>> textMaxWidth(Function<Float> function) { + return new LayoutProperty<>("text-max-width", function); + } + + /** + * Text leading value for multi-line text. + */ + public static Property<Float> textLineHeight(Float value) { + return new LayoutProperty<>("text-line-height", value); + } + + /** + * Text leading value for multi-line text. + */ + public static Property<Function<Float>> textLineHeight(Function<Float> function) { + return new LayoutProperty<>("text-line-height", function); + } + + /** + * Text tracking amount. + */ + public static Property<Float> textLetterSpacing(Float value) { + return new LayoutProperty<>("text-letter-spacing", value); + } + + /** + * Text tracking amount. + */ + public static Property<Function<Float>> textLetterSpacing(Function<Float> function) { + return new LayoutProperty<>("text-letter-spacing", function); + } + + /** + * Text justification options. + */ + public static Property<String> textJustify(@Property.TEXT_JUSTIFY String value) { + return new LayoutProperty<>("text-justify", value); + } + + /** + * Text justification options. + */ + public static Property<Function<String>> textJustify(Function<String> function) { + return new LayoutProperty<>("text-justify", function); + } + + /** + * Part of the text placed closest to the anchor. + */ + public static Property<String> textAnchor(@Property.TEXT_ANCHOR String value) { + return new LayoutProperty<>("text-anchor", value); + } + + /** + * Part of the text placed closest to the anchor. + */ + public static Property<Function<String>> textAnchor(Function<String> function) { + return new LayoutProperty<>("text-anchor", function); + } + + /** + * Maximum angle change between adjacent characters. + */ + public static Property<Float> textMaxAngle(Float value) { + return new LayoutProperty<>("text-max-angle", value); + } + + /** + * Maximum angle change between adjacent characters. + */ + public static Property<Function<Float>> textMaxAngle(Function<Float> function) { + return new LayoutProperty<>("text-max-angle", function); + } + + /** + * Rotates the text clockwise. + */ + public static Property<Float> textRotate(Float value) { + return new LayoutProperty<>("text-rotate", value); + } + + /** + * Rotates the text clockwise. + */ + public static Property<Function<Float>> textRotate(Function<Float> function) { + return new LayoutProperty<>("text-rotate", function); + } + + /** + * Size of the additional area around the text bounding box used for detecting symbol collisions. + */ + public static Property<Float> textPadding(Float value) { + return new LayoutProperty<>("text-padding", value); + } + + /** + * Size of the additional area around the text bounding box used for detecting symbol collisions. + */ + public static Property<Function<Float>> textPadding(Function<Float> function) { + return new LayoutProperty<>("text-padding", function); + } + + /** + * If true, the text may be flipped vertically to prevent it from being rendered upside-down. + */ + public static Property<Boolean> textKeepUpright(Boolean value) { + return new LayoutProperty<>("text-keep-upright", value); + } + + /** + * If true, the text may be flipped vertically to prevent it from being rendered upside-down. + */ + public static Property<Function<Boolean>> textKeepUpright(Function<Boolean> function) { + return new LayoutProperty<>("text-keep-upright", function); + } + + /** + * Specifies how to capitalize text, similar to the CSS `text-transform` property. + */ + public static Property<String> textTransform(@Property.TEXT_TRANSFORM String value) { + return new LayoutProperty<>("text-transform", value); + } + + /** + * Specifies how to capitalize text, similar to the CSS `text-transform` property. + */ + public static Property<Function<String>> textTransform(Function<String> function) { + return new LayoutProperty<>("text-transform", function); + } + + /** + * Offset distance of text from its anchor. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Float[]> textOffset(Float[] value) { + return new LayoutProperty<>("text-offset", value); + } + + /** + * Offset distance of text from its anchor. Positive values indicate right and down, while negative values indicate left and up. + */ + public static Property<Function<Float[]>> textOffset(Function<Float[]> function) { + return new LayoutProperty<>("text-offset", function); + } + + /** + * If true, the text will be visible even if it collides with other previously drawn symbols. + */ + public static Property<Boolean> textAllowOverlap(Boolean value) { + return new LayoutProperty<>("text-allow-overlap", value); + } + + /** + * If true, the text will be visible even if it collides with other previously drawn symbols. + */ + public static Property<Function<Boolean>> textAllowOverlap(Function<Boolean> function) { + return new LayoutProperty<>("text-allow-overlap", function); + } + + /** + * If true, other symbols can be visible even if they collide with the text. + */ + public static Property<Boolean> textIgnorePlacement(Boolean value) { + return new LayoutProperty<>("text-ignore-placement", value); + } + + /** + * If true, other symbols can be visible even if they collide with the text. + */ + public static Property<Function<Boolean>> textIgnorePlacement(Function<Boolean> function) { + return new LayoutProperty<>("text-ignore-placement", function); + } + + /** + * If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not. + */ + public static Property<Boolean> textOptional(Boolean value) { + return new LayoutProperty<>("text-optional", value); + } + + /** + * If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not. + */ + public static Property<Function<Boolean>> textOptional(Function<Boolean> function) { + return new LayoutProperty<>("text-optional", function); + } + + @SuppressLint("DefaultLocale") + static String colorToRgbaString(@ColorInt int value) { + return String.format("rgba(%d, %d, %d, %d)", (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, (value >> 24) & 0xFF); + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java new file mode 100644 index 0000000000..204c154743 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java @@ -0,0 +1,56 @@ +package com.mapbox.mapboxsdk.style.layers; + +import android.support.annotation.Nullable; +import android.util.Log; + +/** + * Properties for Layer + */ +public class PropertyValue<T> { + private static final String TAG = PropertyValue.class.getSimpleName(); + + private final Object value; + + /* package */ PropertyValue(Object value) { + this.value = value; + } + + public boolean isNull() { + return value == null; + } + + public boolean isFunction() { + return !isNull() && value instanceof Function; + } + + public boolean isValue() { + return !isNull() && !isFunction(); + } + + @Nullable + public Function<T> getFunction() { + if (isFunction()) { + //noinspection unchecked + return (Function<T>) value; + } else { + Log.w(TAG, "not a function, try value"); + return null; + } + } + + @Nullable + public T getValue() { + if (isValue()) { + //noinspection unchecked + return (T) value; + } else { + Log.w(TAG, "not a value, try function"); + return null; + } + } + + @Override + public String toString() { + return String.format("%s (%s)", getClass().getSimpleName(), value != null ? value.getClass().getSimpleName() : null); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java new file mode 100644 index 0000000000..a6872cef0f --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -0,0 +1,100 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Raster Layer + */ +public class RasterLayer extends Layer { + + public RasterLayer(long nativePtr) { + super(nativePtr); + } + + public RasterLayer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public RasterLayer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } + + + public RasterLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterHueRotate() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterHueRotate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterBrightnessMin() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterBrightnessMin()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterBrightnessMax() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterBrightnessMax()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterSaturation() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterSaturation()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterContrast() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterContrast()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getRasterFadeDuration() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetRasterFadeDuration()); + } + + private native Object nativeGetRasterOpacity(); + + private native Object nativeGetRasterHueRotate(); + + private native Object nativeGetRasterBrightnessMin(); + + private native Object nativeGetRasterBrightnessMax(); + + private native Object nativeGetRasterSaturation(); + + private native Object nativeGetRasterContrast(); + + private native Object nativeGetRasterFadeDuration(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java new file mode 100644 index 0000000000..ccbfdb411f --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -0,0 +1,508 @@ +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * Symbol Layer + */ +public class SymbolLayer extends Layer { + + public SymbolLayer(long nativePtr) { + super(nativePtr); + } + + public SymbolLayer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public SymbolLayer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } + + public void setFilter(Filter.Statement filter) { + checkValidity(); + this.setFilter(filter.toArray()); + } + + public void setFilter(Object[] filter) { + checkValidity(); + nativeSetFilter(filter); + } + + public SymbolLayer withFilter(Object[] filter) { + setFilter(filter); + return this; + } + + public SymbolLayer withFilter(Filter.Statement filter) { + setFilter(filter); + return this; + } + + + public SymbolLayer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + + @SuppressWarnings("unchecked") + public PropertyValue<String> getSymbolPlacement() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetSymbolPlacement()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getSymbolSpacing() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetSymbolSpacing()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getSymbolAvoidEdges() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetSymbolAvoidEdges()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getIconAllowOverlap() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconAllowOverlap()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getIconIgnorePlacement() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconIgnorePlacement()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getIconOptional() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconOptional()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconRotationAlignment() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconRotationAlignment()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconSize() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconSize()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconTextFit() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconTextFit()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getIconTextFitPadding() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconTextFitPadding()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconImage() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconImage()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconRotate() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconRotate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconPadding() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconPadding()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getIconKeepUpright() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetIconKeepUpright()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getIconOffset() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconOffset()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextPitchAlignment() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextPitchAlignment()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextRotationAlignment() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextRotationAlignment()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextField() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextField()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String[]> getTextFont() { + checkValidity(); + return (PropertyValue<String[]>) new PropertyValue(nativeGetTextFont()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextSize() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextSize()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextMaxWidth() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextMaxWidth()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextLineHeight() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextLineHeight()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextLetterSpacing() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextLetterSpacing()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextJustify() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextJustify()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextAnchor()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextMaxAngle() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextMaxAngle()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextRotate() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextRotate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextPadding() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextPadding()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getTextKeepUpright() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextKeepUpright()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextTransform() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextTransform()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getTextOffset() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetTextOffset()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getTextAllowOverlap() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextAllowOverlap()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getTextIgnorePlacement() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextIgnorePlacement()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Boolean> getTextOptional() { + checkValidity(); + return (PropertyValue<Boolean>) new PropertyValue(nativeGetTextOptional()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconColor()); + } + /** + * The color of the icon. This can only be used with sdf icons. + * @throws RuntimeException + */ + @ColorInt + public int getIconColorAsInt() { + checkValidity(); + PropertyValue<String> value = getIconColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("icon-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconHaloColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconHaloColor()); + } + /** + * The color of the icon's halo. Icon halos can only be used with sdf icons. + * @throws RuntimeException + */ + @ColorInt + public int getIconHaloColorAsInt() { + checkValidity(); + PropertyValue<String> value = getIconHaloColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("icon-halo-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconHaloWidth() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconHaloWidth()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getIconHaloBlur() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetIconHaloBlur()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getIconTranslate() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetIconTranslate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getIconTranslateAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetIconTranslateAnchor()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextOpacity() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextOpacity()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextColor()); + } + /** + * The color with which the text will be drawn. + * @throws RuntimeException + */ + @ColorInt + public int getTextColorAsInt() { + checkValidity(); + PropertyValue<String> value = getTextColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("text-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextHaloColor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextHaloColor()); + } + /** + * The color of the text's halo, which helps it stand out from backgrounds. + * @throws RuntimeException + */ + @ColorInt + public int getTextHaloColorAsInt() { + checkValidity(); + PropertyValue<String> value = getTextHaloColor(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("text-halo-color was set as a Function"); + } + } + + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextHaloWidth() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextHaloWidth()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float> getTextHaloBlur() { + checkValidity(); + return (PropertyValue<Float>) new PropertyValue(nativeGetTextHaloBlur()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<Float[]> getTextTranslate() { + checkValidity(); + return (PropertyValue<Float[]>) new PropertyValue(nativeGetTextTranslate()); + } + + @SuppressWarnings("unchecked") + public PropertyValue<String> getTextTranslateAnchor() { + checkValidity(); + return (PropertyValue<String>) new PropertyValue(nativeGetTextTranslateAnchor()); + } + + private native Object nativeGetSymbolPlacement(); + + private native Object nativeGetSymbolSpacing(); + + private native Object nativeGetSymbolAvoidEdges(); + + private native Object nativeGetIconAllowOverlap(); + + private native Object nativeGetIconIgnorePlacement(); + + private native Object nativeGetIconOptional(); + + private native Object nativeGetIconRotationAlignment(); + + private native Object nativeGetIconSize(); + + private native Object nativeGetIconTextFit(); + + private native Object nativeGetIconTextFitPadding(); + + private native Object nativeGetIconImage(); + + private native Object nativeGetIconRotate(); + + private native Object nativeGetIconPadding(); + + private native Object nativeGetIconKeepUpright(); + + private native Object nativeGetIconOffset(); + + private native Object nativeGetTextPitchAlignment(); + + private native Object nativeGetTextRotationAlignment(); + + private native Object nativeGetTextField(); + + private native Object nativeGetTextFont(); + + private native Object nativeGetTextSize(); + + private native Object nativeGetTextMaxWidth(); + + private native Object nativeGetTextLineHeight(); + + private native Object nativeGetTextLetterSpacing(); + + private native Object nativeGetTextJustify(); + + private native Object nativeGetTextAnchor(); + + private native Object nativeGetTextMaxAngle(); + + private native Object nativeGetTextRotate(); + + private native Object nativeGetTextPadding(); + + private native Object nativeGetTextKeepUpright(); + + private native Object nativeGetTextTransform(); + + private native Object nativeGetTextOffset(); + + private native Object nativeGetTextAllowOverlap(); + + private native Object nativeGetTextIgnorePlacement(); + + private native Object nativeGetTextOptional(); + + private native Object nativeGetIconOpacity(); + + private native Object nativeGetIconColor(); + + private native Object nativeGetIconHaloColor(); + + private native Object nativeGetIconHaloWidth(); + + private native Object nativeGetIconHaloBlur(); + + private native Object nativeGetIconTranslate(); + + private native Object nativeGetIconTranslateAnchor(); + + private native Object nativeGetTextOpacity(); + + private native Object nativeGetTextColor(); + + private native Object nativeGetTextHaloColor(); + + private native Object nativeGetTextHaloWidth(); + + private native Object nativeGetTextHaloBlur(); + + private native Object nativeGetTextTranslate(); + + private native Object nativeGetTextTranslateAnchor(); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs new file mode 100644 index 0000000000..00d9f09124 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -0,0 +1,107 @@ +<% + const type = locals.type; + const properties = locals.properties; +-%> +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import android.support.annotation.ColorInt; +import android.support.annotation.NonNull; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.*; + +/** + * <%- camelize(type) %> Layer + */ +public class <%- camelize(type) %>Layer extends Layer { + + public <%- camelize(type) %>Layer(long nativePtr) { + super(nativePtr); + } + +<% if (type === 'background') { -%> + public <%- camelize(type) %>Layer(String layerId) { + initialize(layerId); + } + + protected native void initialize(String layerId); +<% } else { -%> + public <%- camelize(type) %>Layer(String layerId, String sourceId) { + initialize(layerId, sourceId); + } + + protected native void initialize(String layerId, String sourceId); + + public void setSourceLayer(String sourceLayer) { + checkValidity(); + nativeSetSourceLayer(sourceLayer); + } + + public <%- camelize(type) %>Layer withSourceLayer(String sourceLayer) { + setSourceLayer(sourceLayer); + return this; + } +<% } -%> + +<% if (type !== 'background' && type !== 'raster') { -%> + public void setFilter(Filter.Statement filter) { + checkValidity(); + this.setFilter(filter.toArray()); + } + + public void setFilter(Object[] filter) { + checkValidity(); + nativeSetFilter(filter); + } + + public <%- camelize(type) %>Layer withFilter(Object[] filter) { + setFilter(filter); + return this; + } + + public <%- camelize(type) %>Layer withFilter(Filter.Statement filter) { + setFilter(filter); + return this; + } + +<% } -%> + + public <%- camelize(type) %>Layer withProperties(@NonNull Property<?>... properties) { + setProperties(properties); + return this; + } + + // Property getters + +<% for (const property of properties) { -%> + @SuppressWarnings("unchecked") + public PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() { + checkValidity(); + return (PropertyValue<<%- propertyType(property) %>>) new PropertyValue(nativeGet<%- camelize(property.name) %>()); + } + <% if (property.type == 'color') { -%> + /** + * <%- property.doc %> + * @throws RuntimeException + */ + @ColorInt + public int get<%- camelize(property.name) %>AsInt() { + checkValidity(); + PropertyValue<<%- propertyType(property) %>> value = get<%- camelize(property.name) %>(); + if (value.isValue()) { + return rgbaToColor(value.getValue()); + } else { + throw new RuntimeException("<%- property.name %> was set as a Function"); + } + } + + <% } -%> + +<% } -%> +<% for (const property of properties) { -%> + private native Object nativeGet<%- camelize(property.name) %>(); + +<% } -%> +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs new file mode 100644 index 0000000000..e734a9ff11 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property.java.ejs @@ -0,0 +1,53 @@ +<% + const properties = locals.properties; +-%> +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import android.support.annotation.StringDef; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Paint/Layout properties for Layer + */ +public abstract class Property<T> { + + //visibility + public static final String VISIBLE = "visible"; + public static final String NONE = "none"; + + @StringDef({ + VISIBLE, + NONE + }) + @Retention(RetentionPolicy.SOURCE) + public @interface VISIBILITY {} + +<% for (const property of properties) { -%> + //<%- property.name %> +<% for (const value of property.values) { -%> + public static final String <%- snakeCaseUpper(property.name) %>_<%- snakeCaseUpper(value) %> = "<%- value %>"; +<% } -%> + + @StringDef({ + <% for (const value of property.values) { -%> + <%- snakeCaseUpper(property.name) %>_<%- snakeCaseUpper(value) %>, + <% } -%> + }) + @Retention(RetentionPolicy.SOURCE) + public @interface <%- snakeCaseUpper(property.name) %> {} + +<% } -%> + + //Class definition + public final String name; + public final T value; + + /* package */ Property(String name, T value) { + this.name = name; + this.value = value; + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs new file mode 100644 index 0000000000..c7424bc31e --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs @@ -0,0 +1,78 @@ +<% + const paintProperties = locals.paintProperties; + const layoutProperties = locals.layoutProperties; +-%> +// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`. +package com.mapbox.mapboxsdk.style.layers; + +import android.annotation.SuppressLint; +import android.support.annotation.ColorInt; + +/** + * Constructs paint/layout properties for Layers + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#layers>Layer style documentation</a> + */ +public class PropertyFactory { + + /** + * Set visibility + */ + public static Property<String> visibility(@Property.VISIBILITY String value) { + return new LayoutProperty<>("visibility", value); + } + + /** + * Set visibility + */ + public static Property<Function<String>> visibility(Function<String> function) { + return new LayoutProperty<>("visibility", function); + } + +<% for (const property of paintProperties) { -%> +<% if (property.type == 'color') { -%> + /** + * <%- property.doc %> + */ + public static Property<String> <%- camelizeWithLeadingLowercase(property.name) %>(@ColorInt int value) { + return new PaintProperty<>("<%- property.name %>", colorToRgbaString(value)); + } + +<% } -%> + /** + * <%- property.doc %> + */ + public static Property<<%- propertyType(property) %>> <%- camelizeWithLeadingLowercase(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyType(property) %> value) { + return new PaintProperty<>("<%- property.name %>", value); + } + + /** + * <%- property.doc %> + */ + public static Property<Function<<%- propertyType(property) %>>> <%- camelizeWithLeadingLowercase(property.name) %>(Function<<%- propertyType(property) %>> function) { + return new PaintProperty<>("<%- property.name %>", function); + } + +<% } -%> +<% for (const property of layoutProperties) { -%> + /** + * <%- property.doc %> + */ + public static Property<<%- propertyType(property) %>> <%- camelizeWithLeadingLowercase(property.name) %>(<%- propertyTypeAnnotation(property) %><%- iff(() => propertyTypeAnnotation(property), " ") %><%- propertyType(property) %> value) { + return new LayoutProperty<>("<%- property.name %>", value); + } + + /** + * <%- property.doc %> + */ + public static Property<Function<<%- propertyType(property) %>>> <%- camelizeWithLeadingLowercase(property.name) %>(Function<<%- propertyType(property) %>> function) { + return new LayoutProperty<>("<%- property.name %>", function); + } + +<% } -%> + @SuppressLint("DefaultLocale") + static String colorToRgbaString(@ColorInt int value) { + return String.format("rgba(%d, %d, %d, %d)", (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, (value >> 24) & 0xFF); + } + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java new file mode 100644 index 0000000000..fc7928015e --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -0,0 +1,44 @@ +package com.mapbox.mapboxsdk.style.sources; + +import java.net.URL; +import java.util.HashMap; + +/** + * A GeoJson source. + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">the style specification</a> + */ +public class GeoJsonSource extends Source { + public static final String TYPE = "geojson"; + private static final String DATA_KEY = "data"; + + /** + * Create a GeoJsonSource from a raw json string + * + * @param id the source id + * @param geoJson raw Json body + */ + public GeoJsonSource(String id, String geoJson) { + super(id, TYPE); + if (geoJson == null || geoJson.startsWith("http")) { + throw new IllegalArgumentException("Expected a raw json body"); + } + + //Wrap the String in a map as an Object is expected by the + //style conversion template + HashMap<String, String> wrapper = new HashMap<>(); + wrapper.put(DATA_KEY, geoJson); + this.put(DATA_KEY, wrapper); + } + + /** + * Create a GeoJsonSource from a remote geo json file + * + * @param id the source id + * @param url remote json file + */ + public GeoJsonSource(String id, URL url) { + super(id, TYPE); + this.put(DATA_KEY, url.toExternalForm()); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java new file mode 100644 index 0000000000..f5db6f2a37 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java @@ -0,0 +1,33 @@ +package com.mapbox.mapboxsdk.style.sources; + +import java.net.URL; + +/** + * Construct a Raster Source. + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-raster">The style specificition</a> + */ +public class RasterSource extends Source { + public static final String TYPE = "raster"; + private static final String URL_KEY = "url"; + private static final String TILE_SIZE_KEY = "tileSize"; + + public RasterSource(String id, URL url) { + this(id, url.toExternalForm()); + } + + public RasterSource(String id, String url) { + super(id, TYPE); + this.put(URL_KEY, url); + } + + public RasterSource(String id, TileSet tileSet) { + super(id, TYPE); + this.putAll(tileSet.toValueObject()); + } + + public RasterSource withTileSize(int tileSize) { + this.put(TILE_SIZE_KEY, (float) tileSize); + return this; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java new file mode 100644 index 0000000000..d9aacdc80d --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java @@ -0,0 +1,16 @@ +package com.mapbox.mapboxsdk.style.sources; + +import java.util.HashMap; + +public abstract class Source extends HashMap<String, Object> { + private final String id; + + protected Source(String id, String type) { + this.put("type", type); + this.id = id; + } + + public String getId() { + return id; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java new file mode 100644 index 0000000000..1da8827d72 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java @@ -0,0 +1,290 @@ +package com.mapbox.mapboxsdk.style.sources; + +import android.support.annotation.Size; + +import com.mapbox.mapboxsdk.geometry.LatLng; + +import java.util.HashMap; +import java.util.Map; + +/** + * Tile set + * + * @see <a href="https://github.com/mapbox/tilejson-spec/tree/master/2.1.0">The tileset specification</a> + */ +public class TileSet { + private final String tilejson; + private String name; + private String description; + private String version; + private String attribution; + private String template; + private String legend; + private String scheme; + private final String[] tiles; + private String[] grids; + private String[] data; + private Float minZoom; + private Float maxZoom; + private Float[] bounds; + private Float[] center; + + /** + * @param tilejson A semver.org style version number. Describes the version of the TileJSON spec that is implemented by this JSON object. + * @param tiles An array of tile endpoints. {z}, {x} and {y}, if present, are replaced with the corresponding integers. + * If multiple endpoints are specified, clients may use any combination of endpoints. All endpoints MUST return the same + * content for the same URL. The array MUST contain at least one endpoint. + * Example: "http:localhost:8888/admin/1.0.0/world-light,broadband/{z}/{x}/{y}.png" + */ + public TileSet(String tilejson, String... tiles) { + this.tilejson = tilejson; + this.tiles = tiles; + } + + public String getTilejson() { + return tilejson; + } + + public String getName() { + return name; + } + + /** + * A name describing the tileset. The name can + * contain any legal character. Implementations SHOULD NOT interpret the + * name as HTML. + * "name": "compositing", + */ + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + /** + * A text description of the tileset. The + * description can contain any legal character. + * Implementations SHOULD NOT + * interpret the description as HTML. + * "description": "A simple, light grey world." + */ + public void setDescription(String description) { + this.description = description; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getAttribution() { + return attribution; + } + + /** + * Default: null. Contains an attribution to be displayed + * when the map is shown to a user. Implementations MAY decide to treat this + * as HTML or literal text. For security reasons, make absolutely sure that + * this field can't be abused as a vector for XSS or beacon tracking. + * "attribution": "<a href='http:openstreetmap.org'>OSM contributors</a>", + */ + public void setAttribution(String attribution) { + this.attribution = attribution; + } + + public String getTemplate() { + return template; + } + + /** + * Contains a mustache template to be used to + * format data from grids for interaction. + * See https:github.com/mapbox/utfgrid-spec/tree/master/1.2 + * for the interactivity specification. + * "template": "{{#__teaser__}}{{NAME}}{{/__teaser__}}" + */ + public void setTemplate(String template) { + this.template = template; + } + + public String getLegend() { + return legend; + } + + /** + * Contains a legend to be displayed with the map. + * Implementations MAY decide to treat this as HTML or literal text. + * For security reasons, make absolutely sure that this field can't be + * abused as a vector for XSS or beacon tracking. + * "legend": "Dangerous zones are red, safe zones are green" + */ + public void setLegend(String legend) { + this.legend = legend; + } + + public String getScheme() { + return scheme; + } + + /** + * Default: "xyz". Either "xyz" or "tms". Influences the y + * direction of the tile coordinates. + * The global-mercator (aka Spherical Mercator) profile is assumed. + * "scheme": "xyz" + */ + public void setScheme(String scheme) { + this.scheme = scheme; + } + + public String[] getTiles() { + return tiles; + } + + public String[] getGrids() { + return grids; + } + + /** + * An array of interactivity endpoints. {z}, {x} + * and {y}, if present, are replaced with the corresponding integers. If multiple + * endpoints are specified, clients may use any combination of endpoints. + * All endpoints MUST return the same content for the same URL. + * If the array doesn't contain any entries, interactivity is not supported + * for this tileset. See https:github.com/mapbox/utfgrid-spec/tree/master/1.2 + * for the interactivity specification. + * <p/> + * Example: "http:localhost:8888/admin/1.0.0/broadband/{z}/{x}/{y}.grid.json" + */ + public void setGrids(String... grids) { + this.grids = grids; + } + + public String[] getData() { + return data; + } + + /** + * An array of data files in GeoJSON format. + * {z}, {x} and {y}, if present, + * are replaced with the corresponding integers. If multiple + * endpoints are specified, clients may use any combination of endpoints. + * All endpoints MUST return the same content for the same URL. + * If the array doesn't contain any entries, then no data is present in + * the map. + * <p/> + * "http:localhost:8888/admin/data.geojson" + */ + public void setData(String... data) { + this.data = data; + } + + public float getMinZoom() { + return minZoom; + } + + /** + * 0. >= 0, <= 22. An integer specifying the minimum zoom level. + */ + public void setMinZoom(float minZoom) { + this.minZoom = minZoom; + } + + public float getMaxZoom() { + return maxZoom; + } + + /** + * 0. >= 0, <= 22. An integer specifying the maximum zoom level. + */ + public void setMaxZoom(float maxZoom) { + this.maxZoom = maxZoom; + } + + public Float[] getBounds() { + return bounds; + } + + /** + * Default: [-180, -90, 180, 90]. The maximum extent of available map tiles. Bounds MUST define an area + * covered by all zoom levels. The bounds are represented in WGS:84 + * latitude and longitude values, in the order left, bottom, right, top. + * Values may be integers or floating point numbers. + */ + public void setBounds(@Size(value = 4) Float... bounds) { + this.bounds = bounds; + } + + public Float[] getCenter() { + return center; + } + + /** + * The first value is the longitude, the second is latitude (both in + * WGS:84 values), the third value is the zoom level as an integer. + * Longitude and latitude MUST be within the specified bounds. + * The zoom level MUST be between minzoom and maxzoom. + * Implementations can use this value to set the default location. If the + * value is null, implementations may use their own algorithm for + * determining a default location. + */ + public void setCenter(@Size(value = 2) Float... center) { + this.center = center; + } + + public void setCenter(LatLng center) { + this.center = new Float[]{(float) center.getLongitude(), (float) center.getLatitude()}; + } + + Map<String, Object> toValueObject() { + Map<String, Object> result = new HashMap<>(); + result.put("tilejson", tilejson); + result.put("tiles", tiles); + + if (name != null) { + result.put("name", name); + } + if (description != null) { + result.put("description", description); + } + if (version != null) { + result.put("version", version); + } + if (attribution != null) { + result.put("attribution", attribution); + } + if (template != null) { + result.put("template", template); + } + if (legend != null) { + result.put("legend", legend); + } + if (scheme != null) { + result.put("scheme", scheme); + } + if (grids != null) { + result.put("grids", grids); + } + if (data != null) { + result.put("data", data); + } + if (minZoom != null) { + result.put("minzoom", minZoom); + } + if (maxZoom != null) { + result.put("maxzoom", maxZoom); + } + if (bounds != null) { + result.put("bounds", bounds); + } + if (center != null) { + result.put("center", center); + } + + return result; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java new file mode 100644 index 0000000000..381294083a --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java @@ -0,0 +1,45 @@ +package com.mapbox.mapboxsdk.style.sources; + +import java.net.URL; + +/** + * A vector source. + * + * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-vector">the style specification</a> + */ +public class VectorSource extends Source { + public static final String TYPE = "vector"; + private static final String URL_KEY = "url"; + + /** + * Create a vector source from a remote url + * + * @param id the source id + * @param url the url + */ + public VectorSource(String id, URL url) { + this(id, url.toExternalForm()); + } + + /** + * Create a vector source from a remote url + * + * @param id the source id + * @param url the url + */ + public VectorSource(String id, String url) { + super(id, TYPE); + this.put(URL_KEY, url); + } + + /** + * Create a vector source from a tilset + * + * @param id the source id + * @param tileSet the tileset + */ + public VectorSource(String id, TileSet tileSet) { + super(id, TYPE); + this.putAll(tileSet.toValueObject()); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java new file mode 100644 index 0000000000..1b13e9502f --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/GzipRequestInterceptor.java @@ -0,0 +1,54 @@ +package com.mapbox.mapboxsdk.telemetry; + +import android.util.Log; +import java.io.IOException; +import okhttp3.Interceptor; +import okhttp3.MediaType; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import okio.BufferedSink; +import okio.GzipSink; +import okio.Okio; + +/** + * OkHttp Interceptor for Gzipping Telemetry Data requests to the server. + * Based on: https://github.com/square/okhttp/wiki/Interceptors + */ +public final class GzipRequestInterceptor implements Interceptor { + + private static final String TAG = "GzipRequestInterceptor"; + + @Override public Response intercept(Interceptor.Chain chain) throws IOException { + Request originalRequest = chain.request(); + if (originalRequest.body() == null || originalRequest.header("Content-Encoding") != null) { + Log.d(TAG, "Not compressing"); + return chain.proceed(originalRequest); + } + + Log.d(TAG, "Compressing"); + Request compressedRequest = originalRequest.newBuilder() + .header("Content-Encoding", "gzip") + .method(originalRequest.method(), gzip(originalRequest.body())) + .build(); + return chain.proceed(compressedRequest); + } + + private RequestBody gzip(final RequestBody body) { + return new RequestBody() { + @Override public MediaType contentType() { + return body.contentType(); + } + + @Override public long contentLength() { + return -1; // We don't know the compressed length in advance! + } + + @Override public void writeTo(BufferedSink sink) throws IOException { + BufferedSink gzipSink = Okio.buffer(new GzipSink(sink)); + body.writeTo(gzipSink); + gzipSink.close(); + } + }; + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java index 41dec08ee9..22e37ec539 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java @@ -7,7 +7,7 @@ import java.io.Serializable; */ public class MapboxEvent implements Serializable { public static final int VERSION_NUMBER = 2; - public static final String MAPBOX_EVENTS_BASE_URL = "https://api.mapbox.com"; + public static final String MAPBOX_EVENTS_BASE_URL = "https://events.mapbox.com"; public static final String SOURCE_MAPBOX = "mapbox"; // Event Types diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java index b386ed6549..84df822ce9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java @@ -88,8 +88,12 @@ public class MapboxEventManager { private static long flushDelayInMillis = 1000 * 60 * 3; // 3 Minutes private static final int SESSION_ID_ROTATION_HOURS = 24; + private static final int FLUSH_EVENTS_CAP = 1000; + private static MessageDigest messageDigest = null; + private static final double locationEventAccuracy = 10000000; + private Timer timer = null; /** @@ -159,10 +163,12 @@ public class MapboxEventManager { ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA); String stagingURL = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_STAGING_SERVER); String stagingAccessToken = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_STAGING_ACCESS_TOKEN); - String appName = context.getPackageManager().getApplicationLabel(appInfo).toString(); - PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); - String versionName = packageInfo.versionName; - int versionCode = packageInfo.versionCode; + + if (TextUtils.isEmpty(stagingURL) || TextUtils.isEmpty(stagingAccessToken)) { + Log.d(TAG, "Looking in SharedPreferences for Staging Credentials"); + stagingURL = prefs.getString(MapboxConstants.MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_URL, null); + stagingAccessToken = prefs.getString(MapboxConstants.MAPBOX_SHARED_PREFERENCE_KEY_TELEMETRY_STAGING_ACCESS_TOKEN, null); + } if (!TextUtils.isEmpty(stagingURL)) { eventsURL = stagingURL; @@ -172,6 +178,11 @@ public class MapboxEventManager { this.accessToken = stagingAccessToken; } + String appName = context.getPackageManager().getApplicationLabel(appInfo).toString(); + PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); + String versionName = packageInfo.versionName; + int versionCode = packageInfo.versionCode; + // Build User Agent if (TextUtils.equals(userAgent, BuildConfig.MAPBOX_EVENTS_USER_AGENT_BASE) && !TextUtils.isEmpty(appName) && !TextUtils.isEmpty(versionName)) { userAgent = appName + "/" + versionName + "/" + versionCode + " " + userAgent; @@ -309,23 +320,48 @@ public class MapboxEventManager { } /** + * Centralized method for adding populated event to the queue allowing for cap size checking + * @param event Event to add to the Events Queue + */ + private void putEventOnQueue(@NonNull Hashtable<String, Object> event) { + if (event == null) { + return; + } + events.add(event); + if (events.size() == FLUSH_EVENTS_CAP) { + Log.d(TAG, "eventsSize == flushCap so send data."); + flushEventsQueueImmediately(); + } + } + + /** * Adds a Location Event to the system for processing * @param location Location event */ public void addLocationEvent(Location location) { + + // NaN and Infinite checks to prevent JSON errors at send to server time + if (Double.isNaN(location.getLatitude()) || Double.isNaN(location.getLongitude()) || Double.isNaN(location.getAltitude())) { + return; + } + + if (Double.isInfinite(location.getLatitude()) || Double.isInfinite(location.getLongitude()) || Double.isInfinite(location.getAltitude())) { + return; + } + // Add Location even to queue Hashtable<String, Object> event = new Hashtable<>(); event.put(MapboxEvent.ATTRIBUTE_EVENT, MapboxEvent.TYPE_LOCATION); event.put(MapboxEvent.ATTRIBUTE_CREATED, generateCreateDate()); event.put(MapboxEvent.ATTRIBUTE_SOURCE, MapboxEvent.SOURCE_MAPBOX); event.put(MapboxEvent.ATTRIBUTE_SESSION_ID, encodeString(mapboxSessionId)); - event.put(MapboxEvent.KEY_LATITUDE, location.getLatitude()); - event.put(MapboxEvent.KEY_LONGITUDE, location.getLongitude()); + event.put(MapboxEvent.KEY_LATITUDE, Math.floor(location.getLatitude() * locationEventAccuracy) / locationEventAccuracy); + event.put(MapboxEvent.KEY_LONGITUDE, Math.floor(location.getLongitude() * locationEventAccuracy) / locationEventAccuracy); event.put(MapboxEvent.KEY_ALTITUDE, location.getAltitude()); event.put(MapboxEvent.ATTRIBUTE_OPERATING_SYSTEM, operatingSystem); event.put(MapboxEvent.ATTRIBUTE_APPLICATION_STATE, getApplicationState()); - events.add(event); + putEventOnQueue(event); rotateSessionId(); } @@ -364,7 +400,7 @@ public class MapboxEventManager { eventWithAttributes.put(MapboxEvent.ATTRIBUTE_WIFI, getConnectedToWifi()); // Put Map Load on events before Turnstile clears it - events.add(eventWithAttributes); + putEventOnQueue(eventWithAttributes); // Turnstile pushTurnstileEvent(); @@ -391,7 +427,7 @@ public class MapboxEventManager { return; } - events.add(eventWithAttributes); + putEventOnQueue(eventWithAttributes); } /** @@ -608,7 +644,9 @@ public class MapboxEventManager { // ========= JSONArray jsonArray = new JSONArray(); - for (Hashtable<String, Object> evt : events) { + Vector<Hashtable<String, Object>> eventsClone = (Vector<Hashtable<String, Object>>) events.clone(); + + for (Hashtable<String, Object> evt : eventsClone) { JSONObject jsonObject = new JSONObject(); // Build the JSON but only if there's a value for it in the evt @@ -686,19 +724,23 @@ public class MapboxEventManager { .add("cloudfront-staging.tilestream.net", "sha256/sPbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=") .add("cloudfront-staging.tilestream.net", "sha256/h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=") // Prod - Geotrust - .add("api.mapbox.com", "sha256/svaiYM/ZVIfxC+CMDe4kj1KsviQmzyZ9To8nQqUJwFI=") - .add("api.mapbox.com", "sha256/owrR9U9FWDWtrFF+myoRIu75JwU4sJwzvhCNLZoY37g=") - .add("api.mapbox.com", "sha256/SQVGZiOrQXi+kqxcvWWE96HhfydlLVqFr4lQTqI5qqo=") + .add("events.mapbox.com", "sha256/BhynraKizavqoC5U26qgYuxLZst6pCu9J5stfL6RSYY=") + .add("events.mapbox.com", "sha256/owrR9U9FWDWtrFF+myoRIu75JwU4sJwzvhCNLZoY37g=") + .add("events.mapbox.com", "sha256/SQVGZiOrQXi+kqxcvWWE96HhfydlLVqFr4lQTqI5qqo=") // Prod - DigiCert - .add("api.mapbox.com", "sha256/JL+uwAwpA2U1UVl/AFdZy1ZnvkZJ1P1hRfmfPaPVSLU=") - .add("api.mapbox.com", "sha256/RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=") - .add("api.mapbox.com", "sha256/WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=") + .add("events.mapbox.com", "sha256/Tb0uHZ/KQjWh8N9+CZFLc4zx36LONQ55l6laDi1qtT4=") + .add("events.mapbox.com", "sha256/RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=") + .add("events.mapbox.com", "sha256/WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=") .build(); - OkHttpClient client = new OkHttpClient.Builder().certificatePinner(certificatePinner).build(); + OkHttpClient client = new OkHttpClient.Builder() + .certificatePinner(certificatePinner) + .addInterceptor(new GzipRequestInterceptor()) + .build(); RequestBody body = RequestBody.create(JSON, jsonArray.toString()); String url = eventsURL + "/events/v2?access_token=" + accessToken; +// Log.d(TAG, "Events URL = " + url); Request request = new Request.Builder() .url(url) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index a0de07c5f1..ef404840e8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.utils; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; @@ -11,6 +12,10 @@ import android.util.TypedValue; import android.widget.ImageView; import com.mapbox.mapboxsdk.R; +import com.mapbox.mapboxsdk.exceptions.ConversionException; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class ColorUtils { @@ -87,4 +92,26 @@ public class ColorUtils { Drawable wrappedDrawable = DrawableCompat.wrap(originalDrawable); DrawableCompat.setTintList(wrappedDrawable, getSelector(tintColor)); } + + static int normalizeColorComponent(String value) { + return (int) (Float.parseFloat(value) * 255); + } + + /** + * Convert an rgba string to a Color int + * + * @throws ConversionException on illegal input + */ + @ColorInt + public static int rgbaToColor(String value) { + Pattern c = Pattern.compile("rgba?\\s*\\(\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*,\\s*(\\d+\\.?\\d*)\\s*,?\\s*(\\d+\\.?\\d*)?\\s*\\)"); + Matcher m = c.matcher(value); + if (m.matches() && m.groupCount() == 3) { + return Color.rgb(normalizeColorComponent(m.group(1)), normalizeColorComponent(m.group(2)), normalizeColorComponent(m.group(3))); + } else if (m.matches() && m.groupCount() == 4) { + return Color.argb(normalizeColorComponent(m.group(4)), normalizeColorComponent(m.group(1)), normalizeColorComponent(m.group(2)), normalizeColorComponent(m.group(3))); + } else { + throw new ConversionException("Not a valid rgb/rgba value"); + } + } }
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png Binary files differnew file mode 100644 index 0000000000..651482f3ee --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png Binary files differnew file mode 100644 index 0000000000..63cb7b5f4b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png Binary files differnew file mode 100644 index 0000000000..175f88ff88 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png Binary files differnew file mode 100644 index 0000000000..be782e1d4b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png Binary files differnew file mode 100644 index 0000000000..fe1c486518 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index 9799487f12..2616724865 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <TextureView - android:id="@+id/textureView" + <SurfaceView + android:id="@+id/surfaceView" android:layout_width="match_parent" android:layout_height="match_parent" /> + <FrameLayout + android:id="@+id/markerViewContainer" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent"/> + <com.mapbox.mapboxsdk.maps.widgets.CompassView android:id="@+id/compassView" android:layout_width="wrap_content" @@ -23,15 +29,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" + android:background="@drawable/bg_default_selector" android:clickable="true" android:contentDescription="@string/attributionsIconContentDescription" android:padding="7dp" - android:src="@drawable/ic_info_outline_24dp_selector" - android:background="@drawable/bg_default_selector"/> + android:src="@drawable/ic_info_outline_24dp_selector" /> <com.mapbox.mapboxsdk.maps.widgets.MyLocationView android:id="@+id/userLocationView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_width="match_parent" + android:layout_height="match_parent" /> </merge>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml new file mode 100644 index 0000000000..7e4a079063 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index d6cca7090f..fd0f4b98e7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -9,6 +9,5 @@ <dimen name="ten_dp">10dp</dimen> <dimen name="sixteen_dp">16dp</dimen> <dimen name="seventy_six_dp">76dp</dimen> - <dimen name="my_locationview_size">64dp</dimen> <dimen name="my_locationview_outer_circle">18dp</dimen> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index becbcce0b0..687b85b2d8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -11,11 +11,14 @@ <string name="infoWindowAddress">Address</string> <!-- these are public --> - <!-- {@deprecated Use Style.getXStyleUrl(int version) instead.} --> + <!-- Using one of these constants means your map style will always use the latest version and + may change as we improve the style. --> <string name="style_mapbox_streets">mapbox://styles/mapbox/streets-v9</string> + <string name="style_outdoors">mapbox://styles/mapbox/outdoors-v9</string> + <!-- Note: Emerald style has been deprecated and will be removed in a future release--> <string name="style_emerald">mapbox://styles/mapbox/emerald-v8</string> <string name="style_light">mapbox://styles/mapbox/light-v9</string> <string name="style_dark">mapbox://styles/mapbox/dark-v9</string> <string name="style_satellite">mapbox://styles/mapbox/satellite-v9</string> - <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-hybrid-v9</string> + <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-streets-v9</string> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties index 8c1dcc38ce..63cccc00ef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties +++ b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties @@ -1,3 +1,3 @@ fabric-identifier=com.mapbox.mapboxsdk.mapbox-android-sdk -fabric-version=4.0.0 +fabric-version=4.1.1 fabric-build-type=binary |
