summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-12-05 10:34:03 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2018-12-11 20:07:45 +0100
commit85c59204b37946f8cf7935f53465b001f7ec7e14 (patch)
treebad2880d0aeadd81c611d16a3278d1d9deb16a2c
parent001115a6063caaebd0b4240037d9fb9f56f03ed9 (diff)
downloadqtlocation-mapboxgl-upstream/lp-backport-13508-horchata.tar.gz
[android] expose endpoint change for snapshotterupstream/lp-backport-13508-horchata
(cherry picked from commit 5fa5c15)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java26
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java3
2 files changed, 27 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
index 970a7fc3b4..f284a636e6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
@@ -13,6 +13,7 @@ import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import android.support.v4.content.res.ResourcesCompat;
import android.text.Html;
+import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.View;
import android.view.ViewGroup;
@@ -97,6 +98,7 @@ public class MapSnapshotter {
private CameraPosition cameraPosition;
private boolean showLogo = true;
private String localIdeographFontFamily;
+ private String apiBaseUrl;
/**
* @param width the width of the image
@@ -184,6 +186,18 @@ public class MapSnapshotter {
}
/**
+ * Specifies the URL used for API endpoint.
+ *
+ * @param apiBaseUrl The base of our API endpoint
+ * @return the mutated {@link Options}
+ */
+ @NonNull
+ public Options withApiBaseUrl(String apiBaseUrl) {
+ this.apiBaseUrl = apiBaseUrl;
+ return this;
+ }
+
+ /**
* @return the width of the image
*/
public int getWidth() {
@@ -234,6 +248,13 @@ public class MapSnapshotter {
return localIdeographFontFamily;
}
+ /**
+ * @return The base of our API endpoint
+ */
+ @Nullable
+ public String getApiBaseUrl() {
+ return apiBaseUrl;
+ }
}
/**
@@ -251,6 +272,11 @@ public class MapSnapshotter {
telemetry.onAppUserTurnstileEvent();
}
FileSource fileSource = FileSource.getInstance(context);
+ String apiBaseUrl = options.getApiBaseUrl();
+ if (!TextUtils.isEmpty(apiBaseUrl)) {
+ fileSource.setApiBaseUrl(apiBaseUrl);
+ }
+
String programCacheDir = FileSource.getInternalCachePath(context);
nativeInitialize(this, fileSource, options.pixelRatio, options.width,
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
index 9f1e7b9956..f98cffecc9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
@@ -27,7 +27,6 @@ public class MapSnapshotterActivity extends AppCompatActivity {
private GridLayout grid;
private List<MapSnapshotter> snapshotters = new ArrayList<>();
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -69,7 +68,7 @@ public class MapSnapshotterActivity extends AppCompatActivity {
// Optionally the style
.withStyle((column + row) % 2 == 0 ? Style.MAPBOX_STREETS : Style.DARK)
- .withLocalIdeographFontFamily("sans-serif");
+ .withLocalIdeographFontFamily("sans-serif");
// Optionally the visible region
if (row % 2 == 0) {