Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[android] - remove MarkerView API
Browse files Browse the repository at this point in the history
  • Loading branch information
tobrun committed Nov 14, 2018
1 parent 6ea511b commit 1ceea72
Show file tree
Hide file tree
Showing 36 changed files with 48 additions and 3,533 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,19 @@
/**
* Factory for creating Icons from bitmap images.
* <p>
* icon is used to display bitmaps on top of the map using {@link Marker} and {@link MarkerView}.
* icon is used to display bitmaps on top of the map using {@link Marker}.
* </p>
*
* @see Icon
*/
public final class IconFactory {

private static final String ICON_ID_PREFIX = "com.mapbox.icons.icon_";
public static final Bitmap ICON_MARKERVIEW_BITMAP = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8);
public static final String ICON_MARKERVIEW_ID = ICON_ID_PREFIX + "marker_view";

private Context context;
@SuppressLint("StaticFieldLeak")
private static IconFactory instance;
private Icon defaultMarker;
private Icon defaultMarkerView;
private BitmapFactory.Options options;

private int nextId = 0;
Expand Down Expand Up @@ -121,18 +118,6 @@ public Icon defaultMarker() {
return defaultMarker;
}

/**
* Provides an icon using the default marker icon used for {@link MarkerView}.
*
* @return An icon with the default {@link MarkerView} icon.
*/
public Icon defaultMarkerView() {
if (defaultMarkerView == null) {
defaultMarkerView = fromResource(R.drawable.mapbox_markerview_icon_default);
}
return defaultMarkerView;
}

private Icon fromInputStream(@NonNull InputStream is) {
Bitmap bitmap = BitmapFactory.decodeStream(is, null, options);
return fromBitmap(bitmap);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@
import java.lang.ref.WeakReference;

/**
* {@code InfoWindow} is a tooltip shown when a {@link Marker} or {@link MarkerView} is tapped. Only
* {@code InfoWindow} is a tooltip shown when a {@link Marker} is tapped. Only
* one info window is displayed at a time. When the user clicks on a marker, the currently open info
* window will be closed and the new info window will be displayed. If the user clicks the same
* marker while its info window is currently open, the info window will be closed.
* <p>
* The info window is drawn oriented against the device's screen, centered above its associated
* marker by default. The info window anchoring can be adjusted using
* {@link MarkerView#setInfoWindowAnchor(float, float)} for {@link MarkerView}. The default info
* window contains the title in bold and snippet text below the title. While either the title and
* marker by default. The default info window contains the title in bold and snippet text below the title.
* While either the title and
* snippet are optional, at least one is required to open the info window.
* </p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
* {@link LatLng} and using {@link MapboxMap#addMarker(MarkerOptions)}. The marker icon will be
* centered at this position so it is common to add padding to the icon image before usage.
* <p>
* If more customization is needed, we offer {@link MarkerView} which places a {@link View} on top
* of the map at a geographical location.
* </p>
* <p>
* Markers are designed to be interactive. They receive click events by default, and are often used
* with event listeners to bring up info windows. An {@link InfoWindow} is displayed by default when
* either a title or snippet is provided.
Expand Down Expand Up @@ -62,11 +58,6 @@ public Marker(BaseMarkerOptions baseMarkerOptions) {
this(baseMarkerOptions.position, baseMarkerOptions.icon, baseMarkerOptions.title, baseMarkerOptions.snippet);
}

Marker(BaseMarkerViewOptions baseMarkerViewOptions) {
this(baseMarkerViewOptions.position, baseMarkerViewOptions.icon,
baseMarkerViewOptions.title, baseMarkerViewOptions.snippet);
}

Marker(LatLng position, Icon icon, String title, String snippet) {
this.position = position;
this.title = title;
Expand Down
Loading

0 comments on commit 1ceea72

Please sign in to comment.