From 96dc751c8c06367cbe70bf94130170bb3ce918ed Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 24 May 2023 00:29:22 +0200
Subject: [PATCH] Fix note import layers

---
 .../DynamicGeoJsonTileSource.ts                   |  2 +-
 .../Conversion/CreateNoteImportLayer.ts           | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts b/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
index 64298f7de..efcaccbc3 100644
--- a/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
+++ b/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
@@ -71,7 +71,7 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
                     if (!isWhiteListed) {
                         console.debug(
                             "Not downloading tile",
-                                zxy,
+                                zxy,"for layer",layer.id,
                             "as it is not on the whitelist"
                         )
                         return undefined
diff --git a/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts b/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts
index daba77ce9..59f9b318b 100644
--- a/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts
+++ b/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts
@@ -101,6 +101,10 @@ export default class CreateNoteImportLayer extends Conversion<LayerConfigJson, L
                 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...
+             */
+            passAllFeatures: true,
             minzoom: Math.min(12, layerJson.minzoom - 2),
             title: {
                 render: trs(t.popupTitle, { title }),
@@ -170,6 +174,17 @@ export default class CreateNoteImportLayer extends Conversion<LayerConfigJson, L
                     id: "nearby_images",
                     render: tr(t.nearbyImagesIntro),
                 },
+                {
+                    id:"all_tags",
+                    render: "{all_tags()}",
+                    metacondition: {
+                        or: [
+                            "__featureSwitchIsDebugging=true",
+                            "mapcomplete-show_tags=full",
+                            "mapcomplete-show_debug=yes",
+                        ],
+                    },
+                }
             ],
             mapRendering: [
                 {