Imagery providers: updated to latest mapbox APIs and file moved in mo…

…dels
dem-net · Apr 29, 2020 · 8ce64b8 · 8ce64b8
1 parent e64675e
commit 8ce64b8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...es/Imagery/ImageryProviders.Predefined.cs → ...el/Imagery/ImageryProviders.Predefined.cs b/...es/Imagery/ImageryProviders.Predefined.cs → ...el/Imagery/ImageryProviders.Predefined.cs
@@ -14,15 +14,16 @@ public partial class ImageryProvider
         {
             Name = "MapBox-Satellite",
             Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Satellite", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
-            UrlModel = new UrlModel("https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.png?access_token={t}", null),
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/satellite-v9/tiles/256/{z}/{x}/{y}?access_token={t}", null),
             TokenUserSecretsKey = "MapBoxToken",
+            TileSize = 256,
             MaxZoom = 23
         };
         public static ImageryProvider MapBoxSatelliteStreet = new ImageryProvider()
         {
             Name = "MapBox-SatelliteStreet",
             Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Satellite Street", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
-            UrlModel = new UrlModel("https://api.mapbox.com/v4/mapbox.streets-satellite/{z}/{x}/{y}.png?access_token={t}", null),
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/256/{z}/{x}/{y}?access_token={t}", null),
             TokenUserSecretsKey = "MapBoxToken",
             MaxZoom = 23
         };
@@ -31,15 +32,31 @@ public partial class ImageryProvider
             Name = "MapBox-Streets",
             Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Streets", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
             TokenUserSecretsKey = "MapBoxToken",
-            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/xfischer/cjbtijn5qahc92qs2yghsy58p/tiles/256/{z}/{x}/{y}?access_token={t}", null),
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/256/{z}/{x}/{y}?access_token={t}", null),
             MaxZoom = 23
         };
         public static ImageryProvider MapBoxOutdoors = new ImageryProvider()
         {
             Name = "MapBox-Outdoors",
             Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Outdoors", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
             TokenUserSecretsKey = "MapBoxToken",
-            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/xfischer/ck77w9wh11jp81ip2rj4kg7xq/tiles/256/{z}/{x}/{y}?access_token={t}", null),
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/outdoors-v11/tiles/256/{z}/{x}/{y}?access_token={t}", null),
+            MaxZoom = 23
+        };
+        public static ImageryProvider MapBoxLight = new ImageryProvider()
+        {
+            Name = "MapBox-Light",
+            Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Light", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
+            TokenUserSecretsKey = "MapBoxToken",
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/light-v10/tiles/256/{z}/{x}/{y}?access_token={t}", null),
+            MaxZoom = 23
+        };
+        public static ImageryProvider MapBoxDark = new ImageryProvider()
+        {
+            Name = "MapBox-Dark",
+            Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Dark", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
+            TokenUserSecretsKey = "MapBoxToken",
+            UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/mapbox/dark-v10/tiles/256/{z}/{x}/{y}?access_token={t}", null),
             MaxZoom = 23
         };
         public static ImageryProvider StamenToner = new ImageryProvider()

diff --git a/...Core/Services/Imagery/ImageryProviders.cs → ...et.Core/Model/Imagery/ImageryProviders.cs b/...Core/Services/Imagery/ImageryProviders.cs → ...et.Core/Model/Imagery/ImageryProviders.cs