Add Stadia Maps as a map source

johnjore · Jan 16, 2025 · d65a7c7 · d65a7c7
1 parent ea82789
commit d65a7c7
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 34 deletions.
diff --git a/Fragments/Fragment_preferences.cs b/Fragments/Fragment_preferences.cs
@@ -80,8 +80,9 @@ public class Fragment_Preferences : PreferenceFragmentCompat, ISharedPreferences
 
         public static List<MapSource> MapSources = [
             new MapSource("OpenStreetMap", @"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", ""),
-            new MapSource("Mapbox", @"https://api.mapbox.com/styles/v1/mapbox/outdoors-v12/tiles/{z}/{x}/{y}?access_token=", "MapBoxToken"),
+            new MapSource("Mapbox", @"https://api.mapbox.com/styles/v1/mapbox/outdoors-v12/tiles/{z}/{x}/{y}?access_token=", "MapboxToken"),
             new MapSource("Thunderforest", @"https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=", "ThunderforestToken"),
+            new MapSource("Stadia Maps", @"https://tiles.stadiamaps.com/tiles/outdoors/{z}/{x}/{y}.png?api_key=" , "StadiaToken"),
             new MapSource("Custom", "CustomServerURL", "CustomToken"),
         ];
 
@@ -99,6 +100,7 @@ public override void OnCreatePreferences(Bundle? savedInstanceState, string? roo
             CreateArrayList((ListPreference)FindPreference(Platform.CurrentActivity?.GetString(Resource.String.OSM_BulkDownload_Source)), true);
 
             //Set Summary to "Not Set" or "Hidden" for sensitive fields
+            SetSummary((EditTextPreference)FindPreference(Platform.CurrentActivity?.GetString(Resource.String.StadiaToken)));
             SetSummary((EditTextPreference)FindPreference(Platform.CurrentActivity?.GetString(Resource.String.MapboxToken)));
             SetSummary((EditTextPreference)FindPreference(Platform.CurrentActivity?.GetString(Resource.String.ThunderforestToken)));
             SetSummary((EditTextPreference)FindPreference(Platform.CurrentActivity?.GetString(Resource.String.CustomServerURL)));

diff --git a/Fragments/Fragment_restore.cs b/Fragments/Fragment_restore.cs
@@ -280,8 +280,9 @@ private static bool RestorePreferences(string RestoreFolder)
                 Preferences.Set("OSM_Browse_Source", prefSettings.OSM_Browse_Source);
                 Preferences.Set("CustomServerURL ", prefSettings.CustomServerURL);
                 Preferences.Set("CustomToken", prefSettings.CustomToken);
+                Preferences.Set("StadiaToken", prefSettings.StadiaToken);
                 Preferences.Set("MapboxToken", prefSettings.MapboxToken);
-                Preferences.Set("ThunderforestToken", prefSettings.ThunderforestToken);
+                Preferences.Set("ThunderforestToken", prefSettings.ThunderforestToken);                
 
                 Preferences.Set("mapScale", prefSettings.mapScale);
                 Preferences.Set("mapUTMZone", prefSettings.mapUTMZone);

diff --git a/MainActivity.cs b/MainActivity.cs
@@ -72,6 +72,12 @@ protected override async void OnCreate(Bundle? savedInstanceState)
             //Preferences.Set("freq_s_OffRoute", Fragment_Preferences.freq_OffRoute_s.ToString());
             //Preferences.Set("KeepNBackups", Fragment_Preferences.KeepNBackups.ToString());
 
+#if DEBUG
+            if (string.IsNullOrEmpty(Resources?.GetString(Resource.String.Sentry_APIKey)))
+            {
+                Serilog.Log.Fatal("Sentry DSN entry is missing and in debug mode");
+            }
+#endif
 
             //Logging
             string _Path = System.IO.Path.Combine(Fragment_Preferences.rootPath, Fragment_Preferences.logFile);
@@ -248,22 +254,42 @@ public override bool OnCreateOptionsMenu(IMenu? menu)
         public override bool OnOptionsItemSelected(IMenuItem item)
         {
             int id = item.ItemId;
-            if (id == Resource.Id.action_settings)
+            if (id == Resource.Id.AddCurrentLocationAsPOI)
             {
-                Log.Information($"Change to Settings");
-
-                SupportFragmentManager.BeginTransaction()
-                    .SetReorderingAllowed(true)
-                    .Replace(Resource.Id.fragment_container, new Fragment_Preferences(), Fragment_Preferences.Fragment_Settings)
-                    .AddToBackStack(Fragment_Preferences.Fragment_Settings)
-                    .Commit();
-                SupportFragmentManager.ExecutePendingTransactions();
-
-                return true;
+                var CurrentLocation = LocationForegroundService.GetLocation();
+                if (CurrentLocation != null)
+                {
+                    GPXDataPOI p = new()
+                    {
+                        Name = "Manual Entry",
+                        Description = "",
+                        Symbol = null,
+                        Lat = (decimal)CurrentLocation.Latitude,
+                        Lon = (decimal)CurrentLocation.Longitude,
+                    };
+
+                    var r = POIDatabase.SavePOI(p);
+                    DisplayMapItems.AddPOIToMap();
+                }
             }
-            else if (id == Resource.Id.action_clearmap)
+            if (id == Resource.Id.SaveGPSasPOI)
             {
-                return Utils.Misc.ClearTrackRoutesFromMap();
+/*                
+                if (CurrentLocation != null)
+                {
+                    GPXDataPOI p = new()
+                    {
+                        Name = "Manual Entry",
+                        Description = "",
+                        Symbol = null,
+                        Lat = (decimal)CurrentLocation.Latitude,
+                        Lon = (decimal)CurrentLocation.Longitude,
+                    };
+
+                    var r = POIDatabase.SavePOI(p);
+                    DisplayMapItems.AddPOIToMap();
+                }
+*/
             }
             else if (id == Resource.Id.AddRogainingPOI)
             {
@@ -286,7 +312,24 @@ public override bool OnOptionsItemSelected(IMenuItem item)
             {
                 Export.ExportPOI("Rogaining");
             }
+            else if (id == Resource.Id.action_clearmap)
+            {
+                return Utils.Misc.ClearTrackRoutesFromMap();
+            }
+            else if (id == Resource.Id.action_settings)
+            {
+                Log.Information($"Change to Settings");
+
+                SupportFragmentManager.BeginTransaction()
+                    .SetReorderingAllowed(true)
+                    .Replace(Resource.Id.fragment_container, new Fragment_Preferences(), Fragment_Preferences.Fragment_Settings)
+                    .AddToBackStack(Fragment_Preferences.Fragment_Settings)
+                    .Commit();
+                SupportFragmentManager.ExecutePendingTransactions();
 
+                return true;
+            }
+
             return base.OnOptionsItemSelected(item);
         }
 

diff --git a/Models/Settings.cs b/Models/Settings.cs
@@ -22,6 +22,7 @@ public class DefaultPrefSettings
         public int freq { get; set; }
         public string? OSM_Browse_Source { get; set; }
         public string? OSM_BulkDownload_Source { get; set; }
+        public string StadiaToken { get; set; }
         public string? MapboxToken { get; set; }
         public string? ThunderforestToken { get; set; }
         public string? CustomServerURL { get; set; }

diff --git a/OfflineMaps/DownloadRasterImageMap.cs b/OfflineMaps/DownloadRasterImageMap.cs
@@ -131,7 +131,7 @@ private static async Task DownloadTiles(AwesomeTiles.TileRange range, int zoom,
 
                 OSMServer = url + token;
             }
-            else //Mapbox || Thunderforst
+            else //Mapbox || Thunderforest || StadiaMaps
             {
                 var token = Preferences.Get(MapSource.Token, "");
 

diff --git a/OfflineMaps/MBTiles.cs b/OfflineMaps/MBTiles.cs
@@ -256,7 +256,7 @@ public static async void RefreshOldTiles()
 
                 OSMServer = url + token;
             }
-            else //Mapbox || Thunderforest
+            else //Mapbox || Thunderforest || Stadia Maps
             {
                 var token = Preferences.Get(MapSource.Token, "");
 

diff --git a/OfflineMaps/TileCache.cs b/OfflineMaps/TileCache.cs
@@ -60,7 +60,7 @@ class TileCache
                         persistentCache: mbTileCache,
                         userAgent: MapSource.Name + " in Mapsui (hajk)");
                 }
-                else //Mapbox || Thunderforest
+                else //Mapbox || Thunderforest || Stadia Maps
                 {
                     var token = Preferences.Get(MapSource.Token, "");
 

diff --git a/Resources/Xml/Preferences.xml b/Resources/Xml/Preferences.xml
@@ -15,19 +15,26 @@
 		app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
-		android:title="@string/MapboxTokenTitle"
-		android:key="@string/MapboxToken"
-		android:inputType="textPassword"
-		android:summary="@string/Hidden"
-		app:useSimpleSummaryProvider="false" />
+			android:title="@string/MapboxTokenTitle"
+			android:key="@string/MapboxToken"
+			android:inputType="textPassword"
+			android:summary="@string/Hidden"
+			app:useSimpleSummaryProvider="false" />
 
     <EditTextPreference
 			android:title="@string/ThunderforestTokenTitle"
 			android:key="@string/ThunderforestToken"
 			android:inputType="textPassword"
 			android:summary="@string/Hidden"
 			app:useSimpleSummaryProvider="false" />
-
+
+    <EditTextPreference
+			android:title="@string/StadiaTokenTitle"
+			android:key="@string/StadiaToken"
+			android:inputType="textPassword"
+			android:summary="@string/Hidden"
+			app:useSimpleSummaryProvider="false" />
+
     <EditTextPreference
 			android:title="@string/CustomServerTitle"
 			android:key="@string/CustomServerURL"

diff --git a/Resources/menu/menu_main.xml b/Resources/menu/menu_main.xml
@@ -1,7 +1,24 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-      <item
+
+  <item
+      android:id="@+id/AddCurrentLocationAsPOI"
+      android:title="@string/AddCurrentLocationAsPOI" />
+
+  <item
+      android:id="@+id/SaveGPSasPOI"
+      android:title="@string/SaveGPSasPOI" />
+
+  <item
+      android:id="@+id/AddRogainingPOI"
+      android:title="@string/AddRogainingPOI" />
+
+  <item
+    android:id="@+id/ExportRogainingPOI"
+    android:title="@string/ExportRogainingPOI" />
+
+  <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
@@ -13,12 +30,4 @@
         android:title="@string/Clear_map_of_routes_and_tracks"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/AddRogainingPOI"
-        android:title="@string/AddRogainingPOI" />
-
-    <item
-      android:id="@+id/ExportRogainingPOI"
-      android:title="@string/ExportRogainingPOI" />
-
 </menu>
diff --git a/Resources/values/strings.xml b/Resources/values/strings.xml
@@ -96,6 +96,8 @@
   <string name="BackupOptions">"Choose Backup Options"</string>
   <string name="KeepNBackups">"Backups to Retain"</string>
   <string name="EnableBackupAtStartup">"Backup on first launch of the day"</string>
+  <string name="AddCurrentLocationAsPOI">"Save Current Location as POI</string>
+  <string name="SaveGPSasPOI">"Save GPS Coordinates as POI"</string>
 
   <!-- Map Tile provider Start -->
     <string name="MapTileSources">"Map Tile Sources"</string>
@@ -110,7 +112,11 @@
     <string name="ThunderforestTokenTitle">Thunderforest Token</string>
     <string name="ThunderforestToken">ThunderforestToken</string>
 
-    <!-- Custom -->
+    <!-- Stadia Maps -->
+    <string name="StadiaTokenTitle">Stadia Maps Token</string>
+    <string name="StadiaToken">StadiaToken</string>
+
+  <!-- Custom -->
     <string name="CustomServerTitle">Custom Tile Server</string>
     <string name="CustomServerHint">https://servername.domain.com/tile/{z}/{x}/{y}.png</string>
     <string name="CustomServerURL">"CustomServerURL"</string>

diff --git a/Utils/Backup.cs b/Utils/Backup.cs
@@ -285,6 +285,7 @@ private static bool BackupPreferences(string BackupFolder)
                     CustomServerURL = Preferences.Get("CustomServerURL ", ""),
                     CustomToken = Preferences.Get("CustomToken", ""),
                     MapboxToken = Preferences.Get("MapboxToken", ""),
+                    StadiaToken = Preferences.Get("StadiaToken", ""),
                     ThunderforestToken = Preferences.Get("ThunderforestToken", ""),
 
                     mapScale = Preferences.Get("mapScale", Fragment_Preferences.DefaultMapScale),