Merge develop

src/Models/Constants.ts

@@ -58,7 +58,7 @@ export default class Constants {
 
         importHelperUnlock: 5000,
     }
-    static readonly minZoomLevelToAddNewPoint = Constants.isRetina() ? 18 : 19
+    static readonly minZoomLevelToAddNewPoint = Constants.isRetina() ? 17 : 18
     /**
      * Used by 'PendingChangesUploader', which waits this amount of seconds to upload changes.
      * (Note that pendingChanges might upload sooner if the popup is closed or similar)

src/Models/RasterLayers.ts

@@ -53,61 +53,6 @@ export class AvailableRasterLayers {
         geometry: BBox.global.asGeometry(),
     }
 
-    public static readonly maptilerCarto: RasterLayerPolygon = {
-        type: "Feature",
-        properties: {
-            name: "MapTiler Carto",
-            url: "https://api.maptiler.com/maps/openstreetmap/style.json?key=GvoVAJgu46I5rZapJuAy",
-            category: "osmbasedmap",
-            id: "maptiler.carto",
-            type: "vector",
-            attribution: {
-                text: "Maptiler",
-                url: "https://www.maptiler.com/copyright/",
-            },
-        },
-        geometry: BBox.global.asGeometry(),
-    }
-
-    public static readonly maptilerBackdrop: RasterLayerPolygon = {
-        type: "Feature",
-        properties: {
-            name: "MapTiler Backdrop",
-            url: "https://api.maptiler.com/maps/backdrop/style.json?key=GvoVAJgu46I5rZapJuAy",
-            category: "osmbasedmap",
-            id: "maptiler.backdrop",
-            type: "vector",
-            attribution: {
-                text: "Maptiler",
-                url: "https://www.maptiler.com/copyright/",
-            },
-        },
-        geometry: BBox.global.asGeometry(),
-    }
-    public static readonly americana: RasterLayerPolygon = {
-        type: "Feature",
-        properties: {
-            name: "Americana",
-            url: "https://zelonewolf.github.io/openstreetmap-americana/style.json",
-            category: "osmbasedmap",
-            id: "americana",
-            type: "vector",
-            attribution: {
-                text: "Americana",
-                url: "https://github.com/ZeLonewolf/openstreetmap-americana/",
-            },
-        },
-        geometry: BBox.global.asGeometry(),
-    }
-
-    public static readonly vectorLayers = [
-        AvailableRasterLayers.maptilerDefaultLayer,
-        AvailableRasterLayers.osmCarto,
-        AvailableRasterLayers.maptilerCarto,
-        AvailableRasterLayers.maptilerBackdrop,
-        AvailableRasterLayers.americana,
-    ]
-
     public static layersAvailableAt(
         location: Store<{ lon: number; lat: number }>
     ): Store<RasterLayerPolygon[]> {
@@ -119,7 +64,7 @@ export class AvailableRasterLayers {
                 )
             })
         )
-        const available = Stores.ListStabilized(
+        return Stores.ListStabilized(
             availableLayersBboxes.map((eliPolygons) => {
                 const loc = location.data
                 const lonlat: [number, number] = [loc.lon, loc.lat]
@@ -129,12 +74,11 @@ export class AvailableRasterLayers {
                     }
                     return GeoOperations.inside(lonlat, eliPolygon)
                 })
+                matching.push(AvailableRasterLayers.maptilerDefaultLayer)
                 matching.push(...AvailableRasterLayers.globalLayers)
-                matching.unshift(...AvailableRasterLayers.vectorLayers)
                 return matching
             })
         )
-        return available
     }
 }
 

src/Models/ThemeConfig/LayoutConfig.ts

@@ -94,6 +94,9 @@ export default class LayoutConfig implements LayoutInformation {
         }
         const context = this.id
         this.credits = json.credits
+        if(!json.title){
+            throw `The theme ${json.id} does not have a title defined.`
+        }
         this.language = json.mustHaveLanguage ?? Object.keys(json.title)
         this.usedImages = Array.from(
             new ExtractImages(official, undefined)