From 5977d7b86a2b52fb28b2d082aa7205db93fa06a4 Mon Sep 17 00:00:00 2001 From: tobrun Date: Tue, 15 Jan 2019 12:35:48 +0100 Subject: [PATCH] [android] - show snapshot attribution --- .../mapboxsdk/attribution/Attribution.java | 2 +- .../attribution/AttributionParseTest.java | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java index b7c6c4177..561ce5bf1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java @@ -8,7 +8,7 @@ public class Attribution { private static final String OPENSTREETMAP_ABBR = "OSM"; static final String TELEMETRY = "Telemetry Settings"; - static final String IMPROVE_MAP_URL = "https://www.mapbox.com/feedback/"; + static final String IMPROVE_MAP_URL = "https://www.mapbox.com/map-feedback/"; static final String MAPBOX_URL = "https://www.mapbox.com/about/maps/"; static final String TELEMETRY_URL = "https://www.mapbox.com/telemetry/"; diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java index ed9f4be47..f20244aca 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java @@ -15,8 +15,8 @@ import static junit.framework.Assert.assertEquals; @Config(constants = BuildConfig.class) public class AttributionParseTest { - private static final String STREETS_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map\n"; - private static final String SATELLITE_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map © DigitalGlobe\n"; + private static final String STREETS_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map\n"; + private static final String SATELLITE_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map © DigitalGlobe\n"; @Test public void testParseAttributionStringSatellite() throws Exception { @@ -39,7 +39,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: @@ -72,7 +72,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; } @@ -98,7 +98,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 1: - assertEquals("URL improve map should match", "https://www.mapbox.com/feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; } @@ -126,7 +126,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: @@ -188,7 +188,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: @@ -307,4 +307,19 @@ public class AttributionParseTest { attributionParser.createAttributionString(true) ); } + + @Test + public void testWithImproveThisMapString() throws Exception { + AttributionParser attributionParser = new AttributionParser.Options(RuntimeEnvironment.application) + .withAttributionData(STREETS_ATTRIBUTION, "blabla", "") + .withImproveMap(true) + .withCopyrightSign(false) + .build(); + + assertEquals( + "Attribution string should match", + "© Mapbox / OSM / Improve This Map", + attributionParser.createAttributionString(true) + ); + } }