From daacb103d4ceafe79dab928613839a46dc75d95a Mon Sep 17 00:00:00 2001 From: langsmith Date: Thu, 31 Jan 2019 15:08:27 -0800 Subject: [PATCH] Log removal and using Timber --- .../examples/dds/BathymetryActivity.java | 4 ++- .../dds/ChoroplethJsonVectorMixActivity.java | 5 ++-- .../dds/CircleLayerClusteringActivity.java | 5 ++-- .../examples/dds/CreateHotspotsActivity.java | 5 ++-- .../examples/dds/DrawGeojsonLineActivity.java | 6 ++--- .../dds/ExpressionIntegrationActivity.java | 4 ++- .../examples/dds/ImageClusteringActivity.java | 4 ++- .../dds/MultipleHeatmapStylingActivity.java | 5 ++-- .../StyleLineIdentityPropertyActivity.java | 5 ++-- .../PopulationDensityExtrusionActivity.java | 13 ---------- .../extrusions/RotationExtrusionActivity.java | 7 +++--- .../javaservices/DirectionsActivity.java | 2 -- .../javaservices/IsochroneActivity.java | 4 +-- .../javaservices/MapMatchingActivity.java | 11 ++++---- .../javaservices/MatrixApiActivity.java | 6 ++--- .../javaservices/OptimizationActivity.java | 9 ++++--- .../SimplifyPolylineActivity.java | 4 ++- .../javaservices/StaticImageActivity.java | 4 ++- .../DashedLineDirectionsPickerActivity.java | 7 +++--- .../examples/labs/IndoorMapActivity.java | 3 --- .../examples/labs/InsetMapActivity.java | 1 - .../examples/labs/LocationPickerActivity.java | 5 ++-- .../labs/MarkerFollowingRouteActivity.java | 4 ++- .../labs/SnakingDirectionsRouteActivity.java | 7 +++--- .../labs/SpaceStationLocationActivity.java | 5 ++-- .../offline/OfflineManagerActivity.java | 25 ++++++++++--------- .../offline/SimpleOfflineMapActivity.java | 21 ++++++++-------- .../examples/query/ClickOnLayerActivity.java | 6 +++-- .../query/HighlightedLineActivity.java | 4 ++- .../styles/ClickToAddImageActivity.java | 4 ++- .../examples/styles/HillShadeActivity.java | 4 --- 31 files changed, 102 insertions(+), 97 deletions(-) diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java index b135e62cb..0b480d042 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java @@ -21,6 +21,8 @@ import java.io.InputStream; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.eq; import static com.mapbox.mapboxsdk.style.expressions.Expression.geometryType; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; @@ -177,7 +179,7 @@ private String loadGeoJsonFromAsset(String filename) { return new String(buffer, "UTF-8"); } catch (Exception exception) { - Log.e("BathymetryActivity", "Exception Loading GeoJSON: " + exception.toString()); + Timber.e("Exception Loading GeoJSON: %s", exception.toString()); exception.printStackTrace(); return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java index efd2acca8..aa839a21f 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java @@ -5,7 +5,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import com.mapbox.mapboxandroiddemo.R; import com.mapbox.mapboxsdk.Mapbox; @@ -25,6 +24,8 @@ import java.lang.ref.WeakReference; import java.util.Scanner; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.expressions.Expression.match; import static com.mapbox.mapboxsdk.style.expressions.Expression.rgba; @@ -143,7 +144,7 @@ protected Expression.Stop[] doInBackground(Void... voids) { return stops; } } catch (Exception exception) { - Log.d("JsonVectorMixActivity", "Exception Loading GeoJSON: " + exception.toString()); + Timber.d("Exception Loading GeoJSON: %s", exception.toString()); } return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java index b9e284fad..95ad9fb5a 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java @@ -5,7 +5,6 @@ import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.widget.Toast; import com.mapbox.mapboxandroiddemo.R; @@ -26,6 +25,8 @@ import java.net.MalformedURLException; import java.net.URL; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.all; import static com.mapbox.mapboxsdk.style.expressions.Expression.division; import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential; @@ -156,7 +157,7 @@ private void addClusteredGeoJsonSource(@NonNull Style loadedMapStyle) { ) ); } catch (MalformedURLException malformedUrlException) { - Log.e("dataClusterActivity", "Check the URL " + malformedUrlException.getMessage()); + Timber.e("Check the URL %s", malformedUrlException.getMessage()); } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java index 4872e75d3..b933fa914 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import com.mapbox.mapboxandroiddemo.R; import com.mapbox.mapboxsdk.Mapbox; @@ -20,6 +19,8 @@ import java.net.MalformedURLException; import java.net.URL; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; import static com.mapbox.mapboxsdk.style.expressions.Expression.toNumber; @@ -76,7 +77,7 @@ private void addClusteredGeoJsonSource(@NonNull Style loadedMapStyle) { ) ); } catch (MalformedURLException malformedUrlException) { - Log.e("CreateHotspotsActivity", "Check the URL " + malformedUrlException.getMessage()); + Timber.e("Check the URL %s", malformedUrlException.getMessage()); } // Use the earthquakes source to create four layers: diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java index a4c868330..b23e937c3 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java @@ -24,13 +24,13 @@ import java.lang.ref.WeakReference; import java.util.Scanner; +import timber.log.Timber; + /** * Draw a polyline by parsing a GeoJSON file with the Mapbox Android SDK. */ public class DrawGeojsonLineActivity extends AppCompatActivity implements OnMapReadyCallback { - private static final String TAG = "DrawGeojsonLineActivity"; - private MapView mapView; private MapboxMap mapboxMap; @@ -98,7 +98,7 @@ protected FeatureCollection doInBackground(Void... voids) { return FeatureCollection.fromJson(convertStreamToString(inputStream)); } } catch (Exception exception) { - Log.e(TAG, "Exception Loading GeoJSON: " + exception.toString()); + Timber.e("Exception Loading GeoJSON: %s" , exception.toString()); } return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java index a4c2a1bf5..199c40acb 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java @@ -38,6 +38,8 @@ import java.util.List; import java.util.Scanner; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.all; import static com.mapbox.mapboxsdk.style.expressions.Expression.concat; import static com.mapbox.mapboxsdk.style.expressions.Expression.division; @@ -208,7 +210,7 @@ protected FeatureCollection doInBackground(Void... voids) { return featureCollection; } } catch (Exception exception) { - Log.d("ExpressionIntegration", "Exception Loading GeoJSON: " + exception.toString()); + Timber.d("Exception Loading GeoJSON: %s", exception.toString()); } return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java index f18ce2779..6d6d7b8b5 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java @@ -22,6 +22,8 @@ import java.net.MalformedURLException; import java.net.URL; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.all; import static com.mapbox.mapboxsdk.style.expressions.Expression.division; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; @@ -97,7 +99,7 @@ private void addClusteredGeoJsonSource(@NonNull Style loadedMapStyle) { ) ); } catch (MalformedURLException malformedUrlException) { - Log.e("dataClusterActivity", "Check the URL " + malformedUrlException.getMessage()); + Timber.e("Check the URL %s" , malformedUrlException.getMessage()); } //Creating a SymbolLayer icon layer for single data/icon points diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java index 9563f0d3f..5c80d300c 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import com.mapbox.mapboxandroiddemo.R; @@ -21,6 +20,8 @@ import java.io.InputStream; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.heatmapDensity; import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate; import static com.mapbox.mapboxsdk.style.expressions.Expression.linear; @@ -423,7 +424,7 @@ private String loadGeoJsonFromAsset(String filename) { return new String(buffer, "UTF-8"); } catch (Exception exception) { - Log.e("MultipleHeatmapStyling", "Exception loading GeoJSON: " + exception.toString()); + Timber.e("Exception loading GeoJSON: %s", exception.toString()); exception.printStackTrace(); return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java index 53b43c35f..64022c263 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import com.mapbox.mapboxandroiddemo.R; import com.mapbox.mapboxsdk.Mapbox; @@ -18,6 +17,8 @@ import java.io.InputStream; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.expressions.Expression.match; import static com.mapbox.mapboxsdk.style.expressions.Expression.rgb; @@ -124,7 +125,7 @@ private String loadGeoJsonFromAsset(String filename) { return new String(buffer, "UTF-8"); } catch (Exception exception) { - Log.e("StyleLineActivity", "Exception Loading GeoJSON: " + exception.toString()); + Timber.e("Exception Loading GeoJSON: %s", exception.toString()); exception.printStackTrace(); return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java index 65f28420d..c995bd326 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -152,51 +151,39 @@ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.san_francisco: goToNewLocation(37.784282779035216, -122.4232292175293); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: san_francisco"); return true; case R.id.los_angeles: goToNewLocation(34.04412546508576, -118.28636169433594); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: los_angeles"); return true; case R.id.seattle: goToNewLocation(47.60651025683697, -122.33327865600585); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: seattle"); return true; case R.id.new_orleans: goToNewLocation(29.946159058399612, -90.10042190551758); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: new_orleans"); return true; case R.id.chicago: goToNewLocation(41.87531293759582, -87.6240348815918); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: chicago"); return true; case R.id.philadelphia: goToNewLocation(39.95370120254379, -75.1626205444336); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: philadelphia"); return true; case R.id.new_york: goToNewLocation(40.72228267283148, -73.99772644042969); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: new york"); return true; case R.id.atlanta: goToNewLocation(33.74910736130734, -84.39079284667969); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: atlanta"); return true; case R.id.portland: goToNewLocation(45.522104713562825, -122.67179489135742); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: portland"); return true; case R.id.denver: goToNewLocation(39.74428621972816, -104.99565124511719); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: denver"); return true; case R.id.minneapolis: goToNewLocation(44.969656023708175, -93.26637268066406); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: minneapolis"); return true; case R.id.miami: goToNewLocation(25.773846629676616, -80.19624710083008); - Log.d("PopDensityExtrusion", "onOptionsItemSelected: miami"); return true; case android.R.id.home: finish(); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java index 4c9803ec2..681711867 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java @@ -9,7 +9,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.widget.Toast; import com.mapbox.mapboxandroiddemo.R; @@ -22,6 +21,8 @@ import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.plugins.building.BuildingPlugin; +import timber.log.Timber; + /** * Change the camera's bearing and tilt based on device movement while viewing building extrusions */ @@ -170,13 +171,13 @@ private void registerSensorListeners() { if (sensorControl.getGyro() != null) { sensorManager.registerListener(this, sensorControl.getGyro(), sensorEventDeliveryRate); } else { - Log.d("RotationExtrusion", "Whoops, no accelerometer sensor"); + Timber.d("Whoops, no accelerometer sensor"); Toast.makeText(this, R.string.no_accelerometer, Toast.LENGTH_SHORT).show(); } if (sensorControl.getMagnetic() != null) { sensorManager.registerListener(this, sensorControl.getMagnetic(), sensorEventDeliveryRate); } else { - Log.d("RotationExtrusion", "Whoops, no magnetic sensor"); + Timber.d("Whoops, no magnetic sensor"); Toast.makeText(this, R.string.no_magnetic, Toast.LENGTH_SHORT).show(); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java index ccc54f87d..0f31dba59 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java @@ -52,7 +52,6 @@ public class DirectionsActivity extends AppCompatActivity { private static final String ICON_SOURCE_ID = "icon-source-id"; private static final String RED_PIN_ICON_ID = "red-pin-icon-id"; private MapView mapView; - private MapboxMap mapboxMap; private DirectionsRoute currentRoute; private MapboxDirections client; private Point origin; @@ -75,7 +74,6 @@ protected void onCreate(Bundle savedInstanceState) { mapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - DirectionsActivity.this.mapboxMap = mapboxMap; mapboxMap.setStyle(Style.MAPBOX_STREETS, new Style.OnStyleLoaded() { @Override diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java index f593f317d..bdd23b917 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import android.widget.Toast; @@ -28,6 +27,7 @@ import java.net.URL; import okhttp3.HttpUrl; +import timber.log.Timber; import static com.mapbox.mapboxsdk.style.expressions.Expression.eq; import static com.mapbox.mapboxsdk.style.expressions.Expression.geometryType; @@ -190,7 +190,7 @@ private void addDataToMap(@NonNull Style style, @NonNull LatLng mapClickPoint) { } } catch (Throwable throwable) { - Log.e("IsochroneActivity", "Couldn't add GeoJsonSource to map", throwable); + Timber.e(throwable, "Couldn't add GeoJsonSource to map"); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java index 4ce0cf816..e6c55f01d 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java @@ -6,7 +6,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import com.mapbox.api.matching.v5.MapboxMapMatching; import com.mapbox.api.matching.v5.models.MapMatchingMatching; @@ -35,6 +34,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; import static com.mapbox.api.directions.v5.DirectionsCriteria.PROFILE_DRIVING; import static com.mapbox.core.constants.Constants.PRECISION_6; @@ -42,7 +42,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineOpacity; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth; - /** * Match raw GPS points to the map so they align with roads and pathways. */ @@ -139,7 +138,7 @@ protected FeatureCollection doInBackground(Void... voids) { return FeatureCollection.fromJson(convertStreamToString(inputStream)); } } catch (Exception exception) { - Log.e(TAG, "Exception Loading GeoJSON: " + exception.toString()); + Timber.e("Exception Loading GeoJSON: %s", exception.toString()); } return null; } @@ -202,17 +201,17 @@ public void onResponse(@NonNull Call call, drawMapMatched(Objects.requireNonNull(response.body()).matchings()); } else { // If the response code does not response "OK" an error has occurred. - Log.e(TAG, "MapboxMapMatching failed with " + response.code()); + Timber.e("MapboxMapMatching failed with %s", response.code()); } } @Override public void onFailure(Call call, Throwable throwable) { - Log.e(TAG, "MapboxMapMatching error: ", throwable); + Timber.e(throwable, "MapboxMapMatching error"); } }); } catch (ServicesException servicesException) { - Log.e(TAG, "MapboxMapMatching error: ", servicesException); + Timber.e(servicesException, "MapboxMapMatching error"); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java index 48c1f112d..3c7a9e11f 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java @@ -10,7 +10,6 @@ import android.support.v7.widget.LinearSnapHelper; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SnapHelper; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -44,6 +43,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; /** @@ -172,7 +172,7 @@ public void onResponse(Call call, public void onFailure(Call call, Throwable throwable) { Toast.makeText(MatrixApiActivity.this, R.string.call_error, Toast.LENGTH_SHORT).show(); - Log.d("MatrixApiActivity", "onResponse onFailure"); + Timber.d( "onResponse onFailure"); } }); } @@ -199,7 +199,7 @@ private String loadGeoJsonFromAsset(String filename) { is.close(); return new String(buffer, "UTF-8"); } catch (Exception exception) { - Log.d("MatrixApiActivity", "Exception Loading GeoJSON: " + exception.toString()); + Timber.d(exception.toString(), "Exception Loading GeoJSON: "); exception.printStackTrace(); return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java index d2d8a123b..75a14ba3a 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java @@ -33,6 +33,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; import static com.mapbox.core.constants.Constants.PRECISION_6; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; @@ -213,13 +214,13 @@ private void getOptimizedRoute(@NonNull final Style style, List coordinat @Override public void onResponse(Call call, Response response) { if (!response.isSuccessful()) { - Log.d("DirectionsActivity", getString(R.string.no_success)); + Timber.d( getString(R.string.no_success)); Toast.makeText(OptimizationActivity.this, R.string.no_success, Toast.LENGTH_SHORT).show(); return; } else { if (response.body().trips().isEmpty()) { - Log.d("DirectionsActivity", getString(R.string.successful_but_no_routes) + " size = " - + response.body().trips().size()); + Timber.d("%s size = %s", getString(R.string.successful_but_no_routes), response.body().trips().size()); + Toast.makeText(OptimizationActivity.this, R.string.successful_but_no_routes, Toast.LENGTH_SHORT).show(); return; @@ -233,7 +234,7 @@ public void onResponse(Call call, Response call, Throwable throwable) { - Log.d("DirectionsActivity", "Error: " + throwable.getMessage()); + Timber.d("Error: %s", throwable.getMessage()); } }); } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java index dd4a03333..950a2cfab 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java @@ -29,6 +29,8 @@ import java.util.Objects; import java.util.Scanner; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth; @@ -129,7 +131,7 @@ protected FeatureCollection doInBackground(Void... voids) { return FeatureCollection.fromJson(convertStreamToString(inputStream)); } } catch (Exception exception) { - Log.e(TAG, "Exception Loading GeoJSON: " + exception.toString()); + Timber.e("Exception loading GeoJSON: %s", exception.toString()); } return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java index 362c89c01..c06618d22 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java @@ -24,6 +24,8 @@ import com.mapbox.mapboxsdk.utils.MathUtils; import com.squareup.picasso.Picasso; +import timber.log.Timber; + /** * Use the Mapbox Static Image API found inside the Mapbox Java SDK to create a URL. After receiving the newly * created URL, use Picasso, a third party image loading library, to download and load the static map image into @@ -74,7 +76,7 @@ public void onClick(View view) { @Override public void onStyleLoaded(@NonNull Style style) { // one of the radio buttons is checked - Log.d("Static", "onClick: initViews style.getUrl() = " + style.getUrl()); + Timber.d("onClick: initViews style.getUrl() = %s", style.getUrl()); Picasso.with(StaticImageActivity.this).load(takeSnapshot( mapboxMap.getCameraPosition(), style.getUrl().contains("mapbox/dark-v") diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java index 2fc32ff74..bb7670ef9 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java @@ -34,6 +34,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; import static com.mapbox.core.constants.Constants.PRECISION_6; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor; @@ -148,10 +149,10 @@ private void getRoute(Point destination) { @Override public void onResponse(Call call, Response response) { if (response.body() == null) { - Log.d("DashedLineActivity", "No routes found, make sure you set the right user and access token."); + Timber.d( "No routes found, make sure you set the right user and access token."); return; } else if (response.body().routes().size() < 1) { - Log.d("DashedLineActivity", "No routes found"); + Timber.d( "No routes found"); return; } drawNavigationPolylineRoute(response.body().routes().get(0)); @@ -159,7 +160,7 @@ public void onResponse(Call call, Response call, Throwable throwable) { - Log.d("DashedLineActivity", "Error: " + throwable.getMessage()); + Timber.d("Error: %s", throwable.getMessage()); if (!throwable.getMessage().equals("Coordinate is invalid: 0,0")) { Toast.makeText(DashedLineDirectionsPickerActivity.this, "Error: " + throwable.getMessage(), Toast.LENGTH_SHORT).show(); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java index 51696ad9c..6ab251aa3 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java @@ -47,7 +47,6 @@ public class IndoorMapActivity extends AppCompatActivity { private List> boundingBoxList; private View levelButtons; private MapView mapView; - private MapboxMap map; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -65,8 +64,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull final MapboxMap mapboxMap) { - map = mapboxMap; - mapboxMap.setStyle(Style.MAPBOX_STREETS, new Style.OnStyleLoaded() { @Override public void onStyleLoaded(@NonNull Style style) { diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java index 0772c1e9b..8c72c60c4 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java @@ -25,7 +25,6 @@ public class InsetMapActivity extends AppCompatActivity { private MapView mainMapView; private MapboxMap mainMapboxMap; - private MapboxMap insetMapboxMap; @Override diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java index 2ee935244..effca9b2b 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java @@ -41,6 +41,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; import static com.mapbox.mapboxsdk.style.layers.Property.NONE; import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; @@ -278,11 +279,11 @@ public void onResponse(Call call, Response @Override public void onFailure(Call call, Throwable throwable) { - Log.e(TAG, "Geocoding Failure: " + throwable.getMessage()); + Timber.e("Geocoding Failure: %s", throwable.getMessage()); } }); } catch (ServicesException servicesException) { - Log.e(TAG, "Error geocoding: " + servicesException.toString()); + Timber.e("Error geocoding: %s", servicesException.toString()); servicesException.printStackTrace(); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java index 7ad90097e..bcde325bc 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java @@ -33,6 +33,8 @@ import java.util.List; import java.util.Scanner; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage; @@ -273,7 +275,7 @@ protected FeatureCollection doInBackground(Void... voids) { return FeatureCollection.fromJson(convertStreamToString(inputStream)); } } catch (Exception exception) { - Log.e(TAG, "Exception Loading GeoJSON: " + exception.toString()); + Timber.e(exception.toString()); } return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java index 45a483b61..ca945c2ed 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java @@ -35,6 +35,7 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import timber.log.Timber; import static com.mapbox.api.directions.v5.DirectionsCriteria.GEOMETRY_POLYLINE; import static com.mapbox.mapboxsdk.style.layers.Property.LINE_CAP_ROUND; @@ -158,10 +159,10 @@ public void onResponse(Call call, Response call, Response call, Throwable throwable) { - Log.d("SnakingDirections", "Error: " + throwable.getMessage()); + Timber.d("Error: %s", throwable.getMessage()); Toast.makeText(SnakingDirectionsRouteActivity.this, R.string.snaking_directions_activity_error, Toast.LENGTH_SHORT).show(); } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java index 024a1d33b..c7708765a 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java @@ -29,6 +29,7 @@ import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.http.GET; +import timber.log.Timber; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; @@ -122,9 +123,9 @@ public void onFailure(Call call, Throwable throwable) { // If retrofit fails or the API was unreachable, an error will be called. //to check if throwable is null, then give a custom message. if (throwable.getMessage() == null) { - Log.e(TAG, "Http connection failed"); + Timber.e("Http connection failed"); } else { - Log.e(TAG, throwable.getMessage()); + Timber.e(throwable.getMessage()); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java index a439421c1..8b6dc93ec 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java @@ -5,7 +5,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -31,6 +30,8 @@ import java.util.ArrayList; +import timber.log.Timber; + /** * Download, view, navigate to, and delete an offline region. */ @@ -218,7 +219,7 @@ private void downloadRegion(final String regionName) { String json = jsonObject.toString(); metadata = json.getBytes(JSON_CHARSET); } catch (Exception exception) { - Log.e(TAG, "Failed to encode metadata: " + exception.getMessage()); + Timber.e("Failed to encode metadata: %s", exception.getMessage()); metadata = null; } @@ -226,14 +227,14 @@ private void downloadRegion(final String regionName) { offlineManager.createOfflineRegion(definition, metadata, new OfflineManager.CreateOfflineRegionCallback() { @Override public void onCreate(OfflineRegion offlineRegion) { - Log.d(TAG, "Offline region created: " + regionName); + Timber.d( "Offline region created: %s" , regionName); OfflineManagerActivity.this.offlineRegion = offlineRegion; launchDownload(); } @Override public void onError(String error) { - Log.e(TAG, "Error: " + error); + Timber.e( "Error: %s" , error); } }); } @@ -259,21 +260,21 @@ public void onStatusChanged(OfflineRegionStatus status) { } // Log what is being currently downloaded - Log.d(TAG, String.format("%s/%s resources; %s bytes downloaded.", + Timber.d("%s/%s resources; %s bytes downloaded.", String.valueOf(status.getCompletedResourceCount()), String.valueOf(status.getRequiredResourceCount()), - String.valueOf(status.getCompletedResourceSize()))); + String.valueOf(status.getCompletedResourceSize())); } @Override public void onError(OfflineRegionError error) { - Log.e(TAG, "onError reason: " + error.getReason()); - Log.e(TAG, "onError message: " + error.getMessage()); + Timber.e("onError reason: %s", error.getReason()); + Timber.e("onError message: %s", error.getMessage()); } @Override public void mapboxTileCountLimitExceeded(long limit) { - Log.e(TAG, "Mapbox tile count limit exceeded: " + limit); + Timber.e("Mapbox tile count limit exceeded: %s", limit); } }); @@ -363,7 +364,7 @@ public void onDelete() { public void onError(String error) { progressBar.setVisibility(View.INVISIBLE); progressBar.setIndeterminate(false); - Log.e(TAG, "Error: " + error); + Timber.e( "Error: %s", error); } }); } @@ -381,7 +382,7 @@ public void onClick(DialogInterface dialog, int id) { @Override public void onError(String error) { - Log.e(TAG, "Error: " + error); + Timber.e( "Error: %s", error); } }); } @@ -396,7 +397,7 @@ private String getRegionName(OfflineRegion offlineRegion) { JSONObject jsonObject = new JSONObject(json); regionName = jsonObject.getString(JSON_FIELD_REGION_NAME); } catch (Exception exception) { - Log.e(TAG, "Failed to decode metadata: " + exception.getMessage()); + Timber.e("Failed to decode metadata: %s", exception.getMessage()); regionName = String.format(getString(R.string.region_name), offlineRegion.getID()); } return regionName; diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java index aed3e3d49..56926d393 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import android.widget.ProgressBar; import android.widget.Toast; @@ -24,13 +23,13 @@ import org.json.JSONObject; +import timber.log.Timber; + /** * Download and view an offline map using the Mapbox Android SDK. */ public class SimpleOfflineMapActivity extends AppCompatActivity { - private static final String TAG = "SimpOfflineMapActivity"; - private boolean isEndNotified; private ProgressBar progressBar; private MapView mapView; @@ -86,7 +85,7 @@ public void onStyleLoaded(@NonNull Style style) { String json = jsonObject.toString(); metadata = json.getBytes(JSON_CHARSET); } catch (Exception exception) { - Log.e(TAG, "Failed to encode metadata: " + exception.getMessage()); + Timber.e("Failed to encode metadata: %s", exception.getMessage()); metadata = null; } @@ -100,7 +99,7 @@ public void onCreate(OfflineRegion offlineRegion) { offlineRegion.setDownloadState(OfflineRegion.STATE_ACTIVE); // Display the download progress bar - progressBar = (ProgressBar) findViewById(R.id.progress_bar); + progressBar = findViewById(R.id.progress_bar); startProgress(); // Monitor the download progress using setObserver @@ -125,21 +124,21 @@ public void onStatusChanged(OfflineRegionStatus status) { @Override public void onError(OfflineRegionError error) { // If an error occurs, print to logcat - Log.e(TAG, "onError reason: " + error.getReason()); - Log.e(TAG, "onError message: " + error.getMessage()); + Timber.e("onError reason: %s", error.getReason()); + Timber.e("onError message: %s", error.getMessage()); } @Override public void mapboxTileCountLimitExceeded(long limit) { // Notify if offline region exceeds maximum tile count - Log.e(TAG, "Mapbox tile count limit exceeded: " + limit); + Timber.e("Mapbox tile count limit exceeded: %s", limit); } }); } @Override public void onError(String error) { - Log.e(TAG, "Error: " + error); + Timber.e("Error: %s", error); } }); } @@ -188,7 +187,7 @@ public void onDelete() { @Override public void onError(String error) { - Log.e(TAG, "On Delete error: " + error); + Timber.e("On delete error: %s", error); } }); } @@ -196,7 +195,7 @@ public void onError(String error) { @Override public void onError(String error) { - Log.e(TAG, "onListError: " + error); + Timber.e("onListError: %s", error); } }); } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java index a7f24c431..c69a26113 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java @@ -22,6 +22,8 @@ import java.net.URL; import java.util.List; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillOpacity; /** @@ -79,7 +81,7 @@ public boolean onMapClick(@NonNull LatLng point) { List featureList = mapboxMap.queryRenderedFeatures(rectF, geoJsonLayerId); if (featureList.size() > 0) { for (Feature feature : featureList) { - Log.d("Feature found with %1$s", feature.toJson()); + Timber.d("Feature found with %1$s", feature.toJson()); Toast.makeText(ClickOnLayerActivity.this, R.string.click_on_polygon_toast, Toast.LENGTH_SHORT).show(); } @@ -95,7 +97,7 @@ private void addGeoJsonSourceToMap(@NonNull Style loadedMapStyle) { + ".com/tobrun/cf0d689c8187d42ebe62757f6d0cf137/raw/4d8ac3c8333f1517df9d303" + "d58f20f4a1d8841e8/regions.geojson"))); } catch (Throwable throwable) { - Log.e("ClickOnLayerActivity", "Couldn't add GeoJsonSource to map", throwable); + Timber.e("Couldn't add GeoJsonSource to map - %s", throwable); } } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java index dae32e301..664b149f1 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java @@ -23,6 +23,8 @@ import java.io.InputStream; import java.util.List; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.layers.Property.LINE_CAP_ROUND; import static com.mapbox.mapboxsdk.style.layers.Property.LINE_JOIN_ROUND; import static com.mapbox.mapboxsdk.style.layers.Property.NONE; @@ -195,7 +197,7 @@ private String loadGeoJsonFromAsset(String filename) { is.close(); return new String(buffer, "UTF-8"); } catch (Exception exception) { - Log.d("MatrixApiActivity", "Exception Loading GeoJSON: " + exception.toString()); + Timber.d("Exception loading GeoJSON: %s", exception.toString()); exception.printStackTrace(); return null; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java index 28d69ffdd..f47886aee 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java @@ -33,6 +33,8 @@ import java.util.ArrayList; import java.util.List; +import timber.log.Timber; + import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleColor; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius; @@ -162,7 +164,7 @@ public void onActivityResult(int requestCode, int resultCode, final Intent data) if (requestCode == PHOTO_PICK_CODE && resultCode == Activity.RESULT_OK) { if (data == null) { //Display an error - Log.d("ClickToAddImageActivity", "data == null"); + Timber.d("data == null"); return; } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java index a4f61deb3..92152e7cc 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java @@ -53,10 +53,6 @@ public void onMapReady(@NonNull final MapboxMap mapboxMap) { mapboxMap.setStyle(Style.OUTDOORS, new Style.OnStyleLoaded() { @Override public void onStyleLoaded(@NonNull Style style) { - for (Layer singleLayer : style.getLayers()) { - Log.d("HillShadeActivity", "onMapReady: layer id = " + singleLayer.getId()); - } - // Add hillshade data source to map RasterDemSource rasterDemSource = new RasterDemSource(SOURCE_ID, SOURCE_URL); style.addSource(rasterDemSource);