From 8447c7adc9381eb47479841ddc92fd4876e7d6e7 Mon Sep 17 00:00:00 2001 From: Elke Erhardt Date: Thu, 6 Feb 2020 08:04:24 +0100 Subject: [PATCH 1/3] [BATOOL-100] test to fix missing projection --- test/project.fixtures.json | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/test/project.fixtures.json b/test/project.fixtures.json index cbe2e1a..06632c4 100644 --- a/test/project.fixtures.json +++ b/test/project.fixtures.json @@ -38,5 +38,65 @@ { "altitudinalZone": "40", "forestType": "6" }, { "altitudinalZone": "20", "forestType": "6 collin" } ] + }, + { + "location": { + "forestEcoregion": "2b", + "altitudinalZone": "90", + "forestType": "57VM", + "silverFirArea": "1", + "relief": "kup" + }, + "projections": [ + { "altitudinalZone": "81", "forestType": "51" }, + { "altitudinalZone": "60", "forestType": "19" }, + { "altitudinalZone": "50", "forestType": "8d" }, + { "altitudinalZone": "40", "forestType": "6" } + ] + } + { + "location": { + "forestEcoregion": "2b", + "altitudinalZone": "90", + "forestType": "57VM", + "silverFirArea": "3", + "relief": "kup" + }, + "projections": [ + { "altitudinalZone": "81", "forestType": "51Re" }, + { "altitudinalZone": "60", "forestType": "19" }, + { "altitudinalZone": "50", "forestType": "8d" }, + { "altitudinalZone": "40", "forestType": "6" } + ] + } + { + "location": { + "forestEcoregion": "2b", + "altitudinalZone": "90", + "forestType": "57VM", + "silverFirArea": "1", + "relief": "h_and_m" + }, + "projections": [ + { "altitudinalZone": "81", "forestType": "51" }, + { "altitudinalZone": "60", "forestType": "18" }, + { "altitudinalZone": "50", "forestType": "8a" }, + { "altitudinalZone": "40", "forestType": "7a" } + ] + } + { + "location": { + "forestEcoregion": "2b", + "altitudinalZone": "90", + "forestType": "57VM", + "silverFirArea": "3", + "relief": "h_and_m" + }, + "projections": [ + { "altitudinalZone": "81", "forestType": "51Re" }, + { "altitudinalZone": "60", "forestType": "18" }, + { "altitudinalZone": "50", "forestType": "8a" }, + { "altitudinalZone": "40", "forestType": "7a" } + ] } ] From 08645abd27f7096dfe67613ca68f41aa36a2d28a Mon Sep 17 00:00:00 2001 From: friedjoff Date: Thu, 6 Feb 2020 14:25:57 +0100 Subject: [PATCH 2/3] chore: fix syntax --- test/project.fixtures.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/project.fixtures.json b/test/project.fixtures.json index 06632c4..23e10e2 100644 --- a/test/project.fixtures.json +++ b/test/project.fixtures.json @@ -53,7 +53,7 @@ { "altitudinalZone": "50", "forestType": "8d" }, { "altitudinalZone": "40", "forestType": "6" } ] - } + }, { "location": { "forestEcoregion": "2b", @@ -68,7 +68,7 @@ { "altitudinalZone": "50", "forestType": "8d" }, { "altitudinalZone": "40", "forestType": "6" } ] - } + }, { "location": { "forestEcoregion": "2b", @@ -83,7 +83,7 @@ { "altitudinalZone": "50", "forestType": "8a" }, { "altitudinalZone": "40", "forestType": "7a" } ] - } + }, { "location": { "forestEcoregion": "2b", From 4c97f6194981215db4b54b9bb209cc22e5049b31 Mon Sep 17 00:00:00 2001 From: friedjoff Date: Tue, 3 Mar 2020 11:55:27 +0100 Subject: [PATCH 3/3] Update fixture data to make tests pass again. --- test/project.fixtures.json | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/test/project.fixtures.json b/test/project.fixtures.json index 23e10e2..348c80e 100644 --- a/test/project.fixtures.json +++ b/test/project.fixtures.json @@ -6,23 +6,23 @@ "forestType": "47*" }, "projections": [ - { "altitudinalZone": "81", "forestType": "47*" }, - { "altitudinalZone": "60", "forestType": "19" }, - { "altitudinalZone": "50", "forestType": "8d" }, - { "altitudinalZone": "40", "forestType": "6" }, - { "altitudinalZone": "20", "forestType": "6 collin" } + { "altitudinalZone": "81", "forestType": "48" }, + { "altitudinalZone": "20", "forestType": "48 collin" } ] }, { "location": { "forestEcoregion": "2b", "altitudinalZone": "90", - "forestType": "47*" + "forestType": "47*", + "additional": "Shdy_Cl" }, "projections": [ - { "altitudinalZone": "83", "forestType": "47*" }, - { "altitudinalZone": "82", "forestType": "47*" }, - { "altitudinalZone": "20", "forestType": "55 collin" } + { "altitudinalZone": "81", "forestType": "48" }, + { "altitudinalZone": "60", "forestType": "48" }, + { "altitudinalZone": "50", "forestType": "22" }, + { "altitudinalZone": "40", "forestType": "22" }, + { "altitudinalZone": "20", "forestType": "22 collin" } ] }, { @@ -63,10 +63,8 @@ "relief": "kup" }, "projections": [ - { "altitudinalZone": "81", "forestType": "51Re" }, - { "altitudinalZone": "60", "forestType": "19" }, - { "altitudinalZone": "50", "forestType": "8d" }, - { "altitudinalZone": "40", "forestType": "6" } + { "altitudinalZone": "81", "forestType": "54A" }, + { "altitudinalZone": "20", "forestType": "54A collin" } ] }, { @@ -93,10 +91,8 @@ "relief": "h_and_m" }, "projections": [ - { "altitudinalZone": "81", "forestType": "51Re" }, - { "altitudinalZone": "60", "forestType": "18" }, - { "altitudinalZone": "50", "forestType": "8a" }, - { "altitudinalZone": "40", "forestType": "7a" } + { "altitudinalZone": "81", "forestType": "54A" }, + { "altitudinalZone": "20", "forestType": "54A collin" } ] } ]