diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation')
7 files changed, 74 insertions, 71 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java index c06e58dc26..282ac9b18c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java @@ -32,7 +32,7 @@ import java.util.Random; public class AnimatedMarkerActivity extends AppCompatActivity { private MapView mMapView; - private MapboxMap mMapboxMap; + private MapboxMap mapboxMap; private LatLng dupontCircle = new LatLng(38.90962, -77.04341); @@ -59,9 +59,9 @@ public class AnimatedMarkerActivity extends AppCompatActivity { @Override public void onMapReady(@NonNull final MapboxMap mapboxMap) { - mMapboxMap = mapboxMap; + AnimatedMarkerActivity.this.mapboxMap = mapboxMap; setupMap(); - + for (int i = 0; i < 10; i++) { addRandomCar(); } @@ -78,7 +78,7 @@ public class AnimatedMarkerActivity extends AppCompatActivity { .target(dupontCircle) .zoom(15) .build(); - mMapboxMap.setCameraPosition(cameraPosition); + mapboxMap.setCameraPosition(cameraPosition); } private void addPassenger() { @@ -87,7 +87,7 @@ public class AnimatedMarkerActivity extends AppCompatActivity { if (passengerMarker == null) { Icon icon = IconFactory.getInstance(AnimatedMarkerActivity.this) .fromResource(R.drawable.ic_directions_run_black_24dp); - passengerMarker = mMapboxMap.addMarker(new MarkerViewOptions() + passengerMarker = mapboxMap.addMarker(new MarkerViewOptions() .position(randomLatLng) .icon(icon)); } else { @@ -105,7 +105,7 @@ public class AnimatedMarkerActivity extends AppCompatActivity { } // Make sure the car marker is selected so that it's always brought to the front (#5285) - mMapboxMap.selectMarker(carMarker); + mapboxMap.selectMarker(carMarker); } private void animateMoveToPassenger(final MarkerView car) { @@ -154,19 +154,19 @@ public class AnimatedMarkerActivity extends AppCompatActivity { .fromResource(carResource); //View Markers - return mMapboxMap.addMarker(new MarkerViewOptions() + return mapboxMap.addMarker(new MarkerViewOptions() .position(start) .icon(icon)); //GL Markers -// return mMapboxMap.addMarker(new MarkerOptions() +// return mapboxMap.addMarker(new MarkerOptions() // .position(start) // .icon(icon)); } private LatLng getLatLngInBounds() { - LatLngBounds bounds = mMapboxMap.getProjection().getVisibleRegion().latLngBounds; + LatLngBounds bounds = mapboxMap.getProjection().getVisibleRegion().latLngBounds; Random generator = new Random(); double randomLat = bounds.getLatSouth() + generator.nextDouble() * (bounds.getLatNorth() - bounds.getLatSouth()); double randomLon = bounds.getLonWest() + generator.nextDouble() * (bounds.getLonEast() - bounds.getLonWest()); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java index e4bf383c96..f49407626d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java @@ -43,7 +43,7 @@ import java.util.Random; public class BulkMarkerActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener { - private MapboxMap mMapboxMap; + private MapboxMap mapboxMap; private MapView mMapView; private boolean mCustomMarkerView; private List<LatLng> mLocations; @@ -68,7 +68,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView mMapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - mMapboxMap = mapboxMap; + BulkMarkerActivity.this.mapboxMap = mapboxMap; if (actionBar != null) { ArrayAdapter<CharSequence> spinnerAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.bulk_marker_list, android.R.layout.simple_spinner_item); @@ -102,7 +102,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView } private void showMarkers(int amount) { - mMapboxMap.clear(); + mapboxMap.clear(); if (mLocations.size() < amount) { amount = mLocations.size(); @@ -128,7 +128,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView for (int i = 0; i < amount; i++) { randomIndex = random.nextInt(mLocations.size()); LatLng latLng = mLocations.get(randomIndex); - mMapboxMap.addMarker(new MarkerViewOptions() + mapboxMap.addMarker(new MarkerViewOptions() .position(latLng) .icon(icon) .title(String.valueOf(i)) @@ -151,7 +151,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude()))); } - mMapboxMap.addMarkers(markerOptionsList); + mapboxMap.addMarkers(markerOptionsList); } @Override @@ -203,7 +203,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView private class FabClickListener implements View.OnClickListener { @Override public void onClick(final View v) { - if (mMapboxMap != null) { + if (mapboxMap != null) { mCustomMarkerView = true; // remove fab @@ -226,7 +226,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView @Override public void onMapChanged(@MapView.MapChange int change) { if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) { - if (!mMapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) { + if (!mapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) { TextView viewCountView = (TextView) findViewById(R.id.countView); viewCountView.setText("ViewCache size " + (mMapView.getChildCount() - 5)); } @@ -234,7 +234,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView } }); - mMapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() { + mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() { @Override public boolean onMarkerClick(@NonNull Marker marker, @NonNull View view, @NonNull MapboxMap.MarkerViewAdapter adapter) { Toast.makeText(BulkMarkerActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java index 0c4eeae5ad..ce86a78099 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java @@ -5,7 +5,6 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; -import android.graphics.PointF; import android.os.Bundle; import android.os.Handler; import android.support.annotation.NonNull; @@ -42,7 +41,7 @@ import java.util.Random; public class MarkerViewActivity extends AppCompatActivity { - private MapboxMap mMapboxMap; + private MapboxMap mapboxMap; private MapView mMapView; private MarkerView movingMarkerOne, movingMarkerTwo; @@ -80,7 +79,7 @@ public class MarkerViewActivity extends AppCompatActivity { mMapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - mMapboxMap = mapboxMap; + MarkerViewActivity.this.mapboxMap = mapboxMap; final MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager(); @@ -89,7 +88,7 @@ public class MarkerViewActivity extends AppCompatActivity { // add default ViewMarker markers for (int i = 0; i < LAT_LNGS.length; i++) { - mMapboxMap.addMarker(new MarkerViewOptions() + MarkerViewActivity.this.mapboxMap.addMarker(new MarkerViewOptions() .position(LAT_LNGS[i]) .title(String.valueOf(i)) .alpha(0.5f) @@ -106,22 +105,22 @@ public class MarkerViewActivity extends AppCompatActivity { options.flat(true); mapboxMap.addMarker(options); - mMapboxMap.addMarker(new MarkerOptions() + MarkerViewActivity.this.mapboxMap.addMarker(new MarkerOptions() .title("United States") .position(new LatLng(38.902580, -77.050102)) ); - mMapboxMap.addMarker(new TextMarkerViewOptions() + MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions() .text("A") .position(new LatLng(38.889876, -77.008849)) ); - mMapboxMap.addMarker(new TextMarkerViewOptions() + MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions() .text("B") .position(new LatLng(38.907327, -77.041293)) ); - mMapboxMap.addMarker(new TextMarkerViewOptions() + MarkerViewActivity.this.mapboxMap.addMarker(new TextMarkerViewOptions() .text("C") .position(new LatLng(38.897642, -77.041980)) ); @@ -144,7 +143,7 @@ public class MarkerViewActivity extends AppCompatActivity { }); // add a OnMarkerView click listener - mMapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() { + MarkerViewActivity.this.mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() { @Override public boolean onMarkerClick(@NonNull Marker marker, @NonNull View view, @NonNull MapboxMap.MarkerViewAdapter adapter) { Toast.makeText(MarkerViewActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show(); @@ -152,7 +151,7 @@ public class MarkerViewActivity extends AppCompatActivity { } }); - movingMarkerOne = mMapboxMap.addMarker(new MarkerViewOptions() + movingMarkerOne = MarkerViewActivity.this.mapboxMap.addMarker(new MarkerViewOptions() .position(CarLocation.CAR_0_LNGS[0]) .icon(IconFactory.getInstance(mMapView.getContext()) .fromResource(R.drawable.ic_chelsea)) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java index 37b1d32a68..bd183b9ab9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewScaleActivity.java @@ -21,10 +21,11 @@ import com.mapbox.mapboxsdk.testapp.R; import java.util.Locale; -public class MarkerViewScaleActivity extends AppCompatActivity { +public class MarkerViewScaleActivity extends AppCompatActivity implements OnMapReadyCallback { - private MapView mMapView; - private View mMarkerView; + private MapboxMap mapboxMap; + private MapView mapView; + private View markerView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -44,22 +45,23 @@ public class MarkerViewScaleActivity extends AppCompatActivity { TextView xText = (TextView) findViewById(R.id.textview_factor); xBar.setOnSeekBarChangeListener(new FactorChangeListener(xText)); - mMapView = (MapView) findViewById(R.id.mapView); - mMapView.onCreate(savedInstanceState); - mMapView.getMapAsync(new OnMapReadyCallback() { - @Override - public void onMapReady(MapboxMap mapboxMap) { - Icon icon = IconFactory.getInstance(MarkerViewScaleActivity.this) - .fromResource(R.drawable.ic_circle); + mapView = (MapView) findViewById(R.id.mapView); + mapView.onCreate(savedInstanceState); + mapView.getMapAsync(this); + } - MarkerView mMarker = mapboxMap.addMarker(new MarkerViewOptions() - .position(new LatLng(38.907192, -77.036871)) - .icon(icon) - .flat(true)); + @Override + public void onMapReady(MapboxMap map) { + mapboxMap = map; + Icon icon = IconFactory.getInstance(MarkerViewScaleActivity.this) + .fromResource(R.drawable.ic_circle); - mMarkerView = mapboxMap.getMarkerViewManager().getView(mMarker); - } - }); + MarkerView mMarker = mapboxMap.addMarker(new MarkerViewOptions() + .position(new LatLng(38.907192, -77.036871)) + .icon(icon) + .flat(true)); + + markerView = mapboxMap.getMarkerViewManager().getView(mMarker); } @Override @@ -76,31 +78,31 @@ public class MarkerViewScaleActivity extends AppCompatActivity { @Override public void onResume() { super.onResume(); - mMapView.onResume(); + mapView.onResume(); } @Override public void onPause() { super.onPause(); - mMapView.onPause(); + mapView.onPause(); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - mMapView.onSaveInstanceState(outState); + mapView.onSaveInstanceState(outState); } @Override protected void onDestroy() { super.onDestroy(); - mMapView.onDestroy(); + mapView.onDestroy(); } @Override public void onLowMemory() { super.onLowMemory(); - mMapView.onLowMemory(); + mapView.onLowMemory(); } private class FactorChangeListener implements SeekBar.OnSeekBarChangeListener { @@ -115,10 +117,9 @@ public class MarkerViewScaleActivity extends AppCompatActivity { public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { float newScale = getScale(progress); xText.setText(String.format(Locale.US, "Scale: %.1f", newScale)); - if (MarkerViewScaleActivity.this.mMarkerView != null) { - mMarkerView.setScaleX(newScale); - mMarkerView.setScaleY(newScale); - + if (MarkerViewScaleActivity.this.markerView != null) { + markerView.setScaleX(newScale); + markerView.setScaleY(newScale); } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java index 9f3940bd3f..e4dbaf54db 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java @@ -23,7 +23,7 @@ import com.mapbox.mapboxsdk.testapp.R; import java.util.ArrayList; import java.util.List; -public class PolygonActivity extends AppCompatActivity { +public class PolygonActivity extends AppCompatActivity implements OnMapReadyCallback { private static final int BLUE_COLOR = Color.parseColor("#3bb2d0"); private static final int RED_COLOR = Color.parseColor("#AF0000"); @@ -52,6 +52,7 @@ public class PolygonActivity extends AppCompatActivity { }}; private MapView mapView; + private MapboxMap mapboxMap; private Polygon polygon; private boolean fullAlpha = true; @@ -85,22 +86,24 @@ public class PolygonActivity extends AppCompatActivity { // create map mapView = new MapView(this, options); + mapView.setId(R.id.mapView); mapView.onCreate(savedInstanceState); - mapView.getMapAsync(new OnMapReadyCallback() { - @Override - public void onMapReady(MapboxMap mapboxMap) { - POINTS.addAll(ADDITIONAL_POINTS); - polygon = mapboxMap.addPolygon(new PolygonOptions() - .addAll(POINTS) - .fillColor(BLUE_COLOR)); - } - }); + mapView.getMapAsync(this); // add to layout ((ViewGroup) findViewById(R.id.container)).addView(mapView); } @Override + public void onMapReady(MapboxMap mapboxMap) { + this.mapboxMap = mapboxMap; + POINTS.addAll(ADDITIONAL_POINTS); + polygon = mapboxMap.addPolygon(new PolygonOptions() + .addAll(POINTS) + .fillColor(BLUE_COLOR)); + } + + @Override public void onResume() { super.onResume(); mapView.onResume(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java index 5b45223da0..7dec4e9038 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java @@ -40,7 +40,7 @@ public class PolylineActivity extends AppCompatActivity { private List<Polyline> mPolylines; private ArrayList<PolylineOptions> mPolylineOptions = new ArrayList<>(); private MapView mMapView; - private MapboxMap mMapboxMap; + private MapboxMap mapboxMap; private boolean fullAlpha = true; private boolean visible = true; @@ -72,7 +72,7 @@ public class PolylineActivity extends AppCompatActivity { mMapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - mMapboxMap = mapboxMap; + PolylineActivity.this.mapboxMap = mapboxMap; mPolylines = mapboxMap.addPolylines(mPolylineOptions); } }); @@ -82,19 +82,19 @@ public class PolylineActivity extends AppCompatActivity { fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (mMapboxMap != null) { + if (mapboxMap != null) { if (mPolylines != null && mPolylines.size() > 0) { if (mPolylines.size() == 1) { // test for removing annotation - mMapboxMap.removeAnnotation(mPolylines.get(0)); + mapboxMap.removeAnnotation(mPolylines.get(0)); } else { // test for removing annotations - mMapboxMap.removeAnnotations(mPolylines); + mapboxMap.removeAnnotations(mPolylines); } } mPolylineOptions.clear(); mPolylineOptions.addAll(getRandomLine()); - mPolylines = mMapboxMap.addPolylines(mPolylineOptions); + mPolylines = mapboxMap.addPolylines(mPolylineOptions); } } @@ -172,7 +172,7 @@ public class PolylineActivity extends AppCompatActivity { case R.id.action_id_remove: // test to remove all annotations mPolylineOptions.clear(); - mMapboxMap.clear(); + mapboxMap.clear(); return true; case R.id.action_id_alpha: diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java index 0c014f7693..6784ac0914 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PressForMarkerActivity.java @@ -44,7 +44,7 @@ public class PressForMarkerActivity extends AppCompatActivity { actionBar.setDisplayShowHomeEnabled(true); } - mapView = (MapView) findViewById(R.id.pressForMarkerMapView); + mapView = (MapView) findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override |