From 4ec05558c849954b551c55300b31a48616d4da35 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Sat, 18 Jul 2026 02:19:15 +0200 Subject: [PATCH] Remove AWS key from iOS/Android (#4413) --- .../android/testapp/activity/benchmark/BenchmarkActivity.kt | 3 --- .../testapp/activity/snapshot/MapSnapshotterActivity.kt | 1 - .../android/testapp/activity/stability/NavigationMap.kt | 1 - .../org/maplibre/android/testapp/activity/stability/UserMap.kt | 1 - .../android/testapp/activity/style/StyleUrlActivity.kt | 1 - .../java/org/maplibre/android/testapp/styles/TestStyles.kt | 2 -- platform/ios/app-swift/Sources/Stability/NavigationMap.swift | 1 - platform/ios/app-swift/Sources/Stability/UserMap.swift | 1 - platform/ios/app-swift/Sources/Styles.swift | 2 -- 9 files changed, 13 deletions(-) diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt index 0f8ad1e0a..7ad544c61 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt @@ -116,7 +116,6 @@ class BenchmarkActivity : AppCompatActivity() { // return default return BenchmarkInputData( styleNames = listOf( -// "AWS Open Data Standard Light", "Facebook Light", "Americana", // "Protomaps Light", @@ -124,8 +123,6 @@ class BenchmarkActivity : AppCompatActivity() { "OpenFreeMap Bright" ), styleURLs = listOf( -// {"message":"User is not authorized to access this resource with an explicit deny in an identity-based policy"} -// "https://maps.geo.us-east-2.amazonaws.com/maps/v0/maps/OpenDataStyle/style-descriptor?key=v1.public.eyJqdGkiOiI1NjY5ZTU4My0yNWQwLTQ5MjctODhkMS03OGUxOTY4Y2RhMzgifR_7GLT66TNRXhZJ4KyJ-GK1TPYD9DaWuc5o6YyVmlikVwMaLvEs_iqkCIydspe_vjmgUVsIQstkGoInXV_nd5CcmqRMMa-_wb66SxDdbeRDvmmkpy2Ow_LX9GJDgL2bbiCws0wupJPFDwWCWFLwpK9ICmzGvNcrPbX5uczOQL0N8V9iUvziA52a1WWkZucIf6MUViFRf3XoFkyAT15Ll0NDypAzY63Bnj8_zS8bOaCvJaQqcXM9lrbTusy8Ftq8cEbbK5aMFapXRjug7qcrzUiQ5sr0g23qdMvnKJQFfo7JuQn8vwAksxrQm6A0ByceEXSfyaBoVpFcTzEclxUomhY.NjAyMWJkZWUtMGMyOS00NmRkLThjZTMtODEyOTkzZTUyMTBi", "https://external.xx.fbcdn.net/maps/vt/style/canterbury_1_0/?locale=en_US", "https://americanamap.org/style.json", // "https://api.protomaps.com/styles/v2/light.json?key=e761cc7daedf832a", diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt index 008c2e5f0..d3bb36442 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt @@ -71,7 +71,6 @@ class MapSnapshotterActivity : AppCompatActivity() { TestStyles.DEMOTILES, TestStyles.AMERICANA, TestStyles.OPENFREEMAP_LIBERTY, - TestStyles.AWS_OPEN_DATA_STANDARD_LIGHT, TestStyles.PROTOMAPS_LIGHT, TestStyles.PROTOMAPS_DARK, TestStyles.PROTOMAPS_WHITE, diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/NavigationMap.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/NavigationMap.kt index 6dc6568bb..577e68c59 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/NavigationMap.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/NavigationMap.kt @@ -65,7 +65,6 @@ class NavigationMap : SupportMapFragment(), ProgressChangeListener, MilestoneEve TestStyles.AMERICANA, TestStyles.OPENFREEMAP_LIBERTY, TestStyles.OPENFREEMAP_BRIGHT, - TestStyles.AWS_OPEN_DATA_STANDARD_LIGHT, TestStyles.PROTOMAPS_LIGHT, TestStyles.PROTOMAPS_DARK, TestStyles.PROTOMAPS_GRAYSCALE, diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/UserMap.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/UserMap.kt index ed7ef8327..25886a02a 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/UserMap.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/stability/UserMap.kt @@ -43,7 +43,6 @@ class UserMap : SupportMapFragment() { TestStyles.AMERICANA, TestStyles.OPENFREEMAP_LIBERTY, TestStyles.OPENFREEMAP_BRIGHT, - TestStyles.AWS_OPEN_DATA_STANDARD_LIGHT, TestStyles.PROTOMAPS_LIGHT, TestStyles.PROTOMAPS_DARK, TestStyles.PROTOMAPS_GRAYSCALE, diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleUrlActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleUrlActivity.kt index b53930b93..e8528e92e 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleUrlActivity.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleUrlActivity.kt @@ -34,7 +34,6 @@ class StyleUrlActivity : AppCompatActivity() { TestStyles.AMERICANA, TestStyles.OPENFREEMAP_LIBERTY, TestStyles.OPENFREEMAP_BRIGHT, - TestStyles.AWS_OPEN_DATA_STANDARD_LIGHT, TestStyles.PROTOMAPS_LIGHT, TestStyles.PROTOMAPS_DARK, TestStyles.PROTOMAPS_GRAYSCALE, diff --git a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/styles/TestStyles.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/styles/TestStyles.kt index 823f0bf57..19639786d 100644 --- a/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/styles/TestStyles.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/styles/TestStyles.kt @@ -11,8 +11,6 @@ object TestStyles { const val OPENFREEMAP_BRIGHT = "https://tiles.openfreemap.org/styles/bright" - const val AWS_OPEN_DATA_STANDARD_LIGHT = "https://maps.geo.us-east-2.amazonaws.com/maps/v0/maps/OpenDataStyle/style-descriptor?key=v1.public.eyJqdGkiOiI1NjY5ZTU4My0yNWQwLTQ5MjctODhkMS03OGUxOTY4Y2RhMzgifR_7GLT66TNRXhZJ4KyJ-GK1TPYD9DaWuc5o6YyVmlikVwMaLvEs_iqkCIydspe_vjmgUVsIQstkGoInXV_nd5CcmqRMMa-_wb66SxDdbeRDvmmkpy2Ow_LX9GJDgL2bbiCws0wupJPFDwWCWFLwpK9ICmzGvNcrPbX5uczOQL0N8V9iUvziA52a1WWkZucIf6MUViFRf3XoFkyAT15Ll0NDypAzY63Bnj8_zS8bOaCvJaQqcXM9lrbTusy8Ftq8cEbbK5aMFapXRjug7qcrzUiQ5sr0g23qdMvnKJQFfo7JuQn8vwAksxrQm6A0ByceEXSfyaBoVpFcTzEclxUomhY.NjAyMWJkZWUtMGMyOS00NmRkLThjZTMtODEyOTkzZTUyMTBi" - private fun protomaps(style: String): String { return "https://api.protomaps.com/styles/v2/${style}.json?key=e761cc7daedf832a" } diff --git a/platform/ios/app-swift/Sources/Stability/NavigationMap.swift b/platform/ios/app-swift/Sources/Stability/NavigationMap.swift index a35cb3e61..6fea0cc3e 100644 --- a/platform/ios/app-swift/Sources/Stability/NavigationMap.swift +++ b/platform/ios/app-swift/Sources/Stability/NavigationMap.swift @@ -7,7 +7,6 @@ private class NavigationConfig { AMERICANA_STYLE, OPENFREEMAP_LIBERTY_STYLE, OPENFREEMAP_BRIGHT_STYLE, - AWS_OPEN_DATA_STANDARD_LIGHT_STYLE, PROTOMAPS_LIGHT_STYLE, PROTOMAPS_DARK_STYLE, PROTOMAPS_GRAYSCALE_STYLE, diff --git a/platform/ios/app-swift/Sources/Stability/UserMap.swift b/platform/ios/app-swift/Sources/Stability/UserMap.swift index eb3a7af7e..625d7d31c 100644 --- a/platform/ios/app-swift/Sources/Stability/UserMap.swift +++ b/platform/ios/app-swift/Sources/Stability/UserMap.swift @@ -11,7 +11,6 @@ class UserMap: MLNMapView, MLNMapViewDelegate { AMERICANA_STYLE, OPENFREEMAP_LIBERTY_STYLE, OPENFREEMAP_BRIGHT_STYLE, - AWS_OPEN_DATA_STANDARD_LIGHT_STYLE, PROTOMAPS_LIGHT_STYLE, PROTOMAPS_DARK_STYLE, PROTOMAPS_GRAYSCALE_STYLE, diff --git a/platform/ios/app-swift/Sources/Styles.swift b/platform/ios/app-swift/Sources/Styles.swift index f3248c1da..9018b8f3f 100644 --- a/platform/ios/app-swift/Sources/Styles.swift +++ b/platform/ios/app-swift/Sources/Styles.swift @@ -10,8 +10,6 @@ let VERSATILES_COLORFUL_STYLE = URL(string: "https://tiles.versatiles.org/assets // #-end-example-code -let AWS_OPEN_DATA_STANDARD_LIGHT_STYLE = URL(string: "https://maps.geo.us-east-2.amazonaws.com/maps/v0/maps/OpenDataStyle/style-descriptor?key=v1.public.eyJqdGkiOiI1NjY5ZTU4My0yNWQwLTQ5MjctODhkMS03OGUxOTY4Y2RhMzgifR_7GLT66TNRXhZJ4KyJ-GK1TPYD9DaWuc5o6YyVmlikVwMaLvEs_iqkCIydspe_vjmgUVsIQstkGoInXV_nd5CcmqRMMa-_wb66SxDdbeRDvmmkpy2Ow_LX9GJDgL2bbiCws0wupJPFDwWCWFLwpK9ICmzGvNcrPbX5uczOQL0N8V9iUvziA52a1WWkZucIf6MUViFRf3XoFkyAT15Ll0NDypAzY63Bnj8_zS8bOaCvJaQqcXM9lrbTusy8Ftq8cEbbK5aMFapXRjug7qcrzUiQ5sr0g23qdMvnKJQFfo7JuQn8vwAksxrQm6A0ByceEXSfyaBoVpFcTzEclxUomhY.NjAyMWJkZWUtMGMyOS00NmRkLThjZTMtODEyOTkzZTUyMTBi") - private func protomaps(_ style: String) -> URL? { URL(string: "https://api.protomaps.com/styles/v2/\(style).json?key=e761cc7daedf832a") }