Merge branch 'master' into develop

src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts

@@ -92,7 +92,6 @@ export default class CreateNoteImportLayer extends Conversion<LayerConfigJson, L
                     this._includeClosedNotesDays +
                     "&bbox={x_min},{y_min},{x_max},{y_max}",
                 geoJsonZoomLevel: 10,
-                maxCacheAge: 0,
             },
             /* We need to set 'pass_all_features'
        There are probably many note_import-layers, and we don't want the first one to gobble up all notes and then discard them...

src/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts

@@ -135,6 +135,10 @@ export class UpdateLegacyLayer extends DesugaringStep<
         delete config["rotation"]
         delete config["wayHandling"]
         delete config["hideUnderlayingFeaturesMinPercentage"]
+        const src = config.source
+        delete src["isOsmCache"]
+        delete src["maxCacheAge"]
+        delete src["widenFactor"]
 
         for (const mapRenderingElement of config["mapRendering"] ?? []) {
             if (mapRenderingElement["iconOverlays"] !== undefined) {

src/Models/ThemeConfig/Conversion/Validation.ts

@@ -1622,6 +1622,18 @@ export class ValidateLayer extends Conversion<
             context.enters("doCount").err("Use `isCounted` instead of `doCount`")
         }
 
+        if (json.source) {
+            const src = json.source
+            if (src["isOsmCache"] !== undefined) {
+                context.enters("source").err("isOsmCache is deprecated")
+            }
+            if (src["maxCacheAge"] !== undefined) {
+                context
+                    .enters("source")
+                    .err("maxCacheAge is deprecated; it is " + src["maxCacheAge"])
+            }
+        }
+
         return { raw: json, parsed: layerConfig }
     }
 }