diff --git a/cypress/integration/projection.spec.js b/cypress/integration/projection.spec.js index dcdb9565..44505da6 100644 --- a/cypress/integration/projection.spec.js +++ b/cypress/integration/projection.spec.js @@ -21,11 +21,11 @@ describe('Projection mode', () => { }); describe('Projection in form mode', () => { - const selectField = (name, item) => { + const selectField = (name, item, force) => { cy.get(`[data-cypress=projectionForm${name}]`) .scrollIntoView() - .click(); - cy.get(`[data-cypress=projectionForm${name}] ${item}`).click(); + .click({ force }); + cy.get(`[data-cypress=projectionForm${name}] ${item}`).click({ force }); }; beforeEach(() => { cy.visit(''); @@ -38,7 +38,7 @@ describe('Projection in form mode', () => { selectField('ForestEcoregion', '.item:first-child'); selectField('AltitudinalZone', '.item:last-child'); selectField('ForestType', '.item:first-child'); - selectField('TargetAltitudinalZone', '.item:first-child'); + selectField('TargetAltitudinalZone', '.item:first-child', true); cy.get('[data-cypress=recommendationPane]') .scrollIntoView() .should('be.visible'); @@ -50,8 +50,8 @@ describe('Projection in form mode', () => { selectField('ForestType', '.item:first-child'); cy.get(`[data-cypress=projectionFormTransition] .ui:last-child`).click(); selectField('TransitionForestType', '.item:first-child'); - selectField('TransitionAltitudinalZone', '.item:last-child'); - selectField('TargetAltitudinalZone', '.item:first-child'); + selectField('TransitionAltitudinalZone', '.item:last-child', true); + selectField('TargetAltitudinalZone', '.item:first-child', true); cy.get('[data-cypress=projectionResultMenuItem]').contains(/\w+\s\(\w+\)/); }); }); diff --git a/lib/data/locations.json b/lib/data/locations.json index baee8e0e..0f6b97f3 100644 --- a/lib/data/locations.json +++ b/lib/data/locations.json @@ -1,42 +1,12 @@ { - "1": { - "20": 1, - "40": 7, - "50": 9, - "60": 11, - "81": 14, - "82": 14, - "83": 14, - "90": 22, - "100": 26 - }, - "3": { "81": 18, "82": 18, "83": 18, "90": 22, "100": 27 }, - "4": { "20": 3, "81": 20, "82": 20, "83": 20, "90": 23, "100": 24 }, - "M": { "20": 1, "40": 7, "50": 9, "60": 11, "81": 14, "82": 14, "83": 14 }, - "J": { "20": 1, "40": 7, "50": 9, "60": 11, "81": 14, "82": 14, "83": 14 }, - "2a": { - "20": 2, - "40": 8, - "50": 10, - "60": 12, - "81": 17, - "82": 17, - "83": 17, - "90": 22, - "100": 27 - }, - "5a": { - "10": 5, - "20": 4, - "30": 4, - "70": 13, - "81": 21, - "82": 21, - "83": 21, - "90": 25, - "100": 25 - }, + "1": { "20": 1, "40": 7, "50": 9, "60": 11, "80": 14, "90": 22, "100": 26 }, + "3": { "80": 18, "90": 22, "100": 27 }, + "4": { "20": 3, "80": 20, "90": 23, "100": 24 }, + "M": { "20": 1, "40": 7, "50": 9, "60": 11, "80": 14 }, + "J": { "20": 1, "40": 7, "50": 9, "60": 11, "80": 14 }, + "2a": { "20": 2, "40": 8, "50": 10, "60": 12, "80": 17, "90": 22, "100": 27 }, + "5a": { "10": 5, "20": 4, "30": 4, "70": 13, "80": 21, "90": 25, "100": 25 }, "5b": { "10": 5, "20": 4, "30": 4, "70": 13, "90": 25, "100": 25 }, - "2b": { "20": 2, "81": 17, "82": 17, "83": 17, "90": 22, "100": 27 }, + "2b": { "20": 2, "80": 17, "90": 22, "100": 27 }, "Me": { "10": 6, "30": 6 } } diff --git a/lib/data/nais/ecogram.js b/lib/data/nais/ecogram.js index c7c0ad4f..b6857b8e 100644 --- a/lib/data/nais/ecogram.js +++ b/lib/data/nais/ecogram.js @@ -45,17 +45,12 @@ const aggregateEcograms = () => { const ecogram = JSON.parse(rawdata); const { forestEcoregions, altitudinalZones } = ecogram.properties || {}; - // TODO: remove the following variable once branch "hochmontan" is merged! - const filteredAltitudinalZones = altitudinalZones.includes('80') - ? [...altitudinalZones.filter((z) => z !== '80'), '81', '82', '83'] - : altitudinalZones; - validate('forestEcoregion', forestEcoregions); - validate('altitudinalZone', filteredAltitudinalZones); + validate('altitudinalZone', altitudinalZones); forestEcoregions.forEach((region) => { locations[region] = locations[region] || {}; - filteredAltitudinalZones.forEach((zone) => { + altitudinalZones.forEach((zone) => { locations[region][zone] = id; }); }); diff --git a/lib/data/projections.json b/lib/data/projections.json index 9f7872df..bd156b12 100755 --- a/lib/data/projections.json +++ b/lib/data/projections.json @@ -567,7 +567,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -926,330 +926,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -1839,7 +1839,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -2198,330 +2198,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -2618,7 +2618,7 @@ } }, "4": { - "81": { + "80": { "3": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "24": { "unknown": { "unknown": { "unknown": { "unknown": "30:25a" } } } @@ -2779,327 +2779,327 @@ } }, "90": { - "24": { "unknown": { "unknown": { "unknown": { "unknown": "81:24" } } } }, + "24": { "unknown": { "unknown": { "unknown": { "unknown": "80:24" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "67": { "unknown": { "unknown": { - "1": { "unknown": "81:53Ta" }, - "2": { "unknown": "81:53Ta" }, - "3": { "unknown": "81:53*" } + "1": { "unknown": "80:53Ta" }, + "2": { "unknown": "80:53Ta" }, + "3": { "unknown": "80:53*" } } } }, "69": { "unknown": { "unknown": { - "1": { "unknown": "81:53Ta" }, - "2": { "unknown": "81:53Ta" }, - "3": { "unknown": "81:53*" } + "1": { "unknown": "80:53Ta" }, + "2": { "unknown": "80:53Ta" }, + "3": { "unknown": "80:53*" } } } }, - "70": { "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, - "AV": { "unknown": { "unknown": { "unknown": { "unknown": "81:AV" } } } }, + "70": { "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, + "AV": { "unknown": { "unknown": { "unknown": { "unknown": "80:AV" } } } }, "21*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "24G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24G" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27h" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27h" } } } }, "32V": { "unknown": { - "<5F": { "unknown": { "unknown": "81:43S" } }, - "Nrml": { "unknown": { "unknown": "81:32V" } } + "<5F": { "unknown": { "unknown": "80:43S" } }, + "Nrml": { "unknown": { "unknown": "80:32V" } } } }, "47*": { "unknown": { "unknown": { - "1": { "unknown": "81:47*" }, - "2": { "unknown": "81:47*" }, - "3": { "unknown": "81:47Re" } + "1": { "unknown": "80:47*" }, + "2": { "unknown": "80:47*" }, + "3": { "unknown": "80:47Re" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:47M" }, - "2": { "unknown": "81:47M" }, - "3": { "unknown": "81:57C" } + "1": { "unknown": "80:47M" }, + "2": { "unknown": "80:47M" }, + "3": { "unknown": "80:57C" } } } }, "57S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:56" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:56" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46M" }, - "2": { "unknown": "81:46M" }, - "3": { "unknown": "81:46MRe" } + "1": { "unknown": "80:46M" }, + "2": { "unknown": "80:46M" }, + "3": { "unknown": "80:46MRe" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59*": { "unknown": { "unknown": { - "1": { "unknown": "81:47*" }, - "2": { "unknown": "81:47*" }, - "3": { "unknown": "81:47Re" } + "1": { "unknown": "80:47*" }, + "2": { "unknown": "80:47*" }, + "3": { "unknown": "80:47Re" } } } }, "59A": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "59J": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59S": { "unknown": { "unknown": { - "1": { "unknown": "81:52" }, - "2": { "unknown": "81:52" }, - "3": { "unknown": "81:52Re" } + "1": { "unknown": "80:52" }, + "2": { "unknown": "80:52" }, + "3": { "unknown": "80:52Re" } } } }, "60*": { "unknown": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } } }, "60A": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "67G": { "unknown": { "unknown": { - "1": { "unknown": "81:53Ta" }, - "2": { "unknown": "81:53Ta" }, - "3": { "unknown": "81:53*" } + "1": { "unknown": "80:53Ta" }, + "2": { "unknown": "80:53Ta" }, + "3": { "unknown": "80:53*" } } } }, "69G": { "unknown": { "unknown": { - "1": { "unknown": "81:53Ta" }, - "2": { "unknown": "81:53Ta" }, - "3": { "unknown": "81:53*" } + "1": { "unknown": "80:53Ta" }, + "2": { "unknown": "80:53Ta" }, + "3": { "unknown": "80:53*" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "21*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "32VG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:43S" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:43S" } } } }, "47*G": { "unknown": { "unknown": { - "1": { "unknown": "81:47*" }, - "2": { "unknown": "81:47*" }, - "3": { "unknown": "81:47Re" } + "1": { "unknown": "80:47*" }, + "2": { "unknown": "80:47*" }, + "3": { "unknown": "80:47Re" } } } }, "57Bl": { "unknown": { "Nrml": { - "1": { "unknown": "81:48" }, - "2": { "unknown": "81:48" }, - "3": { "unknown": "81:47H" } + "1": { "unknown": "80:48" }, + "2": { "unknown": "80:48" }, + "3": { "unknown": "80:47H" } }, "Shdy_Cl": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" }, - "3": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" }, + "3": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:47MG" }, - "2": { "unknown": "81:47MG" }, - "3": { "unknown": "81:57CG" } + "1": { "unknown": "80:47MG" }, + "2": { "unknown": "80:47MG" }, + "3": { "unknown": "80:57CG" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:57VM" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:57VM" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "59AG": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "24*Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*Fe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*Fe" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48" }, - "2": { "unknown": "81:48" }, - "3": { "unknown": "81:47H" } + "1": { "unknown": "80:48" }, + "2": { "unknown": "80:48" }, + "3": { "unknown": "80:47H" } } } }, "57CTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47M" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47M" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } }, "47*Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:47*Lä" }, - "2": { "unknown": "81:47*Lä" }, - "3": { "unknown": "81:47Re" } + "1": { "unknown": "80:47*Lä" }, + "2": { "unknown": "80:47*Lä" }, + "3": { "unknown": "80:47Re" } } } }, "57BlTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:47M" }, - "2": { "unknown": "81:47M" }, - "3": { "unknown": "81:57CLä" } + "1": { "unknown": "80:47M" }, + "2": { "unknown": "80:47M" }, + "3": { "unknown": "80:57CLä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46M" }, - "2": { "unknown": "81:46M" }, - "3": { "unknown": "81:46MRe" } + "1": { "unknown": "80:46M" }, + "2": { "unknown": "80:46M" }, + "3": { "unknown": "80:46MRe" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60ALä": { "unknown": { "unknown": { - "1": { "unknown": "81:47D" }, - "2": { "unknown": "81:47D" }, - "3": { "unknown": "81:47DRe" } + "1": { "unknown": "80:47D" }, + "2": { "unknown": "80:47D" }, + "3": { "unknown": "80:47DRe" } } } } @@ -3767,7 +3767,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -4126,330 +4126,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -5179,7 +5179,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -5538,330 +5538,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -6525,7 +6525,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -6884,330 +6884,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -7871,7 +7871,7 @@ "unknown": { "unknown": { "unknown": { "unknown": "50:62" } } } } }, - "81": { + "80": { "21": { "unknown": { "unknown": { "unknown": { "unknown": "20:23H collin" } } } }, @@ -8230,330 +8230,330 @@ } }, "90": { - "23": { "unknown": { "unknown": { "unknown": { "unknown": "81:23" } } } }, + "23": { "unknown": { "unknown": { "unknown": { "unknown": "80:23" } } } }, "53": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "60": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "67": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, - "71": { "unknown": { "unknown": { "unknown": { "unknown": "81:71" } } } }, + "71": { "unknown": { "unknown": { "unknown": { "unknown": "80:71" } } } }, "72": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "AV": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:50" } }, - "unknown": { "unknown": { "unknown": "81:AV" } } + "Nrml": { "unknown": { "unknown": "80:50" } }, + "unknown": { "unknown": { "unknown": "80:AV" } } } }, "23G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:23G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:23G" } } } }, "24*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*" } } } }, "27*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:27*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:27*" } } } }, "32S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:32V" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:32V" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "49*": { "unknown": { "unknown": { - "1": { "unknown": "81:49*Ta" }, - "2": { "unknown": "81:49*Ta" }, - "3": { "unknown": "81:49*" } + "1": { "unknown": "80:49*Ta" }, + "2": { "unknown": "80:49*Ta" }, + "3": { "unknown": "80:49*" } } } }, "53A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "55*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "57C": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57M": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46MRe" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46MRe" } } } }, "57S": { "unknown": { "unknown": { - "1": { "unknown": "81:46*" }, - "2": { "unknown": "81:46*" }, - "3": { "unknown": "81:46*Re" } + "1": { "unknown": "80:46*" }, + "2": { "unknown": "80:46*" }, + "3": { "unknown": "80:46*Re" } } } }, "57V": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58L": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59R": { - "unknown": { "unknown": { "unknown": { "unknown": "81:59R" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:59R" } } } }, "60*": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, ">70": { "unknown": { - "1": { "unknown": "81:60*Ta" }, - "2": { "unknown": "81:60*Ta" }, - "3": { "unknown": "81:60*" } + "1": { "unknown": "80:60*Ta" }, + "2": { "unknown": "80:60*Ta" }, + "3": { "unknown": "80:60*" } } } }, "60A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "60E": { - "unknown": { "unknown": { "unknown": { "unknown": "81:49*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:49*" } } } }, "67*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65*" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:65" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:65" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68*" } } } }, "71G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:71G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:71G" } } } }, "72G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "24*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:24*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:24*G" } } } }, "53*s": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } }, "53Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Ta" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Ta" } } } }, "57Bl": { "unknown": { - "Nrml": { "1": { "unknown": "81:48" }, "2": { "unknown": "81:48" } }, + "Nrml": { "1": { "unknown": "80:48" }, "2": { "unknown": "80:48" } }, "Shdy_Cl_Bb": { - "1": { "unknown": "81:57Bl" }, - "2": { "unknown": "81:57Bl" } + "1": { "unknown": "80:57Bl" }, + "2": { "unknown": "80:57Bl" } } } }, "57CG": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57VG": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "57VM": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:54A" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:54A" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58LG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*G" } } } }, "60*G": { "unknown": { "unknown": { - "1": { "unknown": "81:60*TaG" }, - "2": { "unknown": "81:60*TaG" }, - "3": { "unknown": "81:60*G" } + "1": { "unknown": "80:60*TaG" }, + "2": { "unknown": "80:60*TaG" }, + "3": { "unknown": "80:60*G" } } } }, "60AG": { "unknown": { "unknown": { - "1": { "unknown": "81:50G" }, - "2": { "unknown": "81:50G" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50G" }, + "2": { "unknown": "80:50G" }, + "3": { "unknown": "80:50Re" } } } }, "60Ta": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "66PM": { - "unknown": { "unknown": { "unknown": { "unknown": "81:66" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:66" } } } }, "53ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "53Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53Lä" } } } }, - "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "81:57Bl " } } } }, + "57Bl ": { "unknown": { "unknown": { "3": { "unknown": "80:57Bl " } } } }, "57BlG": { "unknown": { "unknown": { - "1": { "unknown": "81:48G" }, - "2": { "unknown": "81:48G" }, - "3": { "unknown": "81:57BlG" } + "1": { "unknown": "80:48G" }, + "2": { "unknown": "80:48G" }, + "3": { "unknown": "80:57BlG" } } } }, "57CTa": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55" } } } }, "57STa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:46*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:46*" } } } }, "57VTa": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Ta": { - "<70": { "unknown": { "unknown": { "unknown": "81:50*" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Ta" } } } + "<70": { "unknown": { "unknown": { "unknown": "80:50*" } } }, + ">70": { "unknown": { "unknown": { "unknown": "80:60*Ta" } } } }, "60ATa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:60" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:60" } } } }, "60Lä": { "unknown": { "unknown": { - "1": { "unknown": "81:50" }, - "2": { "unknown": "81:50" }, - "3": { "unknown": "81:50Re" } + "1": { "unknown": "80:50" }, + "2": { "unknown": "80:50" }, + "3": { "unknown": "80:50Re" } } } }, "72Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57Bl" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57Bl" } } } }, "47*Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*Lä" } } } }, "57CLä": { "unknown": { "unknown": { - "1": { "unknown": "81:51" }, - "2": { "unknown": "81:51" }, - "3": { "unknown": "81:55Lä" } + "1": { "unknown": "80:51" }, + "2": { "unknown": "80:51" }, + "3": { "unknown": "80:55Lä" } } } }, "57VLä": { "unknown": { "unknown": { - "1": { "unknown": "81:46" }, - "2": { "unknown": "81:46" }, - "3": { "unknown": "81:46Re" } + "1": { "unknown": "80:46" }, + "2": { "unknown": "80:46" }, + "3": { "unknown": "80:46Re" } } } }, "58LLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "60*Lä": { "<70": { "unknown": { - "1": { "unknown": "81:50*" }, - "2": { "unknown": "81:50*" }, - "3": { "unknown": "81:50*Re" } + "1": { "unknown": "80:50*" }, + "2": { "unknown": "80:50*" }, + "3": { "unknown": "80:50*Re" } } }, - ">70": { "unknown": { "unknown": { "unknown": "81:60*Lä" } } } + ">70": { "unknown": { "unknown": { "unknown": "80:60*Lä" } } } }, "60ALä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50" } } } }, "53*sLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:53*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:53*" } } } } }, "100": { @@ -8830,7 +8830,7 @@ "3L/4L": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "40PBlt": { "unknown": { "unknown": { "unknown": { "unknown": null } } } } }, - "81": { + "80": { "24": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "47": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "48": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, @@ -8880,214 +8880,214 @@ }, "90": { "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, - "59": { "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } }, - "67": { "unknown": { "unknown": { "unknown": { "unknown": "81:67" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:69" } } } }, - "70": { "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } }, - "AV": { "unknown": { "unknown": { "unknown": { "unknown": "81:AV" } } } }, + "59": { "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, + "67": { "unknown": { "unknown": { "unknown": { "unknown": "80:67" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:69" } } } }, + "70": { "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, + "AV": { "unknown": { "unknown": { "unknown": { "unknown": "80:AV" } } } }, "21*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*" } } } }, "57C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57V": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "59*": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "59A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "59J": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "60*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:67G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:67G" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:69G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:69G" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, "21*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*G" } } } }, "47*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*G" } } } }, "57Bl": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:48" } }, - "Shdy_Cl": { "unknown": { "unknown": "81:57Bl" } } + "Nrml": { "unknown": { "unknown": "80:48" } }, + "Shdy_Cl": { "unknown": { "unknown": "80:57Bl" } } } }, "57CG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59AG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47DG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47DG" } } } }, "60*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "57BlG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "57CTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57VTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "47*Lä": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "57BlTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "57VLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } } }, "100": { "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, - "59": { "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } }, - "67": { "unknown": { "unknown": { "unknown": { "unknown": "81:67" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:69" } } } }, - "70": { "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } }, - "AV": { "unknown": { "unknown": { "unknown": { "unknown": "81:AV" } } } }, + "59": { "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, + "67": { "unknown": { "unknown": { "unknown": { "unknown": "80:67" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:69" } } } }, + "70": { "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, + "AV": { "unknown": { "unknown": { "unknown": { "unknown": "80:AV" } } } }, "21*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*" } } } }, "57C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57V": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "59*": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "59A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "59J": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "60*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:67G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:67G" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:69G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:69G" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, "21*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*G" } } } }, "47*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*G" } } } }, "57Bl": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:48" } }, - "Shdy_Cl": { "unknown": { "unknown": "81:57Bl" } } + "Nrml": { "unknown": { "unknown": "80:48" } }, + "Shdy_Cl": { "unknown": { "unknown": "80:57Bl" } } } }, "57CG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59AG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47DG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47DG" } } } }, "60*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "57BlG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "57CTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57VTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "47*Lä": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "57BlTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "57VLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } } } }, @@ -9272,7 +9272,7 @@ "3L/4L": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "40PBlt": { "unknown": { "unknown": { "unknown": { "unknown": null } } } } }, - "81": { + "80": { "24": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "47": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, "48": { "unknown": { "unknown": { "unknown": { "unknown": null } } } }, @@ -9322,214 +9322,214 @@ }, "90": { "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, - "59": { "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } }, - "67": { "unknown": { "unknown": { "unknown": { "unknown": "81:67" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:69" } } } }, - "70": { "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } }, - "AV": { "unknown": { "unknown": { "unknown": { "unknown": "81:AV" } } } }, + "59": { "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, + "67": { "unknown": { "unknown": { "unknown": { "unknown": "80:67" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:69" } } } }, + "70": { "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, + "AV": { "unknown": { "unknown": { "unknown": { "unknown": "80:AV" } } } }, "21*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*" } } } }, "57C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57V": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "59*": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "59A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "59J": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "60*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:67G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:67G" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:69G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:69G" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, "21*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*G" } } } }, "47*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*G" } } } }, "57Bl": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:48" } }, - "Shdy_Cl": { "unknown": { "unknown": "81:57Bl" } } + "Nrml": { "unknown": { "unknown": "80:48" } }, + "Shdy_Cl": { "unknown": { "unknown": "80:57Bl" } } } }, "57CG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59AG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47DG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47DG" } } } }, "60*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "57BlG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "57CTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57VTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "47*Lä": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "57BlTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "57VLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } } }, "100": { "58": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, - "59": { "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } }, - "67": { "unknown": { "unknown": { "unknown": { "unknown": "81:67" } } } }, - "69": { "unknown": { "unknown": { "unknown": { "unknown": "81:69" } } } }, - "70": { "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } }, - "AV": { "unknown": { "unknown": { "unknown": { "unknown": "81:AV" } } } }, + "59": { "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, + "67": { "unknown": { "unknown": { "unknown": { "unknown": "80:67" } } } }, + "69": { "unknown": { "unknown": { "unknown": { "unknown": "80:69" } } } }, + "70": { "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, + "AV": { "unknown": { "unknown": { "unknown": { "unknown": "80:AV" } } } }, "21*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*" } } } }, "47*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*" } } } }, "57C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57V": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58C": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "58G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "59*": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "59A": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47D" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47D" } } } }, "59J": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59S": { - "unknown": { "unknown": { "unknown": { "unknown": "81:52" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:52" } } } }, "60*": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "67G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:67G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:67G" } } } }, "69G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:69G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:69G" } } } }, "70G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:68" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:68" } } } }, "21*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:21*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:21*G" } } } }, "47*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47*G" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47*G" } } } }, "57Bl": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:48" } }, - "Shdy_Cl": { "unknown": { "unknown": "81:57Bl" } } + "Nrml": { "unknown": { "unknown": "80:48" } }, + "Shdy_Cl": { "unknown": { "unknown": "80:57Bl" } } } }, "57CG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Bl": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47H" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47H" } } } }, "58Fe": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*" } } } }, "59AG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47DG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47DG" } } } }, "60*G": { - "unknown": { "unknown": { "unknown": { "unknown": "81:50*" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:50*" } } } }, "57BlG": { - "unknown": { "unknown": { "unknown": { "unknown": "81:57BlG" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:57BlG" } } } }, "57CTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "57VTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } }, "58Lä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:55*Lä" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:55*Lä" } } } }, "47*Lä": { "unknown": { - "Nrml": { "unknown": { "unknown": "81:47*" } }, - "WthAvln": { "unknown": { "unknown": "81:47*Lä" } } + "Nrml": { "unknown": { "unknown": "80:47*" } }, + "WthAvln": { "unknown": { "unknown": "80:47*Lä" } } } }, "57BlTa": { - "unknown": { "unknown": { "unknown": { "unknown": "81:48" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:48" } } } }, "57VLä": { - "unknown": { "unknown": { "unknown": { "unknown": "81:47" } } } + "unknown": { "unknown": { "unknown": { "unknown": "80:47" } } } } } } diff --git a/lib/data/sql/V3__create_types.sql b/lib/data/sql/V3__create_types.sql index 7dc64a3e..c677c893 100644 --- a/lib/data/sql/V3__create_types.sql +++ b/lib/data/sql/V3__create_types.sql @@ -231,19 +231,7 @@ VALUES ('ober- und untermontan', INSERT INTO altitudinal_zone_meta (projection, nais, code) VALUES ('hochmontan', 'HM', - '81'); - - -INSERT INTO altitudinal_zone_meta (projection, nais, code) -VALUES ('hochmontan Nebenareal der Tanne', - null, - '82'); - - -INSERT INTO altitudinal_zone_meta (projection, nais, code) -VALUES ('hochmontan Reliktareal der Tanne', - null, - '83'); + '80'); INSERT INTO altitudinal_zone_meta (projection, nais, code) @@ -444,8 +432,8 @@ WHERE naistyp_oeg_pio IN ('1', '2'); -CREATE TABLE foresttype_aspect ( foresttype_code TEXT REFERENCES foresttype_meta, - aspect TEXT); +CREATE TABLE foresttype_aspect (foresttype_code TEXT REFERENCES foresttype_meta, + aspect TEXT); INSERT INTO foresttype_aspect (foresttype_code, aspect) @@ -462,8 +450,8 @@ WHERE feld_name ILIKE 'E_%' AND split_part(feld_name, '_', 2) != ''; -CREATE TABLE foresttype_slope ( foresttype_code TEXT REFERENCES foresttype_meta, - slope TEXT); +CREATE TABLE foresttype_slope (foresttype_code TEXT REFERENCES foresttype_meta, + slope TEXT); INSERT INTO foresttype_slope (foresttype_code, slope) @@ -589,10 +577,9 @@ SELECT sisf_nr::int AS code, FROM nat_arten_mstr WHERE art_erk_zeik = '1' AND art_hs_collin = '1' -UNION -- TODO: switch to 80 once hochmontan branch has been merged! - +UNION SELECT sisf_nr::int AS code, - '81' AS altitudinal_zone_code + '80' AS altitudinal_zone_code FROM nat_arten_mstr WHERE art_erk_zeik = '1' AND art_hs_hochmont = '1' @@ -863,10 +850,9 @@ FROM (SELECT unnest(enum_range(null::treetype)) AS treetype) foo JOIN nat_arten_mstr nais ON nais.sisf_nr = foo.treetype::text WHERE art_hs_collin = '1' -UNION -- TODO: switch to 80 once hochmontan branch has been merged! - +UNION SELECT foo.treetype AS treetype_code, - '81' AS altitudinal_zone_code + '80' AS altitudinal_zone_code FROM (SELECT unnest(enum_range(null::treetype)) AS treetype) foo JOIN nat_arten_mstr nais ON nais.sisf_nr = foo.treetype::text diff --git a/lib/data/sql/V5__export_projections.sql b/lib/data/sql/V5__export_projections.sql index 7a3caa7b..ed6c63ed 100644 --- a/lib/data/sql/V5__export_projections.sql +++ b/lib/data/sql/V5__export_projections.sql @@ -46,18 +46,27 @@ FROM (SELECT (regexp_matches(regexp_split_to_table(regexp_replace(regexp_replace(coalesce(forest_ecoregions,forest_ecoregions_specific), '2(,|\s)', '2a, 2b,'), 'R 5', '5a, 5b,'),',\s?'), (SELECT string_agg(subcode, '|'::text) FROM forest_ecoregions)))[1] AS processed_forest_ecoregion, + CASE + WHEN target_altitudinal_zone ~ 'Nebenareal' THEN 'nebenareal' + WHEN target_altitudinal_zone ~ 'Hauptareal' THEN 'hauptareal' + WHEN target_altitudinal_zone ~ 'Reliktareal' THEN 'reliktareal' + ELSE processed_silver_fir_area + END as processed_silver_fir_area2, + CASE + WHEN target_altitudinal_zone ~ 'hochmontan' THEN 'hochmontan' + ELSE target_altitudinal_zone + END as processed_target_altitudinal_zone, * FROM - (SELECT lower(coalesce(trim(silver_fir_area),'unknown')), - (regexp_matches(regexp_split_to_table(regexp_replace(regexp_replace(coalesce(trim(lower(silver_fir_area)),'unknown'), 'haupt- und nebenareal', 'hauptareal,nebenareal'),'haupt- oder nebenareal', 'hauptareal,nebenareal'),',\s?') , - (SELECT string_agg(lower(areal_de)::text, '|'::text) || '|unknown' + (SELECT (regexp_matches(regexp_split_to_table(regexp_replace(regexp_replace(coalesce(trim(lower(silver_fir_area)),'nicht relevant'), 'haupt- und nebenareal', 'hauptareal,nebenareal'),'haupt- oder nebenareal', 'hauptareal,nebenareal'),',\s?') , + (SELECT string_agg(lower(areal_de)::text, '|'::text) || '|nicht relevant' FROM silver_fir_areas)))[1] AS processed_silver_fir_area, * FROM projections_import) import_silver_fir_area) import LEFT JOIN altitudinal_zone_meta ON lower(altitudinal_zone_meta.projection::text) = lower(import.altitudinal_zone) -LEFT JOIN altitudinal_zone_meta target_altitudinal_zone_meta ON lower(target_altitudinal_zone_meta.projection::text) = lower(import.target_altitudinal_zone) +LEFT JOIN altitudinal_zone_meta target_altitudinal_zone_meta ON lower(target_altitudinal_zone_meta.projection::text) = lower(import.processed_target_altitudinal_zone) LEFT JOIN additional_meta ON lower(additional_meta.source) = lower(import.additional) -LEFT JOIN silver_fir_area_meta ON lower(silver_fir_area_meta.projection) = import.processed_silver_fir_area +LEFT JOIN silver_fir_area_meta ON lower(silver_fir_area_meta.projection) = import.processed_silver_fir_area2 LEFT JOIN relief_meta ON relief_meta.source = import.relief LEFT JOIN slopes ON slopes.slope = import.slope; diff --git a/lib/data/types.json b/lib/data/types.json index 09ae65b5..ad54f7c8 100755 --- a/lib/data/types.json +++ b/lib/data/types.json @@ -9,10 +9,10 @@ { "de": "nicht relevant", "code": "unknown" } ], "relief": [ - { "de": "nicht relevant", "code": "unknown" }, { "de": "Hang- und Muldenlage", "code": "h_and_m" }, - { "de": "normal", "code": "normal" }, - { "de": "Kuppenlage", "code": "kup" } + { "de": "nicht relevant", "code": "unknown" }, + { "de": "Kuppenlage", "code": "kup" }, + { "de": "normal", "code": "normal" } ], "treeType": [ { @@ -22374,7 +22374,7 @@ ["40", "2a"], ["40", "J"], ["40", "M"], - ["81", "J"], + ["80", "J"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -25054,9 +25054,9 @@ "geomorphology": [true, false, false, false, false, false, false], "altitudinalZoneForestEcoregion": [ ["60", "J"], - ["81", "1"], - ["81", "J"], - ["81", "M"] + ["80", "1"], + ["80", "J"], + ["80", "M"] ] }, { @@ -25094,7 +25094,7 @@ "geomorphology": [true, true, true, false, true, true, true], "altitudinalZoneForestEcoregion": [ ["70", "5a"], - ["81", "5a"] + ["80", "5a"] ] }, { @@ -25128,7 +25128,7 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, true, true, false, true, true, true], "altitudinalZoneForestEcoregion": [ - ["81", "5a"], + ["80", "5a"], ["90", "4"], ["90", "5a"], ["90", "5b"] @@ -25441,11 +25441,11 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "J"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "J"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"] @@ -25501,9 +25501,9 @@ ["60", "1"], ["60", "2a"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "M"] ] }, { @@ -25540,8 +25540,8 @@ "reliefType": [true, true, false, false, true], "geomorphology": [true, false, true, false, false, false, false], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -25590,8 +25590,8 @@ "altitudinalZoneForestEcoregion": [ ["70", "5a"], ["70", "5b"], - ["81", "4"], - ["81", "5a"] + ["80", "4"], + ["80", "5a"] ] }, { @@ -25634,12 +25634,12 @@ ["60", "M"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], + ["80", "M"], ["90", "4"] ] }, @@ -25701,12 +25701,12 @@ ["60", "M"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -25768,9 +25768,9 @@ ["60", "1"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "4"], - ["81", "5a"] + ["80", "1"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -26164,7 +26164,7 @@ ["20", "5a"], ["30", "5a"], ["30", "5b"], - ["81", "4"] + ["80", "4"] ] }, { @@ -26676,7 +26676,7 @@ ["50", "2a"], ["50", "J"], ["50", "M"], - ["81", "2b"] + ["80", "2b"] ] }, { @@ -26773,10 +26773,10 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"] ] }, { @@ -26815,10 +26815,10 @@ "altitudinalZoneForestEcoregion": [ ["60", "1"], ["60", "2a"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"] ] }, { @@ -27060,8 +27060,8 @@ ["60", "M"], ["70", "5a"], ["70", "5b"], - ["81", "4"], - ["81", "5a"] + ["80", "4"], + ["80", "5a"] ] }, { @@ -27098,10 +27098,10 @@ "reliefType": [true, true, false, false, false], "geomorphology": [false, false, false, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -27692,7 +27692,7 @@ ["50", "2a"], ["50", "J"], ["50", "M"], - ["81", "2b"] + ["80", "2b"] ] }, { @@ -27827,13 +27827,13 @@ ["60", "M"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"], + ["80", "M"], ["90", "4"] ] }, @@ -27875,12 +27875,12 @@ ["60", "2a"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -27933,9 +27933,9 @@ "altitudinalZoneForestEcoregion": [ ["70", "5a"], ["70", "5b"], - ["81", "2b"], - ["81", "3"], - ["81", "4"] + ["80", "2b"], + ["80", "3"], + ["80", "4"] ] }, { @@ -29118,11 +29118,11 @@ ["60", "2a"], ["70", "5a"], ["70", "5b"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -29215,10 +29215,10 @@ "altitudinalZoneForestEcoregion": [ ["70", "5a"], ["70", "5b"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -30132,8 +30132,8 @@ ["50", "M"], ["70", "5a"], ["70", "5b"], - ["81", "4"], - ["81", "5a"] + ["80", "4"], + ["80", "5a"] ] }, { @@ -30468,10 +30468,10 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"] ] }, { @@ -30525,7 +30525,7 @@ "carbonate": [false, false], "reliefType": [true, true, true, true, false], "geomorphology": [false, false, false, false, false, false, false], - "altitudinalZoneForestEcoregion": [["81", "2b"]] + "altitudinalZoneForestEcoregion": [["80", "2b"]] }, { "de": "Heidelbeer-Ta-Fi-Wald auf Podsol", @@ -30561,12 +30561,12 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], + ["80", "M"] ] }, { @@ -30621,9 +30621,9 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"], - ["81", "4"] + ["80", "2b"], + ["80", "3"], + ["80", "4"] ] }, { @@ -30704,10 +30704,10 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"] ] }, { @@ -30761,7 +30761,7 @@ "carbonate": [false, false], "reliefType": [true, true, true, true, false], "geomorphology": [false, false, false, false, false, false, false], - "altitudinalZoneForestEcoregion": [["81", "2b"]] + "altitudinalZoneForestEcoregion": [["80", "2b"]] }, { "de": "Wollreitgras-Ta-Fi-Wald", @@ -30798,11 +30798,11 @@ "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ ["70", "5a"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -30838,7 +30838,7 @@ "carbonate": [false, false], "reliefType": [true, true, true, true, true], "geomorphology": [true, true, true, false, false, false, true], - "altitudinalZoneForestEcoregion": [["81", "4"]] + "altitudinalZoneForestEcoregion": [["80", "4"]] }, { "de": "Wollreitgras-Ta-Fi-Wald; farnreicher", @@ -30871,8 +30871,8 @@ "reliefType": [true, true, false, false, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "4"], - ["81", "5a"] + ["80", "4"], + ["80", "5a"] ] }, { @@ -30905,7 +30905,7 @@ "carbonate": [false, false], "reliefType": [true, true, false, false, true], "geomorphology": [true, true, true, false, false, false, true], - "altitudinalZoneForestEcoregion": [["81", "4"]] + "altitudinalZoneForestEcoregion": [["80", "4"]] }, { "de": "Wollreitgras-Ta-Fi-Wald mit Wachtelweizen", @@ -30941,8 +30941,8 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "4"], - ["81", "5a"] + ["80", "4"], + ["80", "5a"] ] }, { @@ -30982,12 +30982,12 @@ ["60", "2a"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -31039,9 +31039,9 @@ "geomorphology": [true, true, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ ["70", "5a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], ["90", "2b"], ["90", "4"], ["90", "5a"], @@ -31079,9 +31079,9 @@ "geomorphology": [true, true, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ ["70", "5a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], ["90", "2b"], ["90", "4"], ["90", "5a"], @@ -31130,13 +31130,13 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], - ["81", "J"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], + ["80", "J"], + ["80", "M"] ] }, { @@ -31195,10 +31195,10 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "J"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "J"], + ["80", "M"] ] }, { @@ -31253,9 +31253,9 @@ "reliefType": [true, true, false, true, false], "geomorphology": [false, false, false, false, false, false, false], "altitudinalZoneForestEcoregion": [ - ["81", "2a"], - ["81", "2b"], - ["81", "3"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -31314,9 +31314,9 @@ "reliefType": [true, true, false, true, false], "geomorphology": [false, false, false, false, false, false, false], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"] ] }, { @@ -31385,8 +31385,8 @@ "reliefType": [true, true, false, true, true], "geomorphology": [true, false, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -31419,8 +31419,8 @@ "reliefType": [true, true, false, true, true], "geomorphology": [true, false, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2b"] + ["80", "1"], + ["80", "2b"] ] }, { @@ -31453,11 +31453,11 @@ "reliefType": [true, true, false, false, true], "geomorphology": [true, false, true, false, true, false, false], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "M"] ] }, { @@ -31512,13 +31512,13 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, true, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"], - ["81", "J"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"], + ["80", "J"], + ["80", "M"] ] }, { @@ -31573,9 +31573,9 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, true, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"], - ["81", "4"] + ["80", "2b"], + ["80", "3"], + ["80", "4"] ] }, { @@ -31612,11 +31612,11 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "M"] ] }, { @@ -31671,8 +31671,8 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2a"], - ["81", "2b"] + ["80", "2a"], + ["80", "2b"] ] }, { @@ -31708,7 +31708,7 @@ "carbonate": [false, false], "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, true, false, false, true], - "altitudinalZoneForestEcoregion": [["81", "1"]] + "altitudinalZoneForestEcoregion": [["80", "1"]] }, { "de": "Labkraut-Ta-Fi-Wald mit Hasel", @@ -31740,8 +31740,8 @@ "reliefType": [true, true, false, true, true], "geomorphology": [true, false, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2a"], - ["81", "2b"] + ["80", "2a"], + ["80", "2b"] ] }, { @@ -31778,11 +31778,11 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, true, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -31837,8 +31837,8 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, true, true, true, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "4"] + ["80", "2b"], + ["80", "4"] ] }, { @@ -31875,8 +31875,8 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, true, true, false, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "4"] + ["80", "2b"], + ["80", "4"] ] }, { @@ -31973,10 +31973,10 @@ ["60", "1"], ["60", "2a"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "4"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "4"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "4"] @@ -32020,11 +32020,11 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "4"], - ["81", "J"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "4"], + ["80", "J"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"] @@ -32137,10 +32137,10 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, true, true, true, true], "altitudinalZoneForestEcoregion": [ - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"] + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"] ] }, { @@ -32194,7 +32194,7 @@ "carbonate": [false, true], "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, true, true, true, true], - "altitudinalZoneForestEcoregion": [["81", "2b"]] + "altitudinalZoneForestEcoregion": [["80", "2b"]] }, { "de": "Erika-Fichtenwald; subalpine Ausbildung", @@ -32304,8 +32304,8 @@ "reliefType": [true, true, true, true, true], "geomorphology": [false, false, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -32352,8 +32352,8 @@ "reliefType": [true, true, false, true, false], "geomorphology": [false, false, false, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -32404,9 +32404,9 @@ "reliefType": [true, true, true, true, true], "geomorphology": [false, false, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2a"], - ["81", "2b"], - ["81", "3"] + ["80", "2a"], + ["80", "2b"], + ["80", "3"] ] }, { @@ -32456,7 +32456,7 @@ "carbonate": [false, false], "reliefType": [true, true, true, true, true], "geomorphology": [false, false, true, false, false, false, true], - "altitudinalZoneForestEcoregion": [["81", "3"]] + "altitudinalZoneForestEcoregion": [["80", "3"]] }, { "de": "Schneesimsen-Fi-Wald", @@ -32484,10 +32484,10 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -32516,10 +32516,10 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"] + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -32565,7 +32565,7 @@ "carbonate": [false, false], "reliefType": [true, false, true, true, true], "geomorphology": [true, true, true, false, false, false, true], - "altitudinalZoneForestEcoregion": [["81", "2b"]] + "altitudinalZoneForestEcoregion": [["80", "2b"]] }, { "de": "Moorrand-Fichtenwald", @@ -32605,12 +32605,12 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "M"] + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "M"] ] }, { @@ -32651,14 +32651,14 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"], - ["81", "J"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"], + ["80", "J"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -32701,7 +32701,7 @@ "reliefType": [true, true, false, true, false], "geomorphology": [true, true, true, true, false, false, false], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], + ["80", "2b"], ["90", "4"], ["90", "5a"] ] @@ -32931,7 +32931,7 @@ "carbonate": [false, false], "reliefType": [false, false, false, true, false], "geomorphology": [false, false, false, false, false, false, false], - "altitudinalZoneForestEcoregion": [["81", "1"]] + "altitudinalZoneForestEcoregion": [["80", "1"]] }, { "de": "Alpenlattich-Fichtenwald mit Heidelbeere", @@ -33837,8 +33837,8 @@ "altitudinalZoneForestEcoregion": [ ["100", "2b"], ["100", "3"], - ["81", "2b"], - ["81", "3"], + ["80", "2b"], + ["80", "3"], ["90", "2b"], ["90", "3"] ] @@ -34170,7 +34170,7 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, false, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "3"], + ["80", "3"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -34213,10 +34213,10 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, false, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -34275,10 +34275,10 @@ "reliefType": [true, true, true, true, true], "geomorphology": [true, false, true, false, true, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "M"], ["90", "1"], ["90", "2a"] ] @@ -34455,8 +34455,8 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -34504,8 +34504,8 @@ "geomorphology": [true, false, true, false, true, false, true], "altitudinalZoneForestEcoregion": [ ["20", "2b"], - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -34569,8 +34569,8 @@ ["40", "1"], ["40", "2a"], ["40", "M"], - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -34701,12 +34701,12 @@ ["100", "5a"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "5a"], - ["81", "J"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "5a"], + ["80", "J"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -34787,9 +34787,9 @@ ["60", "M"], ["70", "5a"], ["70", "5b"], - ["81", "2b"], - ["81", "4"], - ["81", "5a"] + ["80", "2b"], + ["80", "4"], + ["80", "5a"] ] }, { @@ -34844,8 +34844,8 @@ "reliefType": [true, false, true, true, true], "geomorphology": [true, false, true, false, false, false, true], "altitudinalZoneForestEcoregion": [ - ["81", "2b"], - ["81", "3"] + ["80", "2b"], + ["80", "3"] ] }, { @@ -34906,11 +34906,11 @@ ["100", "3"], ["100", "4"], ["100", "5a"], - ["81", "1"], - ["81", "2a"], - ["81", "5a"], - ["81", "J"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "5a"], + ["80", "J"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -34981,12 +34981,12 @@ ["60", "2a"], ["60", "J"], ["60", "M"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -39151,13 +39151,13 @@ ["100", "5a"], ["70", "5a"], ["70", "5b"], - ["81", "1"], - ["81", "2a"], - ["81", "2b"], - ["81", "3"], - ["81", "4"], - ["81", "5a"], - ["81", "M"], + ["80", "1"], + ["80", "2a"], + ["80", "2b"], + ["80", "3"], + ["80", "4"], + ["80", "5a"], + ["80", "M"], ["90", "1"], ["90", "2a"], ["90", "2b"], @@ -39561,11 +39561,9 @@ { "de": "untermontan", "id": 6, "code": "50" }, { "de": "obermontan", "id": 7, "code": "60" }, { "de": "ober- und untermontan", "id": 8, "code": "70" }, - { "de": "hochmontan", "id": 9, "code": "81" }, - { "de": "hochmontan Nebenareal der Tanne", "id": 10, "code": "82" }, - { "de": "hochmontan Reliktareal der Tanne", "id": 11, "code": "83" }, - { "de": "subalpin", "id": 12, "code": "90" }, - { "de": "obersubalpin", "id": 13, "code": "100" } + { "de": "hochmontan", "id": 9, "code": "80" }, + { "de": "subalpin", "id": 10, "code": "90" }, + { "de": "obersubalpin", "id": 11, "code": "100" } ], "forestEcoregion": [ { "de": "Nördliche Randalpen", "code": "1" }, diff --git a/lib/src/project.js b/lib/src/project.js index 2388b936..abbf08af 100644 --- a/lib/src/project.js +++ b/lib/src/project.js @@ -107,8 +107,9 @@ function project(location = {}, targetAltitude, previousResult) { const { transitionForestType, transitionAltitudinalZone, ...tl } = location; tl.forestType = transitionForestType; tl.altitudinalZone = transitionAltitudinalZone; - const { options, projections: tp } = project(tl, targetAltitude); - Object.entries(options).forEach(([k, v]) => { + const transition = project(tl, targetAltitude); + const tp = transition.projections || []; + Object.entries(transition.options).forEach(([k, v]) => { if (fieldsConcat.includes(k)) { result.options[k] = concat(result.options[k], v); } @@ -126,6 +127,10 @@ function project(location = {}, targetAltitude, previousResult) { .map((ft) => ft.code); } + if (!previousResult && result.projections.length === 0) { + delete result.projections; + } + return result; } diff --git a/lib/test/project.fixtures.json b/lib/test/project.fixtures.json index 96be1e14..f97a7a0b 100644 --- a/lib/test/project.fixtures.json +++ b/lib/test/project.fixtures.json @@ -6,7 +6,7 @@ "forestType": "47*" }, "projections": [ - { "altitudinalZone": "81", "forestType": "48" }, + { "altitudinalZone": "80", "forestType": "48" }, { "altitudinalZone": "20", "forestType": "48 collin" } ] }, @@ -18,7 +18,7 @@ "additional": "Shdy_Cl" }, "projections": [ - { "altitudinalZone": "81", "forestType": "48" }, + { "altitudinalZone": "80", "forestType": "48" }, { "altitudinalZone": "60", "forestType": "48" }, { "altitudinalZone": "50", "forestType": "22" }, { "altitudinalZone": "40", "forestType": "22" }, @@ -28,7 +28,7 @@ { "location": { "forestEcoregion": "1", - "altitudinalZone": "81", + "altitudinalZone": "80", "forestType": "51C", "relief": "kup" }, diff --git a/lib/test/project.test.js b/lib/test/project.test.js index cb202527..94a54ab8 100644 --- a/lib/test/project.test.js +++ b/lib/test/project.test.js @@ -2,7 +2,7 @@ const { project } = require('../src'); const fixtures = require('./project.fixtures.json'); describe('invalid function parameters', () => { - const validLocation = { forestEcoregion: '1', altitudinalZone: '81' }; + const validLocation = { forestEcoregion: '1', altitudinalZone: '80' }; test('invalid location values', () => { expect(() => project({ ...validLocation, forestEcoregion: 'fooBar' }), @@ -59,7 +59,7 @@ describe('valid options', () => { forestEcoregion: '1', forestType: '59V', }).options.altitudinalZone, - ).toStrictEqual(['20', '40', '50', '60', '81', '90', '100']); + ).toStrictEqual(['20', '40', '50', '60', '80', '90', '100']); }); test('valid list for targetAltitudinalZone', () => { @@ -99,7 +99,7 @@ describe('valid options', () => { forestType: '19f', transitionForestType: '46', altitudinalZone: '60', - transitionAltitudinalZone: '81', + transitionAltitudinalZone: '80', }).options.slope, ).toStrictEqual(['unknown', '<20', '>20']); }); @@ -151,9 +151,9 @@ describe('valid projections', () => { altitudinalZone: '90', forestType: '60*', }, - '81', + '80', ).projections, - ).toStrictEqual([{ altitudinalZone: '81', forestType: '50*' }]); + ).toStrictEqual([{ altitudinalZone: '80', forestType: '50*' }]); }); test('projection with valid transitionForestType', () => { @@ -164,7 +164,7 @@ describe('valid projections', () => { forestType: '19f', transitionForestType: '46', altitudinalZone: '60', - transitionAltitudinalZone: '81', + transitionAltitudinalZone: '80', slope: '<20', }, '50', @@ -184,7 +184,7 @@ describe('valid projections', () => { forestType: '19f', transitionForestType: '46', altitudinalZone: '60', - transitionAltitudinalZone: '81', + transitionAltitudinalZone: '80', }, '50', ).projections[0], @@ -203,7 +203,7 @@ describe('valid projections', () => { forestType: '19f', transitionForestType: '46', altitudinalZone: '60', - transitionAltitudinalZone: '81', + transitionAltitudinalZone: '80', slope: '<20', }, '40', @@ -225,7 +225,7 @@ describe('valid projections', () => { }, '50', ).projections, - ).toStrictEqual([]); + ).toStrictEqual(undefined); }); test('multi altitudinal zone projection', () => { @@ -236,9 +236,9 @@ describe('valid projections', () => { altitudinalZone: '100', forestType: '59V', }, - '81', + '80', ).projections.slice(-1)[0], - ).toStrictEqual({ altitudinalZone: '81', forestType: '46MRe' }); + ).toStrictEqual({ altitudinalZone: '80', forestType: '46MRe' }); }); test('projection skipping altitudinalZone 30 which is not available in forestEcoregion M', () => { @@ -254,19 +254,18 @@ describe('valid projections', () => { ).toStrictEqual([{ altitudinalZone: '20', forestType: '7S collin' }]); }); - // Disabled for now until target altitudinalZone "hochmontan Tannenareale" has been fixed in source data. - // test('projection skipping altitudinalZones which are not available in forestEcoregion 2b', () => { - // expect( - // project( - // { - // forestEcoregion: '2b', - // altitudinalZone: '83', - // forestType: '55*', - // }, - // '20', - // ).projections.slice(-1)[0], - // ).toStrictEqual({ altitudinalZone: '20', forestType: '55* collin' }); - // }); + test('projection skipping altitudinalZones which are not available in forestEcoregion 2b', () => { + expect( + project( + { + forestEcoregion: '2b', + altitudinalZone: '90', + forestType: '55*', + }, + '20', + ).projections.slice(-1)[0], + ).toStrictEqual({ altitudinalZone: '20', forestType: '55* collin' }); + }); test('empty projections if targetAltitudinalZone is not found', () => { expect( @@ -278,7 +277,7 @@ describe('valid projections', () => { }, '30', ).projections, - ).toStrictEqual([]); + ).toStrictEqual(undefined); }); test('projections based on fixtures', () => { diff --git a/package.json b/package.json index d263a7be..d36a3d6a 100644 --- a/package.json +++ b/package.json @@ -101,8 +101,7 @@ "lint-staged": { "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [ "eslint src --fix", - "prettier --write 'src/**/*.js'", - "react-scripts test --transformIgnorePatterns \"node_modules/(?!ol|@geops/tree-lib)/\" --bail --findRelatedTests --watchAll=false" + "prettier --write 'src/**/*.js'" ] }, "prettier": { diff --git a/src/components/ProjectionForm.js b/src/components/ProjectionForm.js index e6451935..6c4472f8 100644 --- a/src/components/ProjectionForm.js +++ b/src/components/ProjectionForm.js @@ -30,7 +30,7 @@ function ProjectionForm() { mapLocation, formLocation, projectionMode, - projectionResult: { options }, + projectionResult, } = useSelector((state) => ({ location: state.location, mapLocation: state.mapLocation, @@ -38,6 +38,11 @@ function ProjectionForm() { projectionMode: state.projectionMode, projectionResult: state.projectionResult, })); + const options = + projectionMode === 'm' + ? projectionResult.extreme.options + : projectionResult.form.options; + const [fieldActive, setFieldActive] = useState(''); const activateField = (field) => setFieldActive(field); const deactivateField = () => setFieldActive(''); diff --git a/src/components/ProjectionResult.js b/src/components/ProjectionResult.js index d1ebd319..b37f0478 100644 --- a/src/components/ProjectionResult.js +++ b/src/components/ProjectionResult.js @@ -5,6 +5,7 @@ import { Header, Menu, Tab } from 'semantic-ui-react'; // eslint-disable-next-line import/no-unresolved import { info } from 'lib/src'; +import { hochmontanAltitudinalZones } from '../store/enhancers/projection'; import ProjectionTab from './ProjectionTab'; import Recommendation from './Recommendation'; import styles from './ProjectionResult.module.css'; @@ -13,31 +14,70 @@ import { ReactComponent as EarthExtremeIcon } from '../icons/earthExtreme.svg'; import { ReactComponent as EarthModerateIcon } from '../icons/earthModerate.svg'; import { ReactComponent as EarthTodayIcon } from '../icons/earthToday.svg'; +function getAZ(altitudinalZone) { + if (hochmontanAltitudinalZones.includes(altitudinalZone)) { + return '80'; + } + return altitudinalZone; +} + +function getPane(scenario, projection, language, t) { + const icons = []; + const scenarios = []; + const { forestType, transitionForestType } = projection; + const altitudinalZone = getAZ(projection.altitudinalZone); + if (scenario.toLowerCase().includes('today')) { + icons.push(); + scenarios.push(t('projectionScenario.today')); + } + if (scenario.toLowerCase().includes('form')) { + scenarios.push(t('projectionScenario.manual')); + } + if (scenario.toLowerCase().includes('moderateextreme')) { + icons.push(); + icons.push(); + scenarios.push(t('projectionScenario.moderateExtreme')); + } else if (scenario.toLowerCase().includes('moderate')) { + icons.push(); + scenarios.push(t('projectionScenario.moderate')); + } else if (scenario.toLowerCase().includes('extreme')) { + icons.push(); + scenarios.push(t('projectionScenario.extreme')); + } + + return ( + forestType && { + menuItem: ( + + {icons} +
+
+ {transitionForestType + ? ` ${forestType} (${transitionForestType}) ` + : ` ${forestType} `} + + {info('altitudinalZone', altitudinalZone)[language]} + +
+
{scenarios.join(', ')}
+
+ + ), + render: () => , + } + ); +} + function ProjectionResult() { - const { - location, - options, - projectionMode, - projections, - targetAltitudinalZone, - } = useSelector((state) => ({ - projectionMode: state.projectionMode, - location: state.location, - options: state.projectionResult.options, - projections: [...state.projectionResult.projections], - targetAltitudinalZone: state.targetAltitudinalZone, - })); + const { location, projectionMode, projectionResult } = useSelector( + (state) => ({ + location: state.location, + projectionMode: state.projectionMode, + projectionResult: state.projectionResult, + }), + ); const { i18n, t } = useTranslation(); - const { altitudinalZone, forestType } = location; - if ( - altitudinalZone && - (altitudinalZone === targetAltitudinalZone || - projections.findIndex((p) => p.altitudinalZone === altitudinalZone) === - -1) - ) { - projections.unshift(location); - } const panes = []; panes.push({ @@ -45,66 +85,42 @@ function ProjectionResult() { render: () => , }); - projections.forEach((p) => { - const icons = []; - const scenarios = []; - if (projectionMode === 'f') { - if (location.altitudinalZone === p.altitudinalZone) { - icons.push(); - scenarios.push(t('projectionScenario.today')); + if (projectionMode === 'f' && projectionResult.form.projections) { + const form = projectionResult.form.projections.slice(-1)[0] || {}; + panes.push(getPane('today', location, i18n.language, t)); + panes.push(getPane('form', form, i18n.language, t)); + } else if ( + projectionResult.moderate.projections || + projectionResult.extreme.projections + ) { + const TAZToday = getAZ(location.altitudinalZone); + const TAZModerate = getAZ(location.targetAltitudinalZoneModerate); + const TAZExtreme = getAZ(location.targetAltitudinalZoneExtreme); + const moderate = projectionResult.moderate.projections.slice(-1)[0] || {}; + const extreme = projectionResult.extreme.projections.slice(-1)[0] || {}; + if (TAZModerate === TAZExtreme) { + if (TAZToday === TAZModerate) { + panes.push(getPane('todayModerateExtreme', location, i18n.language, t)); } else { - scenarios.push(t('projectionScenario.manual')); + panes.push(getPane('today', location, i18n.language, t)); + panes.push(getPane('moderateExtreme', moderate, i18n.language, t)); } + } else if (TAZToday === TAZModerate) { + panes.push(getPane('todayModerate', location, i18n.language, t)); + panes.push(getPane('extreme', extreme, i18n.language, t)); + } else if (TAZToday === TAZExtreme) { + panes.push(getPane('moderate', moderate, i18n.language, t)); + panes.push(getPane('todayExtreme', location, i18n.language, t)); } else { - if (location.altitudinalZone === p.altitudinalZone) { - icons.push(); - scenarios.push(t('projectionScenario.today')); - } - - if ( - location.targetAltitudinalZoneModerate === p.altitudinalZone && - location.targetAltitudinalZoneExtreme === p.altitudinalZone - ) { - icons.push(); - icons.push(); - scenarios.push(t('projectionScenario.moderateExtreme')); - } else if (location.targetAltitudinalZoneModerate === p.altitudinalZone) { - icons.push(); - scenarios.push(t('projectionScenario.moderate')); - } else if (location.targetAltitudinalZoneExtreme === p.altitudinalZone) { - icons.push(); - scenarios.push(t('projectionScenario.extreme')); - } - } - if (scenarios.length > 0) { - panes.push({ - menuItem: ( - - {icons} -
-
- {p.transitionForestType - ? ` ${p.forestType} (${p.transitionForestType}) ` - : ` ${p.forestType} `} - - {info('altitudinalZone', p.altitudinalZone)[i18n.language]} - -
-
{scenarios.join(', ')}
-
- - ), - render: () => , - }); + panes.push(getPane('today', location, i18n.language, t)); + panes.push(getPane('moderate', moderate, i18n.language, t)); + panes.push(getPane('extreme', extreme, i18n.language, t)); } - }); + } - return forestType && - options.forestType && - options.forestType.includes(forestType) && - (location.coordinate || targetAltitudinalZone) ? ( + return altitudinalZone && forestType ? (
- {panes.length > 0 ? ( + {panes.filter((p) => p).length > 1 ? ( ({ - location: state.location, - projections: state.projectionResult.projections, - })); + const { location, projectionMode, projectionResult } = useSelector( + (state) => ({ + location: state.location, + projectionMode: state.projectionMode, + projectionResult: state.projectionResult, + }), + ); const recommendations = useMemo(() => { + let projections; let result; + + if (projectionMode === 'f') { + projections = projectionResult.form.projections; + } else { + const { moderate, extreme } = projectionResult; + projections = [...moderate.projections, ...extreme.projections]; + } + try { if (projections && projections.length === 0) { result = recommend(location, [location], future); @@ -34,7 +46,7 @@ function Recommendation() { console.log('Recommendation error: ', error); } return result; - }, [location, projections, future]); + }, [location, projectionMode, projectionResult, future]); return ( diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js index 94cabfe9..8420fe36 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -10,7 +10,6 @@ import { setLocation, setLocationResult, setProjectionResult, - setTargetAltitudinalZone, } from '../actions'; const projectionActionTypes = [ @@ -19,6 +18,32 @@ const projectionActionTypes = [ SET_PROJECTION_MODE, ]; +export const hochmontanAltitudinalZones = ['81', '82', '83']; + +const runProject = (location, targetAltitudinalZone) => { + let newTargetAltitudinalZone = targetAltitudinalZone; + let { altitudinalZone, silverFirArea } = location; + if (hochmontanAltitudinalZones.includes(targetAltitudinalZone)) { + silverFirArea = targetAltitudinalZone.slice(1); + newTargetAltitudinalZone = '80'; + } + if (hochmontanAltitudinalZones.includes(altitudinalZone)) { + altitudinalZone = '80'; + } + const newLocation = { ...location, altitudinalZone, silverFirArea }; + return project(newLocation, newTargetAltitudinalZone); +}; + +const runLocate = (location) => { + let { altitudinalZone, silverFirArea } = location; + if (hochmontanAltitudinalZones.includes(altitudinalZone)) { + silverFirArea = altitudinalZone.slice(1); + altitudinalZone = '80'; + } + const newLocation = { ...location, altitudinalZone, silverFirArea }; + return locate(newLocation); +}; + const projection = (store) => (next) => (action) => { const result = next(action); if (projectionActionTypes.includes(action.type)) { @@ -32,20 +57,27 @@ const projection = (store) => (next) => (action) => { delete location.transitionAltitudinalZone; } store.dispatch(setLocation(location)); - const targetAltitudinalZone = - projectionMode === 'm' - ? mapLocation.targetAltitudinalZoneExtreme - : formLocation.targetAltitudinalZone; - store.dispatch(setTargetAltitudinalZone(targetAltitudinalZone)); + try { - const locationResult = locate(location); - console.log(locationResult, location); - store.dispatch(setLocationResult(locationResult)); + const locateResult = runLocate(location); + store.dispatch(setLocationResult(locateResult)); } catch (error) { console.log('Locate error: ', error); } + try { - const projectionResult = project(location, targetAltitudinalZone); + const projectionResult = { extreme: {}, moderate: {}, form: {} }; + if (projectionMode === 'm') { + const { + targetAltitudinalZoneModerate: targetAZModerate, + targetAltitudinalZoneExtreme: targetAZExtreme, + } = mapLocation; + projectionResult.moderate = runProject(location, targetAZModerate); + projectionResult.extreme = runProject(location, targetAZExtreme); + } else { + const { targetAltitudinalZone: targetAZForm } = formLocation; + projectionResult.form = runProject(location, targetAZForm); + } store.dispatch(setProjectionResult(projectionResult)); } catch (error) { console.log('Projection error: ', error); diff --git a/src/store/reducers.js b/src/store/reducers.js index 1e7bcf52..1cd1e70c 100644 --- a/src/store/reducers.js +++ b/src/store/reducers.js @@ -11,6 +11,7 @@ import { SET_WELCOME_MODAL, } from './actions'; +const initialProjection = { options: {}, projections: [] }; export const initialState = { location: {}, formLocation: {}, @@ -20,7 +21,11 @@ export const initialState = { mapView: '9|910001|5947112', projectionMode: 'm', projectionOptions: {}, - projectionResult: { options: {}, projections: [] }, + projectionResult: { + moderate: initialProjection, + extreme: initialProjection, + form: initialProjection, + }, targetAltitudinalZone: null, welcomeModalOpen: localStorage.getItem('tree.welcomeModal') !== 'close', }; diff --git a/yarn.lock b/yarn.lock index 4f164b8c..c931d58c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,16 +9,7 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/compat-data@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35" - integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q== - dependencies: - browserslist "^4.8.5" - invariant "^2.2.4" - semver "^5.5.0" - -"@babel/compat-data@^7.9.0": +"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c" integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g== @@ -27,7 +18,7 @@ invariant "^2.2.4" semver "^5.5.0" -"@babel/core@7.9.0": +"@babel/core@7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== @@ -49,43 +40,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.4.5": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.6.tgz#27d7df9258a45c2e686b6f18b6c659e563aa4636" - integrity sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" - "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.6" - "@babel/template" "^7.8.6" - "@babel/traverse" "^7.8.6" - "@babel/types" "^7.8.6" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.0" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/generator@^7.4.0", "@babel/generator@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a" - integrity sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg== +"@babel/generator@^7.4.0", "@babel/generator@^7.9.0", "@babel/generator@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9" + integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ== dependencies: - "@babel/types" "^7.8.6" - jsesc "^2.5.1" - lodash "^4.17.13" - source-map "^0.5.0" - -"@babel/generator@^7.9.0": - version "7.9.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.3.tgz#7c8b2956c6f68b3ab732bd16305916fbba521d94" - integrity sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ== - dependencies: - "@babel/types" "^7.9.0" + "@babel/types" "^7.9.5" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -106,21 +66,13 @@ "@babel/types" "^7.8.3" "@babel/helper-builder-react-jsx-experimental@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz#066d80262ade488f9c1b1823ce5db88a4cedaa43" - integrity sha512-3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ== + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3" + integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-module-imports" "^7.8.3" - "@babel/types" "^7.9.0" - -"@babel/helper-builder-react-jsx@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6" - integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ== - dependencies: - "@babel/types" "^7.8.3" - esutils "^2.0.0" + "@babel/types" "^7.9.5" "@babel/helper-builder-react-jsx@^7.9.0": version "7.9.0" @@ -130,26 +82,6 @@ "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/types" "^7.9.0" -"@babel/helper-call-delegate@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692" - integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A== - dependencies: - "@babel/helper-hoist-variables" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" - -"@babel/helper-compilation-targets@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz#015b85db69e3a34240d5c2b761fc53eb9695f09c" - integrity sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ== - dependencies: - "@babel/compat-data" "^7.8.6" - browserslist "^4.8.5" - invariant "^2.2.4" - levenary "^1.1.1" - semver "^5.5.0" - "@babel/helper-compilation-targets@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde" @@ -162,27 +94,18 @@ semver "^5.5.0" "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0" - integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg== + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea" + integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA== dependencies: - "@babel/helper-function-name" "^7.8.3" + "@babel/helper-function-name" "^7.9.5" "@babel/helper-member-expression-to-functions" "^7.8.3" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-split-export-declaration" "^7.8.3" -"@babel/helper-create-regexp-features-plugin@^7.8.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz#7fa040c97fb8aebe1247a5c645330c32d083066b" - integrity sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.8.3" - "@babel/helper-regex" "^7.8.3" - regexpu-core "^4.6.0" - -"@babel/helper-create-regexp-features-plugin@^7.8.8": +"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087" integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg== @@ -208,14 +131,14 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-function-name@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" - integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA== +"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" + integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw== dependencies: "@babel/helper-get-function-arity" "^7.8.3" "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/types" "^7.9.5" "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" @@ -245,19 +168,6 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-module-transforms@^7.8.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz#6a13b5eecadc35692047073a64e42977b97654a4" - integrity sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg== - dependencies: - "@babel/helper-module-imports" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.6" - "@babel/helper-simple-access" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/template" "^7.8.6" - "@babel/types" "^7.8.6" - lodash "^4.17.13" - "@babel/helper-module-transforms@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" @@ -326,10 +236,10 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-validator-identifier@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" - integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== +"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" + integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g== "@babel/helper-wrap-function@^7.8.3": version "7.8.3" @@ -341,15 +251,6 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helpers@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" - integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w== - dependencies: - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" - "@babel/helpers@^7.9.0": version "7.9.2" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" @@ -360,23 +261,18 @@ "@babel/types" "^7.9.0" "@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" + integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ== dependencies: + "@babel/helper-validator-identifier" "^7.9.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c" - integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g== - -"@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.9.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.3.tgz#043a5fc2ad8b7ea9facddc4e802a1f0f25da7255" - integrity sha512-E6SpIDJZ0cZAKoCNk+qSDd0ChfTnpiJN9FfNf3RZ20dzwA2vL2oq5IX1XTVT+4vDmRlta2nGk5HGMMskJAR+4A== +"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" + integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" @@ -436,21 +332,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb" - integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - -"@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz#a28993699fc13df165995362693962ba6b061d6f" - integrity sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow== +"@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116" + integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.8.3" @@ -468,15 +357,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543" - integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" - -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": +"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d" integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A== @@ -484,14 +365,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.8" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-proposal-unicode-property-regex@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f" - integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -614,28 +487,14 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d" - integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg== +"@babel/plugin-transform-classes@^7.9.0", "@babel/plugin-transform-classes@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c" + integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg== dependencies: "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-define-map" "^7.8.3" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-optimise-call-expression" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.6" - "@babel/helper-split-export-declaration" "^7.8.3" - globals "^11.1.0" - -"@babel/plugin-transform-classes@^7.9.0": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz#8603fc3cc449e31fdbdbc257f67717536a11af8d" - integrity sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.8.3" - "@babel/helper-define-map" "^7.8.3" - "@babel/helper-function-name" "^7.8.3" + "@babel/helper-function-name" "^7.9.5" "@babel/helper-optimise-call-expression" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.6" @@ -649,10 +508,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-destructuring@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b" - integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ== +"@babel/plugin-transform-destructuring@^7.8.3", "@babel/plugin-transform-destructuring@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50" + integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q== dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -687,13 +546,6 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow" "^7.8.3" -"@babel/plugin-transform-for-of@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085" - integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-transform-for-of@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e" @@ -723,15 +575,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-modules-amd@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5" - integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ== - dependencies: - "@babel/helper-module-transforms" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - babel-plugin-dynamic-import-node "^2.3.0" - "@babel/plugin-transform-modules-amd@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4" @@ -741,16 +584,6 @@ "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5" - integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg== - dependencies: - "@babel/helper-module-transforms" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/helper-simple-access" "^7.8.3" - babel-plugin-dynamic-import-node "^2.3.0" - "@babel/plugin-transform-modules-commonjs@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940" @@ -761,16 +594,6 @@ "@babel/helper-simple-access" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420" - integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg== - dependencies: - "@babel/helper-hoist-variables" "^7.8.3" - "@babel/helper-module-transforms" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - babel-plugin-dynamic-import-node "^2.3.0" - "@babel/plugin-transform-modules-systemjs@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90" @@ -781,14 +604,6 @@ "@babel/helper-plugin-utils" "^7.8.3" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a" - integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw== - dependencies: - "@babel/helper-module-transforms" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-transform-modules-umd@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697" @@ -819,19 +634,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/helper-replace-supers" "^7.8.3" -"@babel/plugin-transform-parameters@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3" - integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA== - dependencies: - "@babel/helper-call-delegate" "^7.8.3" - "@babel/helper-get-function-arity" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-transform-parameters@^7.8.7": - version "7.9.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz#3028d0cc20ddc733166c6e9c8534559cee09f54a" - integrity sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg== +"@babel/plugin-transform-parameters@^7.8.7", "@babel/plugin-transform-parameters@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795" + integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA== dependencies: "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -844,11 +650,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-react-constant-elements@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz#784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc" - integrity sha512-glrzN2U+egwRfkNFtL34xIBYTxbbUF2qJTP8HD3qETBBqzAWSeNB821X0GjU06+dNpq/UyCIjI72FmGE5NNkQQ== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz#a75abc936a3819edec42d3386d9f1c93f28d9d9e" + integrity sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw== dependencies: - "@babel/helper-annotate-as-pure" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-react-display-name@7.8.3", "@babel/plugin-transform-react-display-name@^7.8.3": @@ -867,14 +672,6 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-jsx" "^7.8.3" -"@babel/plugin-transform-react-jsx-self@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702" - integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-jsx" "^7.8.3" - "@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b" @@ -883,14 +680,6 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-jsx" "^7.8.3" -"@babel/plugin-transform-react-jsx-source@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0" - integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-jsx" "^7.8.3" - "@babel/plugin-transform-react-jsx-source@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0" @@ -899,32 +688,16 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-jsx" "^7.8.3" -"@babel/plugin-transform-react-jsx@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a" - integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g== - dependencies: - "@babel/helper-builder-react-jsx" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-jsx" "^7.8.3" - -"@babel/plugin-transform-react-jsx@^7.9.1": - version "7.9.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz#d03af29396a6dc51bfa24eefd8005a9fd381152a" - integrity sha512-+xIZ6fPoix7h57CNO/ZeYADchg1tFyX9NDsnmNFFua8e1JNPln156mzS+8AQe1On2X2GLlANHJWHIXbMCqWDkQ== +"@babel/plugin-transform-react-jsx@^7.9.1", "@babel/plugin-transform-react-jsx@^7.9.4": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f" + integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw== dependencies: "@babel/helper-builder-react-jsx" "^7.9.0" "@babel/helper-builder-react-jsx-experimental" "^7.9.0" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-jsx" "^7.8.3" -"@babel/plugin-transform-regenerator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8" - integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA== - dependencies: - regenerator-transform "^0.14.0" - "@babel/plugin-transform-regenerator@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8" @@ -987,9 +760,9 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-typescript@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz#8b52649c81cb7dee117f760952ab46675a258836" - integrity sha512-GRffJyCu16H3tEhbt9Q4buVFFBqrgS8FzTuhqSxlXNgmqD8aw2xmwtRwrvWXXlw7gHs664uqacsJymHJ9SUE/Q== + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359" + integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w== dependencies: "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -1070,26 +843,28 @@ semver "^5.5.0" "@babel/preset-env@^7.4.5": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.6.tgz#2a0773b08589ecba4995fc71b1965e4f531af40b" - integrity sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg== + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f" + integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ== dependencies: - "@babel/compat-data" "^7.8.6" - "@babel/helper-compilation-targets" "^7.8.6" + "@babel/compat-data" "^7.9.0" + "@babel/helper-compilation-targets" "^7.8.7" "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-proposal-async-generator-functions" "^7.8.3" "@babel/plugin-proposal-dynamic-import" "^7.8.3" "@babel/plugin-proposal-json-strings" "^7.8.3" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-proposal-object-rest-spread" "^7.8.3" + "@babel/plugin-proposal-numeric-separator" "^7.8.3" + "@babel/plugin-proposal-object-rest-spread" "^7.9.5" "@babel/plugin-proposal-optional-catch-binding" "^7.8.3" - "@babel/plugin-proposal-optional-chaining" "^7.8.3" + "@babel/plugin-proposal-optional-chaining" "^7.9.0" "@babel/plugin-proposal-unicode-property-regex" "^7.8.3" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-syntax-json-strings" "^7.8.0" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.8.0" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" @@ -1098,26 +873,26 @@ "@babel/plugin-transform-async-to-generator" "^7.8.3" "@babel/plugin-transform-block-scoped-functions" "^7.8.3" "@babel/plugin-transform-block-scoping" "^7.8.3" - "@babel/plugin-transform-classes" "^7.8.6" + "@babel/plugin-transform-classes" "^7.9.5" "@babel/plugin-transform-computed-properties" "^7.8.3" - "@babel/plugin-transform-destructuring" "^7.8.3" + "@babel/plugin-transform-destructuring" "^7.9.5" "@babel/plugin-transform-dotall-regex" "^7.8.3" "@babel/plugin-transform-duplicate-keys" "^7.8.3" "@babel/plugin-transform-exponentiation-operator" "^7.8.3" - "@babel/plugin-transform-for-of" "^7.8.6" + "@babel/plugin-transform-for-of" "^7.9.0" "@babel/plugin-transform-function-name" "^7.8.3" "@babel/plugin-transform-literals" "^7.8.3" "@babel/plugin-transform-member-expression-literals" "^7.8.3" - "@babel/plugin-transform-modules-amd" "^7.8.3" - "@babel/plugin-transform-modules-commonjs" "^7.8.3" - "@babel/plugin-transform-modules-systemjs" "^7.8.3" - "@babel/plugin-transform-modules-umd" "^7.8.3" + "@babel/plugin-transform-modules-amd" "^7.9.0" + "@babel/plugin-transform-modules-commonjs" "^7.9.0" + "@babel/plugin-transform-modules-systemjs" "^7.9.0" + "@babel/plugin-transform-modules-umd" "^7.9.0" "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3" "@babel/plugin-transform-new-target" "^7.8.3" "@babel/plugin-transform-object-super" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.8.4" + "@babel/plugin-transform-parameters" "^7.9.5" "@babel/plugin-transform-property-literals" "^7.8.3" - "@babel/plugin-transform-regenerator" "^7.8.3" + "@babel/plugin-transform-regenerator" "^7.8.7" "@babel/plugin-transform-reserved-words" "^7.8.3" "@babel/plugin-transform-shorthand-properties" "^7.8.3" "@babel/plugin-transform-spread" "^7.8.3" @@ -1125,8 +900,9 @@ "@babel/plugin-transform-template-literals" "^7.8.3" "@babel/plugin-transform-typeof-symbol" "^7.8.4" "@babel/plugin-transform-unicode-regex" "^7.8.3" - "@babel/types" "^7.8.6" - browserslist "^4.8.5" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.9.5" + browserslist "^4.9.1" core-js-compat "^3.6.2" invariant "^2.2.2" levenary "^1.1.1" @@ -1156,15 +932,16 @@ "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-react@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2" - integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ== + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d" + integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-react-display-name" "^7.8.3" - "@babel/plugin-transform-react-jsx" "^7.8.3" - "@babel/plugin-transform-react-jsx-self" "^7.8.3" - "@babel/plugin-transform-react-jsx-source" "^7.8.3" + "@babel/plugin-transform-react-jsx" "^7.9.4" + "@babel/plugin-transform-react-jsx-development" "^7.9.0" + "@babel/plugin-transform-react-jsx-self" "^7.9.0" + "@babel/plugin-transform-react-jsx-source" "^7.9.0" "@babel/preset-typescript@7.9.0": version "7.9.0" @@ -1175,9 +952,9 @@ "@babel/plugin-transform-typescript" "^7.9.0" "@babel/runtime-corejs3@^7.8.3": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c" - integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q== + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7" + integrity sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" @@ -1189,14 +966,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" - integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.9.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06" integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q== @@ -1212,51 +982,27 @@ "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" - integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2" + integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" - -"@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" - integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.9.0" - "@babel/helper-function-name" "^7.8.3" + "@babel/generator" "^7.9.5" + "@babel/helper-function-name" "^7.9.5" "@babel/helper-split-export-declaration" "^7.8.3" "@babel/parser" "^7.9.0" - "@babel/types" "^7.9.0" + "@babel/types" "^7.9.5" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" - integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== - dependencies: - esutils "^2.0.2" - lodash "^4.17.13" - to-fast-properties "^2.0.0" - -"@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" - integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" + integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg== dependencies: - "@babel/helper-validator-identifier" "^7.9.0" + "@babel/helper-validator-identifier" "^7.9.5" lodash "^4.17.13" to-fast-properties "^2.0.0" @@ -1531,13 +1277,13 @@ wgs84 "0.0.0" "@mapbox/geojson-rewind@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.4.0.tgz#0d3632d4c1b4a928cf10a06ade387e1c8a8c181b" - integrity sha512-b+1uPWBERW4Pet/969BNu61ZPDyH2ilIxBjJDFzxyS9TyszF9UrTQyYIl/G38clux3rtpAGGFSGTCSF/qR6UjA== + version "0.4.1" + resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.4.1.tgz#357d79300adb7fec7c1f091512988bca6458f068" + integrity sha512-mxo2MEr7izA1uOXcDsw99Kgg6xW3P4H2j4n1lmldsgviIelpssvP+jQDivFKOHrOVJDpTTi5oZJvRcHtU9Uufw== dependencies: "@mapbox/geojson-area" "0.2.2" concat-stream "~1.6.0" - minimist "1.2.0" + minimist "^1.2.5" sharkdown "^0.1.0" "@mapbox/geojson-types@^1.0.2": @@ -1731,9 +1477,9 @@ loader-utils "^1.2.3" "@types/babel__core@^7.1.0": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610" - integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg== + version "7.1.7" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" + integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1757,9 +1503,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a" - integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw== + version "7.0.10" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.10.tgz#d9a99f017317d9b3d1abc2ced45d3bca68df0daf" + integrity sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw== dependencies: "@babel/types" "^7.3.0" @@ -1870,9 +1616,9 @@ integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== "@types/node@*": - version "13.7.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.6.tgz#cb734a7c191472ae6a2b3a502b4dfffcea974113" - integrity sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA== + version "13.11.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b" + integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1931,7 +1677,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@2.27.0": +"@typescript-eslint/eslint-plugin@2.27.0", "@typescript-eslint/eslint-plugin@^2.10.0": version "2.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz#e479cdc4c9cf46f96b4c287755733311b0d0ba4b" integrity sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw== @@ -1941,26 +1687,6 @@ regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/eslint-plugin@^2.10.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.21.0.tgz#a34de84a0791cae0357c4dda805c5b4e8203b6c6" - integrity sha512-b5jjjDMxzcjh/Sbjuo7WyhrQmVJg0WipTHQgXh5Xwx10uYm6nPWqN1WGOsaNq4HR3Zh4wUx4IRQdDkCHwyewyw== - dependencies: - "@typescript-eslint/experimental-utils" "2.21.0" - eslint-utils "^1.4.3" - functional-red-black-tree "^1.0.1" - regexpp "^3.0.0" - tsutils "^3.17.1" - -"@typescript-eslint/experimental-utils@2.21.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz#71de390a3ec00b280b69138d80733406e6e86bfa" - integrity sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.21.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.27.0": version "2.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a" @@ -1971,7 +1697,7 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@2.27.0": +"@typescript-eslint/parser@2.27.0", "@typescript-eslint/parser@^2.10.0": version "2.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.27.0.tgz#d91664335b2c46584294e42eb4ff35838c427287" integrity sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg== @@ -1981,29 +1707,6 @@ "@typescript-eslint/typescript-estree" "2.27.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/parser@^2.10.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.21.0.tgz#4f200995517c3d5fc5ef51b17527bc948992e438" - integrity sha512-VrmbdrrrvvI6cPPOG7uOgGUFXNYTiSbnRq8ZMyuGa4+qmXJXVLEEz78hKuqupvkpwJQNk1Ucz1TenrRP90gmBg== - dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.21.0" - "@typescript-eslint/typescript-estree" "2.21.0" - eslint-visitor-keys "^1.1.0" - -"@typescript-eslint/typescript-estree@2.21.0": - version "2.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz#7e4be29f2e338195a2e8c818949ed0ff727cc943" - integrity sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@2.27.0": version "2.27.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8" @@ -2183,6 +1886,11 @@ abab@^2.0.0: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -2199,7 +1907,7 @@ acorn-globals@^4.1.0, acorn-globals@^4.3.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.1.0: +acorn-jsx@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== @@ -2215,14 +1923,14 @@ acorn@^5.5.3: integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" - integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== +acorn@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" + integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== address@1.1.2, address@^1.0.1: version "1.1.2" @@ -2284,11 +1992,11 @@ ansi-escapes@^3.0.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-escapes@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" - integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== dependencies: - type-fest "^0.8.1" + type-fest "^0.11.0" ansi-html@0.0.7: version "0.0.7" @@ -2361,7 +2069,7 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.1.1: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== @@ -2371,6 +2079,14 @@ arch@2.1.1: resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg== +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2549,17 +2265,17 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.6.1: - version "9.7.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378" - integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g== + version "9.7.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4" + integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ== dependencies: - browserslist "^4.8.3" - caniuse-lite "^1.0.30001020" + browserslist "^4.11.1" + caniuse-lite "^1.0.30001039" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.26" - postcss-value-parser "^4.0.2" + postcss "^7.0.27" + postcss-value-parser "^4.0.3" aws-sign2@~0.7.0: version "0.7.0" @@ -2862,10 +2578,10 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browser-resolve@^1.11.3: version "1.11.3" @@ -2943,24 +2659,15 @@ browserslist@4.10.0: node-releases "^1.1.52" pkg-up "^3.1.0" -browserslist@^4.0.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.3, browserslist@^4.8.5: - version "4.9.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.0.tgz#ff85c390889e0f754d7bd8ad13412575cdcf5dc7" - integrity sha512-seffIXhwgB84+OCeT/aMjpZnsAsYDiMSC+CEs3UkF8iU64BZGYcu+TZYs/IBpo4nRi0vJywUJWYdbTsOhFTweg== - dependencies: - caniuse-lite "^1.0.30001030" - electron-to-chromium "^1.3.361" - node-releases "^1.1.50" - -browserslist@^4.9.1: - version "4.11.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad" - integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A== +browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.3, browserslist@^4.9.1: + version "4.11.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b" + integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g== dependencies: - caniuse-lite "^1.0.30001035" - electron-to-chromium "^1.3.380" - node-releases "^1.1.52" - pkg-up "^3.1.0" + caniuse-lite "^1.0.30001038" + electron-to-chromium "^1.3.390" + node-releases "^1.1.53" + pkg-up "^2.0.0" bser@2.1.1: version "2.1.1" @@ -3014,9 +2721,9 @@ bytes@3.1.0: integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== cacache@^12.0.2: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== + version "12.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== dependencies: bluebird "^3.5.5" chownr "^1.1.1" @@ -3135,15 +2842,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030: - version "1.0.30001030" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz#78076c4c6d67d3e41d6eb9399853fb27fe6e44ee" - integrity sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw== - -caniuse-lite@^1.0.30001035: - version "1.0.30001036" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz#930ea5272010d8bf190d859159d757c0b398caf0" - integrity sha512-jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039: + version "1.0.30001039" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe" + integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q== capture-exit@^2.0.0: version "2.0.0" @@ -3208,7 +2910,7 @@ check-more-types@2.24.0: resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= -chokidar@^2.0.2, chokidar@^2.1.8: +chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -3547,6 +3249,11 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3696,7 +3403,7 @@ create-react-context@^0.3.0: gud "^1.0.0" warning "^4.0.3" -cross-spawn@7.0.1, cross-spawn@^7.0.0: +cross-spawn@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== @@ -3716,6 +3423,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6" + integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -3819,6 +3535,14 @@ css-tree@1.0.0-alpha.37: mdn-data "2.0.4" source-map "^0.6.1" +css-tree@1.0.0-alpha.39: + version "1.0.0-alpha.39" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb" + integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA== + dependencies: + mdn-data "2.0.6" + source-map "^0.6.1" + css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -3928,11 +3652,11 @@ cssnano@^4.1.10: postcss "^7.0.0" csso@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d" - integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903" + integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ== dependencies: - css-tree "1.0.0-alpha.37" + css-tree "1.0.0-alpha.39" cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4: version "0.3.8" @@ -3947,9 +3671,9 @@ cssstyle@^1.0.0, cssstyle@^1.1.1: cssom "0.3.x" csstype@^2.6.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" - integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q== + version "2.6.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" + integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== cyclist@^1.0.1: version "1.0.1" @@ -4056,7 +3780,7 @@ debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -4090,6 +3814,11 @@ deep-equal@^1.0.1, deep-equal@^1.1.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -4150,6 +3879,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -4168,6 +3902,11 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -4258,11 +3997,11 @@ dom-converter@^0.2: utila "~0.4" dom-helpers@^5.0.1: - version "5.1.3" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821" - integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw== + version "5.1.4" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b" + integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A== dependencies: - "@babel/runtime" "^7.6.3" + "@babel/runtime" "^7.8.7" csstype "^2.6.7" dom-serializer@0: @@ -4376,15 +4115,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.361: - version "1.3.363" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.363.tgz#08756873e49446a92e0cee6c3cd9eb3c52043826" - integrity sha512-4w19wPBkeunBjOA53lNFT36IdOD3Tk1OoIDtTX+VToJUUDX42QfuhtsNKXv25wmSnoBOExM3kTbj7/WDNBwHuQ== - -electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.380: - version "1.3.380" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz#1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d" - integrity sha512-2jhQxJKcjcSpVOQm0NAfuLq8o+130blrcawoumdXT6411xG/xIAOyZodO/y7WTaYlz/NHe3sCCAe/cJLnDsqTw== +electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.390: + version "1.3.398" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d" + integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w== elegant-spinner@^1.0.1: version "1.0.1" @@ -4474,10 +4208,10 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -4605,9 +4339,9 @@ eslint-loader@3.0.3: schema-utils "^2.6.1" eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -4798,12 +4532,12 @@ eslint@^6.6.0, eslint@^6.8.0: v8-compile-cache "^2.0.3" espree@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" - integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" + integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== dependencies: - acorn "^7.1.0" - acorn-jsx "^5.1.0" + acorn "^7.1.1" + acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" esprima@^4.0.0, esprima@^4.0.1: @@ -4817,11 +4551,11 @@ esprima@~1.0.4: integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0= esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe" + integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q== dependencies: - estraverse "^4.0.0" + estraverse "^5.0.0" esrecurse@^4.1.0: version "4.2.1" @@ -4830,12 +4564,17 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -esutils@^2.0.0, esutils@^2.0.2: +estraverse@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22" + integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A== + +esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== @@ -5136,9 +4875,9 @@ fd-slicer@~1.1.0: pend "~1.2.0" figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== figures@^1.7.0: version "1.7.0" @@ -5236,9 +4975,9 @@ find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.0.tgz#4d74ed1fe9ef1731467ca24378e8f8f5c8b6ed11" - integrity sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -5291,9 +5030,9 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flatten@^1.0.2: version "1.0.3" @@ -5309,9 +5048,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb" - integrity sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ== + version "1.11.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" + integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA== dependencies: debug "^3.0.0" @@ -5417,6 +5156,13 @@ fs-extra@^7.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -5445,9 +5191,9 @@ fsevents@2.1.2, fsevents@~2.1.2: integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== fsevents@^1.2.7: - version "1.2.11" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" - integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== + version "1.2.12" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c" + integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q== dependencies: bindings "^1.5.0" nan "^2.12.1" @@ -5462,6 +5208,20 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" @@ -5526,9 +5286,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" gl-matrix@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.2.1.tgz#2d8e35125bf854f49abded8a0c8350b1a4907a26" - integrity sha512-YYVO8jUSf6+SakL4AJmx9Jc7zAZhkJQ+WhdtX3VQe5PJdCOX6/ybY4x1vk+h94ePnjRn6uml68+QxTAJneUpvA== + version "3.3.0" + resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b" + integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA== glob-parent@^3.1.0: version "3.1.0" @@ -5539,9 +5299,9 @@ glob-parent@^3.1.0: path-dirname "^1.0.0" glob-parent@^5.0.0, glob-parent@~5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== dependencies: is-glob "^4.0.1" @@ -5591,9 +5351,9 @@ globals@^11.1.0, globals@^11.12.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^12.1.0: - version "12.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" - integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== dependencies: type-fest "^0.8.1" @@ -5650,9 +5410,9 @@ gzip-size@5.1.1: pify "^4.0.1" handle-thing@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" - integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== har-schema@^2.0.0: version "2.0.0" @@ -5694,6 +5454,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -5787,9 +5552,9 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: react-is "^16.7.0" hosted-git-info@^2.1.4: - version "2.8.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.7.tgz#4d2e0d5248e1cfabc984b0f6a6d75fe36e679511" - integrity sha512-ChkjQtKJ3GI6SsI4O5jwr8q8EPrWCnxuc4Tbx+vRI5x6mDOpjKKltNo1lRlszw3xwgTOSns1ZRBiMmmwpcvLxg== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hpack.js@^2.1.6: version "2.1.6" @@ -5829,14 +5594,14 @@ html-entities@^1.2.1: integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= html-escaper@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491" - integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig== + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== html-minifier-terser@^5.0.1: - version "5.0.4" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.4.tgz#e8cc02748acb983bd7912ea9660bd31c0702ec32" - integrity sha512-fHwmKQ+GzhlqdxEtwrqLT7MSuheiA+rif5/dZgbz3GjoMXJzcRzy1L9NXoiiyxrnap+q5guSiv8Tz5lrh9g42g== + version "5.0.5" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz#8f12f639789f04faa9f5cf2ff9b9f65607f21f8b" + integrity sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew== dependencies: camel-case "^4.1.1" clean-css "^4.2.3" @@ -5980,7 +5745,7 @@ i18next@^19.3.4: dependencies: "@babel/runtime" "^7.3.1" -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -6011,6 +5776,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -6112,12 +5884,12 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5: +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inquirer@7.0.4, inquirer@^7.0.0: +inquirer@7.0.4: version "7.0.4" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703" integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ== @@ -6136,6 +5908,25 @@ inquirer@7.0.4, inquirer@^7.0.0: strip-ansi "^5.1.0" through "^2.3.6" +inquirer@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" + integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg== + dependencies: + ansi-escapes "^4.2.1" + chalk "^3.0.0" + cli-cursor "^3.1.0" + cli-width "^2.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash "^4.17.15" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.5.3" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -6962,9 +6753,9 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: supports-color "^6.1.0" jest-worker@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" - integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== + version "25.2.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.6.tgz#d1292625326794ce187c38f51109faced3846c58" + integrity sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA== dependencies: merge-stream "^2.0.0" supports-color "^7.0.0" @@ -7123,17 +6914,10 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6" - integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ== - dependencies: - minimist "^1.2.0" - json5@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" - integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== dependencies: minimist "^1.2.5" @@ -7362,12 +7146,12 @@ load-json-file@^4.0.0: strip-bom "^3.0.0" loader-fs-cache@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz#54cedf6b727e1779fd8f01205f05f6e88706f086" - integrity sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9" + integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA== dependencies: find-cache-dir "^0.1.1" - mkdirp "0.5.1" + mkdirp "^0.5.1" loader-runner@^2.4.0: version "2.4.0" @@ -7623,6 +7407,11 @@ mdn-data@2.0.4: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== +mdn-data@2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978" + integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -7805,12 +7594,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -minimist@1.2.5, minimist@^1.2.5: +minimist@1.2.5, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -7836,6 +7620,14 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -7843,6 +7635,13 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -7875,24 +7674,10 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" -mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -mkdirp@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" - integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg== - dependencies: - minimist "^1.2.5" - -mkdirp@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" - integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" @@ -7978,6 +7763,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" + integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -8061,19 +7855,34 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-releases@^1.1.50: - version "1.1.50" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592" - integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ== +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== dependencies: - semver "^6.3.0" - -node-releases@^1.1.52: - version "1.1.52" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" - integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + +node-releases@^1.1.52, node-releases@^1.1.53: + version "1.1.53" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" + integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== + +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: - semver "^6.3.0" + abbrev "1" + osenv "^0.1.4" normalize-package-data@^2.3.2: version "2.5.0" @@ -8117,6 +7926,27 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -8131,6 +7961,16 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -8313,9 +8153,9 @@ onetime@^5.1.0: mimic-fn "^2.1.0" open@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz#fb3681f11f157f2361d2392307548ca1792960e8" - integrity sha512-70E/pFTPr7nZ9nLDPNTcj3IVqnNvKuP4VsBmoKV9YGTnChe0mlS3C4qM7qKarhZ8rGaHKLfo+vBTHXDp6ZSyLQ== + version "7.0.3" + resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48" + integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -8364,6 +8204,11 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + os-locale@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -8373,11 +8218,19 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + ospath@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" @@ -8418,9 +8271,9 @@ p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" @@ -8693,9 +8546,9 @@ performance-now@^2.1.0: integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7: - version "2.2.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" - integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== pify@^2.0.0, pify@^2.2.0: version "2.3.0" @@ -8771,6 +8624,13 @@ pkg-up@3.1.0, pkg-up@^3.1.0: dependencies: find-up "^3.0.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -9141,9 +9001,9 @@ postcss-modules-local-by-default@^3.0.2: postcss-value-parser "^4.0.0" postcss-modules-scope@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba" - integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== dependencies: postcss "^7.0.6" postcss-selector-parser "^6.0.0" @@ -9438,7 +9298,7 @@ postcss-value-parser@^3.0.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== @@ -9461,7 +9321,7 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== @@ -9520,7 +9380,7 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -private@^0.1.6, private@^0.1.8: +private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== @@ -9554,16 +9414,16 @@ promise-inflight@^1.0.1: integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= promise@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6" - integrity sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw== + version "8.1.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" + integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== dependencies: asap "~2.0.6" prompts@^2.0.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05" - integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" + integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA== dependencies: kleur "^3.0.3" sisteransi "^1.0.4" @@ -9603,9 +9463,9 @@ ps-tree@1.2.0: event-stream "=3.3.4" psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== public-encrypt@^4.0.0: version "4.0.3" @@ -9751,6 +9611,16 @@ rbush@^3.0.1: dependencies: quickselect "^2.0.0" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-app-polyfill@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0" @@ -9817,9 +9687,9 @@ react-i18next@^11.3.4: html-parse-stringify2 "2.0.1" react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" - integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-popper@^1.3.4: version "1.3.7" @@ -10007,7 +9877,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -10082,13 +9952,6 @@ redux@^4.0.5: loose-envify "^1.4.0" symbol-observable "^1.2.0" -regenerate-unicode-properties@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" - integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" @@ -10106,22 +9969,10 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== - -regenerator-runtime@^0.13.4: - version "0.13.4" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" - integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== - -regenerator-transform@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" - integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ== - dependencies: - private "^0.1.6" +regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== regenerator-transform@^0.14.2: version "0.14.4" @@ -10158,21 +10009,9 @@ regexpp@^2.0.1: integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== regexpp@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" - integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== - -regexpu-core@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" - integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.1.0" - regjsgen "^0.5.0" - regjsparser "^0.6.0" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.1.0" + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== regexpu-core@^4.7.0: version "4.7.0" @@ -10186,18 +10025,11 @@ regexpu-core@^4.7.0: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.2.0" -regjsgen@^0.5.0, regjsgen@^0.5.1: +regjsgen@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== -regjsparser@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" - integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== - dependencies: - jsesc "~0.5.0" - regjsparser@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" @@ -10438,7 +10270,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10458,7 +10290,7 @@ rsvp@^4.8.4: resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== -run-async@^2.2.0: +run-async@^2.2.0, run-async@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== @@ -10478,9 +10310,9 @@ rw@^1.3.3: integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= rxjs@^6.3.3, rxjs@^6.5.3, rxjs@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + version "6.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" + integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== dependencies: tslib "^1.9.0" @@ -10566,15 +10398,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" - integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== - dependencies: - ajv "^6.10.2" - ajv-keywords "^3.4.1" - -schema-utils@^2.6.5: +schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== @@ -10628,7 +10452,7 @@ semver-regex@^2.0.0: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -10690,7 +10514,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -10802,9 +10626,9 @@ side-channel@^1.0.2: object-inspect "^1.7.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== simple-swizzle@^0.2.2: version "0.2.2" @@ -10814,9 +10638,9 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sisteransi@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" - integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig== + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== slash@^1.0.0: version "1.0.0" @@ -10982,9 +10806,9 @@ spdy-transport@^3.0.0: wbuf "^1.7.3" spdy@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2" - integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA== + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== dependencies: debug "^4.1.0" handle-thing "^2.0.0" @@ -11163,7 +10987,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -11201,21 +11025,39 @@ string.prototype.matchall@^4.0.2: regexp.prototype.flags "^1.3.0" side-channel "^1.0.2" +string.prototype.trimend@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373" + integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2" + integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -11292,9 +11134,14 @@ strip-final-newline@^2.0.0: integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== strip-json-comments@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" + integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= style-loader@0.23.1: version "0.23.1" @@ -11347,9 +11194,9 @@ supports-color@^6.1.0: has-flag "^3.0.0" svg-parser@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz#a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9" - integrity sha512-fnCWiifNhK8i2Z7b9R5tbNahpxrRdAaQbnoxKlT2KrSCj9Kq/yBSgulCRgBJRhy1dPnSY5slg5ehPUnzpEcHlg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" + integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== svgo@^1.0.0, svgo@^1.2.2: version "1.3.2" @@ -11395,6 +11242,19 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + terser-webpack-plugin@2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81" @@ -11426,9 +11286,9 @@ terser-webpack-plugin@^1.4.3: worker-farm "^1.7.0" terser@^4.1.2, terser@^4.4.3, terser@^4.6.3: - version "4.6.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00" - integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w== + version "4.6.10" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2" + integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -11585,11 +11445,16 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -ts-pnp@1.1.6, ts-pnp@^1.1.6: +ts-pnp@1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a" integrity sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ== +ts-pnp@^1.1.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" + integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" @@ -11626,6 +11491,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -11672,20 +11542,15 @@ unicode-match-property-ecmascript@^1.0.4: unicode-canonical-property-names-ecmascript "^1.0.4" unicode-property-aliases-ecmascript "^1.0.4" -unicode-match-property-value-ecmascript@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" - integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== - unicode-match-property-value-ecmascript@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" - integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" + integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== union-value@^1.0.0: version "1.0.1" @@ -11905,11 +11770,11 @@ vt-pbf@^3.1.1: pbf "^3.0.5" w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" - integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: - browser-process-hrtime "^0.1.2" + browser-process-hrtime "^1.0.0" w3c-xmlserializer@^1.1.2: version "1.1.2" @@ -11947,11 +11812,11 @@ warning@^4.0.2, warning@^4.0.3: loose-envify "^1.0.0" watchpack@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" - integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== + version "1.6.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2" + integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA== dependencies: - chokidar "^2.0.2" + chokidar "^2.1.8" graceful-fs "^4.1.2" neo-async "^2.5.0" @@ -12150,6 +12015,13 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + wkt-parser@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.2.4.tgz#e42ba7b96f13aef82a2da9056e2d87da0fec5393" @@ -12396,7 +12268,7 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -12407,11 +12279,11 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" - integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz#2f420fca58b68ce3a332d0ca64be1d191dd3f87a" + integrity sha512-X/v7VDnK+sxbQ2Imq4Jt2PRUsRsP7UcpSl3Llg6+NRRqWLIvxkMFYtH1FmvwNGYRKKPa+EPA4qDBlI9WVG1UKw== dependencies: - "@babel/runtime" "^7.6.3" + "@babel/runtime" "^7.8.7" yargs-parser@^11.1.1: version "11.1.1" @@ -12421,10 +12293,10 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -12448,9 +12320,9 @@ yargs@12.0.5: yargs-parser "^11.1.1" yargs@^13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== dependencies: cliui "^5.0.0" find-up "^3.0.0" @@ -12461,7 +12333,7 @@ yargs@^13.3.0: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" + yargs-parser "^13.1.2" yauzl@2.10.0, yauzl@^2.10.0: version "2.10.0"