streetcomplete · westnordost · Aug 14, 2024 · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -212,7 +212,7 @@ dependencies {
     implementation("com.charleskorn.kaml:kaml:0.59.0")
 
     // map and location
-    implementation("com.mapzen.tangram:tangram:0.17.1")
+    implementation("org.maplibre.gl:android-sdk:11.0.2-pre0")
 
     // opening hours parser
     implementation("de.westnordost:osm-opening-hours:0.1.0")
@@ -300,18 +300,19 @@ tasks.register<UpdateAppTranslationCompletenessTask>("updateTranslationCompleten
     targetFiles = { "$projectDir/src/main/res/values-$it/translation_info.xml" }
 }
 
-tasks.register<UpdateMapStyleTask>("updateMapStyle") {
-    group = "streetcomplete"
-    targetDir = "$projectDir/src/main/assets/map_theme/jawg"
-    mapStyleBranch = "jawg"
-}
-
 tasks.register<UpdateChangelogTask>("updateChangelog") {
     group = "streetcomplete"
     sourceFile = "$rootDir/CHANGELOG.md"
     targetFile = "$projectDir/src/main/res/raw/changelog.html"
 }
 
+tasks.register<UpdateMapStyleTask>("updateMapStyle") {
+    group = "streetcomplete"
+    targetDir = "$projectDir/src/main/assets/map_theme"
+    apiKey = "mL9X4SwxfsAGfojvGiion9hPKuGLKxPbogLyMbtakA2gJ3X88gcVlTSQ7OD6OfbZ"
+    mapStyleBranch = "master"
+}
+
 tasks.register<GenerateMetadataByCountryTask>("generateMetadataByCountry") {
     group = "streetcomplete"
     sourceDir = "$rootDir/res/country_metadata"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,12 +1,5 @@
 -dontobfuscate
 
-# tangram start ------------------------------------------------------------------------------------
-
-# let's just keep everything
--keep class com.mapzen.tangram.** { *; }
--keep class com.mapzen.tangram.* { *; }
-# tangram end --------------------------------------------------------------------------------------
-
 # Lifecycle
 -keep public class androidx.lifecycle.* {
     public protected *;

diff --git a/app/src/debug/res/values/conf.xml b/app/src/debug/res/values/conf.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string translatable="false" name="fileprovider_authority">de.westnordost.streetcomplete.debug.fileprovider</string>
-</resources>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />
     <uses-feature android:name="android.hardware.screen.portrait" />
 
-    <!-- Tangram-ES needs at least OpenGL ES 2.0, without it, the app is not usable. -->
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <!-- MapLibre 11+ needs at least OpenGL ES 3.0 -->
+    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
 
     <queries>
         <!-- open location in another app -->

diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/0-255.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/0-255.pbf
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/1024-1279.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/1024-1279.pbf
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/10240-10495.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/10240-10495.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold10240-10495
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/10496-10751.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/10496-10751.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold10496-10751
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/10752-11007.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/10752-11007.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold10752-11007
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/11008-11263.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/11008-11263.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold11008-11263
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/11264-11519.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/11264-11519.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold11264-11519
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/11520-11775.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/11520-11775.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold11520-11775
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/11776-12031.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/11776-12031.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold11776-12031
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/12032-12287.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/12032-12287.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold12032-12287
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/12288-12543.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/12288-12543.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold12288-12543
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/12544-12799.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/12544-12799.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold12544-12799
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/1280-1535.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/1280-1535.pbf
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/12800-13055.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/12800-13055.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold12800-13055
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/13056-13311.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/13056-13311.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold13056-13311
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/13312-13567.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/13312-13567.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold13312-13567
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/13568-13823.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/13568-13823.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold13568-13823
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/13824-14079.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/13824-14079.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold13824-14079
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/14080-14335.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/14080-14335.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold14080-14335
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/14336-14591.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/14336-14591.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold14336-14591
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/14592-14847.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/14592-14847.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold14592-14847
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/14848-15103.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/14848-15103.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold14848-15103
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/15104-15359.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/15104-15359.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold15104-15359
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/1536-1791.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/1536-1791.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold	1536-1791
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/15360-15615.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/15360-15615.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold15360-15615
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/15616-15871.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/15616-15871.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold15616-15871
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/15872-16127.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/15872-16127.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold15872-16127
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/16128-16383.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/16128-16383.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold16128-16383
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/16384-16639.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/16384-16639.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold16384-16639
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/16640-16895.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/16640-16895.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold16640-16895
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/16896-17151.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/16896-17151.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold16896-17151
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/17152-17407.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/17152-17407.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold17152-17407
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/17408-17663.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/17408-17663.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold17408-17663
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/17664-17919.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/17664-17919.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold17664-17919
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/1792-2047.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/1792-2047.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold	1792-2047
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/17920-18175.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/17920-18175.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold17920-18175
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/18176-18431.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/18176-18431.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold18176-18431
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/18432-18687.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/18432-18687.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold18432-18687
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/18688-18943.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/18688-18943.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold18688-18943
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/18944-19199.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/18944-19199.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold18944-19199
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/19200-19455.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/19200-19455.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold19200-19455
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/19456-19711.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/19456-19711.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold19456-19711
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/19712-19967.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/19712-19967.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold19712-19967
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/19968-20223.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/19968-20223.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold19968-20223
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/20224-20479.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/20224-20479.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold20224-20479
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/2048-2303.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/2048-2303.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold	2048-2303
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/20480-20735.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/20480-20735.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold20480-20735
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/20736-20991.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/20736-20991.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold20736-20991
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/20992-21247.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/20992-21247.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold20992-21247
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/21248-21503.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/21248-21503.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold21248-21503
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/21504-21759.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/21504-21759.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold21504-21759
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/21760-22015.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/21760-22015.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold21760-22015
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/22016-22271.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/22016-22271.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold22016-22271
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/22272-22527.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/22272-22527.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold22272-22527
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/22528-22783.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/22528-22783.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold22528-22783
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/22784-23039.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/22784-23039.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold22784-23039
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/2304-2559.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/2304-2559.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold	2304-2559
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/23040-23295.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/23040-23295.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold23040-23295
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/23296-23551.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/23296-23551.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold23296-23551
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/23552-23807.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/23552-23807.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold23552-23807
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/23808-24063.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/23808-24063.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold23808-24063
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/24064-24319.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/24064-24319.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold24064-24319
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/24320-24575.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/24320-24575.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold24320-24575
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/24576-24831.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/24576-24831.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold24576-24831
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/24832-25087.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/24832-25087.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold24832-25087
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/25088-25343.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/25088-25343.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold25088-25343
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/25344-25599.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/25344-25599.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold25344-25599
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/256-511.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/256-511.pbf
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/2560-2815.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/2560-2815.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold	2560-2815
diff --git a/app/src/main/assets/map_theme/glyphs/Roboto Bold/25600-25855.pbf b/app/src/main/assets/map_theme/glyphs/Roboto Bold/25600-25855.pbf
@@ -0,0 +1,3 @@
+
+
+Roboto Bold25600-25855