Merge master

assets/themes/nature/nature.json

@@ -52,11 +52,12 @@
         "information_board",
         "bench",
         "picnic_table",
-        "toilet"
+        "toilet",
+        "guidepost"
       ],
       "override": {
         "minzoom": 16
       }
     }
   ]
-}
+}

scripts/generateLayouts.ts

@@ -315,19 +315,19 @@ async function generateCsp(
 
     const csp: Record<string, string> = {
         "default-src": "'self'",
-        "script-src": ["'self'", "https://gc.zgo.at/count.js", ...(options?.scriptSrcs ?? [])].join(
+        "child-src": "'self' blob: ",
-            " "
-        ),
-        "child-src": "self",
         "img-src": "* data:", // maplibre depends on 'data:' to load
         "connect-src": connectSrc.join(" "),
         "report-to": "https://report.mapcomplete.org/csp",
         "worker-src": "'self' blob:", // Vite somehow loads the worker via a 'blob'
         "style-src": "'self' 'unsafe-inline'", // unsafe-inline is needed to change the default background pin colours
+        "script-src": ["'self'", "https://gc.zgo.at/count.js", ...(options?.scriptSrcs ?? [])].join(
+            " "
+        ),
     }
     const content = Object.keys(csp)
         .map((k) => k + " " + csp[k])
-        .join("; ")
+        .join(" ; ")
 
     return [
         `<meta http-equiv ="Report-To" content='{"group":"csp-endpoint", "max_age": 86400,"endpoints": [\{"url": "https://report.mapcomplete.org/csp"}], "include_subdomains": true}'>`,

src/Logic/State/FeatureSwitchState.ts

@@ -75,6 +75,13 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
             layoutToUse?.enableUserBadge ?? true,
             "Disables/Enables logging in and thus disables editing all together. This effectively puts MapComplete into read-only mode."
         )
+        {
+            if(QueryParameters.wasInitialized("fs-userbadge")){
+                // userbadge is the legacy name for 'enable-login'
+                this.featureSwitchEnableLogin.setData(QueryParameters.GetBooleanQueryParameter("fs-userbadge", undefined, "Legacy").data)
+            }
+        }
+
         this.featureSwitchSearch = FeatureSwitchUtils.initSwitch(
             "fs-search",
             layoutToUse?.enableSearch ?? true,

src/Models/MapProperties.ts

@@ -17,5 +17,9 @@ export interface MapProperties {
 }
 
 export interface ExportableMap {
-    exportAsPng(dpiFactor: number): Promise<Blob>
+    /**
+     * Export the current map as PNG.
+     * @param markerScale: if given, the markers will be 'markerScale' bigger. This is to use in combination with a supersized canvas to have more pixels and achieve print quality
+     */
+    exportAsPng(markerScale?: number): Promise<Blob>
 }

src/UI/Map/MapLibreAdaptor.ts

@@ -224,7 +224,7 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
         return url
     }
 
-    public async exportAsPng(dpiFactor: number): Promise<Blob> {
+    public async exportAsPng(markerScale: number = 1): Promise<Blob> {
         const map = this._maplibreMap.data
         if (!map) {
             return undefined
@@ -235,14 +235,14 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
 
         const ctx = drawOn.getContext("2d")
         // Set up CSS size.
-        MapLibreAdaptor.setDpi(drawOn, ctx, dpiFactor / map.getPixelRatio())
+        MapLibreAdaptor.setDpi(drawOn, ctx, markerScale / map.getPixelRatio())
 
         await this.exportBackgroundOnCanvas(ctx)
 
         // MapLibreAdaptor.setDpi(drawOn, ctx, 1)
-        const markers = await this.drawMarkers(dpiFactor)
+        const markers = await this.drawMarkers(markerScale)
         ctx.drawImage(markers, 0, 0, drawOn.width, drawOn.height)
-        ctx.scale(dpiFactor, dpiFactor)
+        ctx.scale(markerScale, markerScale)
         this._maplibreMap.data?.resize()
         return await new Promise<Blob>((resolve) => drawOn.toBlob((blob) => resolve(blob)))
     }