From 1993861bbeb05c582f1ff488bf29a70a062df1d6 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Fri, 4 Feb 2022 01:09:21 +0100 Subject: [PATCH] Fix tests --- assets/themes/bicycle_rental/bicycle_rental.json | 2 +- .../toerisme_vlaanderen/NEGATIEF/license_info.json | 10 ---------- test/CreateNoteImportLayer.spec.ts | 6 +++--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/assets/themes/bicycle_rental/bicycle_rental.json b/assets/themes/bicycle_rental/bicycle_rental.json index 55b5bbb409..973b33a2b1 100644 --- a/assets/themes/bicycle_rental/bicycle_rental.json +++ b/assets/themes/bicycle_rental/bicycle_rental.json @@ -21,6 +21,6 @@ "widenFactor": 0.05, "socialImage": "", "layers": [ - "bicycle_rental" + "bicycle_rental" ] } \ No newline at end of file diff --git a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json index 45bd4d713e..24e17f3e9a 100644 --- a/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json +++ b/assets/themes/toerisme_vlaanderen/NEGATIEF/license_info.json @@ -43,16 +43,6 @@ "https://mapcomplete.osm.be/toerisme_vlaanderenn" ] }, - { - "path": "logo.png", - "license": "Logo (all rights reserved)", - "authors": [ - "Toerisme Vlaanderen" - ], - "sources": [ - "https://www.toerismevlaanderen.be/" - ] - }, { "path": "observation_platform.svg", "license": "CC0", diff --git a/test/CreateNoteImportLayer.spec.ts b/test/CreateNoteImportLayer.spec.ts index 35f67d3df7..8eed041595 100644 --- a/test/CreateNoteImportLayer.spec.ts +++ b/test/CreateNoteImportLayer.spec.ts @@ -17,10 +17,10 @@ export default class CreateNoteImportLayerSpec extends T { tagRenderings: new Map() } - const layerPrepare = new PrepareLayer() - const layer = layerPrepare.convertStrict(desugaringState, bookcases, "ImportLayerGeneratorTest:Parse bookcases") + const layerPrepare = new PrepareLayer(desugaringState) + const layer = layerPrepare.convertStrict(bookcases, "ImportLayerGeneratorTest:Parse bookcases") const generator = new CreateNoteImportLayer() - const generatedLayer: LayerConfigJson = generator.convertStrict(desugaringState, layer, "ImportLayerGeneratorTest: convert") + const generatedLayer: LayerConfigJson = generator.convertStrict(layer, "ImportLayerGeneratorTest: convert") T.equals("_tags~(^|.*;)amenity=public_bookcase($|;.*)", generatedLayer.isShown.mappings[1].if["and"][1].or[0].and[0]) T.isTrue(generatedLayer.minzoom <= layer.minzoom, "Zoomlevel is to high") let renderings = Utils.NoNull(Utils.NoNull(generatedLayer.tagRenderings