From 4284c40aaa0bf1a67d99d40f1a34df7c4bbd7f14 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Sun, 15 Mar 2020 17:32:40 +0100 Subject: [PATCH 01/13] feat: run projection for each scenario and handle altitudinal zone hochmontan --- src/components/ProjectionForm.js | 2 +- src/components/ProjectionResult.js | 35 +++++---------------- src/components/Recommendation.js | 2 +- src/store/enhancers/projection.js | 49 +++++++++++++++++++++++++----- 4 files changed, 52 insertions(+), 36 deletions(-) diff --git a/src/components/ProjectionForm.js b/src/components/ProjectionForm.js index a557b047..8c088e06 100644 --- a/src/components/ProjectionForm.js +++ b/src/components/ProjectionForm.js @@ -29,7 +29,7 @@ function ProjectionForm() { mapLocation, formLocation, projectionMode, - projectionResult: { options }, + projectionResult: [{ options }], } = useSelector(state => ({ location: state.location, mapLocation: state.mapLocation, diff --git a/src/components/ProjectionResult.js b/src/components/ProjectionResult.js index 0073afd3..b25a896a 100644 --- a/src/components/ProjectionResult.js +++ b/src/components/ProjectionResult.js @@ -13,37 +13,21 @@ import { ReactComponent as EarthModerateIcon } from '../icons/earthModerate.svg' import { ReactComponent as EarthTodayIcon } from '../icons/earthToday.svg'; function ProjectionResult() { - const { - location, - options, - projectionMode, - projections, - targetAltitudinalZone, - } = useSelector(state => ({ - projectionMode: state.projectionMode, + const { location, projectionMode, projectionResult } = useSelector(state => ({ location: state.location, - options: state.projectionResult.options, - projections: [...state.projectionResult.projections], - targetAltitudinalZone: state.targetAltitudinalZone, + 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({ menuItem: t('recommendation.header'), render: () => , }); - projections.forEach(p => { + projectionResult.forEach(r => { + const p = r.projections[r.projections.length - 1]; const icons = []; const scenarios = []; if (projectionMode === 'f') { @@ -53,7 +37,7 @@ function ProjectionResult() { } else { scenarios.push(t('projectionScenario.manual')); } - } else { + } else if (p) { if (location.altitudinalZone === p.altitudinalZone) { icons.push(); scenarios.push(t('projectionScenario.today')); @@ -97,10 +81,7 @@ function ProjectionResult() { } }); - return forestType && - options.forestType && - options.forestType.includes(forestType) && - (location.coordinate || targetAltitudinalZone) ? ( + return (
{panes.length > 0 ? ( )}
- ) : null; + ); } export default ProjectionResult; diff --git a/src/components/Recommendation.js b/src/components/Recommendation.js index 59799aef..ab98d3ce 100644 --- a/src/components/Recommendation.js +++ b/src/components/Recommendation.js @@ -17,7 +17,7 @@ function Recommendation() { const [future, setFuture] = useState(true); const { location, projections } = useSelector(state => ({ location: state.location, - projections: state.projectionResult.projections, + projections: state.projectionResult[0].projections, })); const recommendations = useMemo(() => { diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js index 0f7d1322..f8a0a978 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -9,7 +9,6 @@ import { setLocation, setLocateResult, setProjectionResult, - setTargetAltitudinalZone, } from '../actions'; const projectionActionTypes = [ @@ -18,6 +17,24 @@ const projectionActionTypes = [ SET_PROJECTION_MODE, ]; +const hochmontanAltitudinalZones = ['81', '82', '83']; + +const getProjectionConfig = (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'; + } + return { + location: { ...location, altitudinalZone, silverFirArea }, + targetAltitudinalZone: newTargetAltitudinalZone, + }; +}; + const projection = store => next => action => { const result = next(action); if (projectionActionTypes.includes(action.type)) { @@ -31,11 +48,7 @@ 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 locateResult = locate(location); console.log(locateResult, location); @@ -43,8 +56,30 @@ const projection = store => next => action => { } catch (error) { console.log('Locate error: ', error); } + + const projectionConfig = []; + if (projectionMode === 'm') { + const { + targetAltitudinalZoneModerate, + targetAltitudinalZoneExtreme, + } = mapLocation; + projectionConfig.push( + getProjectionConfig(location, targetAltitudinalZoneModerate), + ); + projectionConfig.push( + getProjectionConfig(location, targetAltitudinalZoneExtreme), + ); + } else { + projectionConfig.push( + getProjectionConfig(location, formLocation.targetAltitudinalZone), + ); + } + try { - const projectionResult = project(location, targetAltitudinalZone); + const projectionResult = projectionConfig.map(config => + project(config.location, config.targetAltitudinalZone), + ); + console.log({ projectionConfig, projectionResult }); store.dispatch(setProjectionResult(projectionResult)); } catch (error) { console.log('Projection error: ', error); From c292da9358121f51c9bd20f044c2c58c55d8fc2f Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Mon, 16 Mar 2020 10:33:27 +0100 Subject: [PATCH 02/13] chore: upgrade tree-lib dependency --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fcbe07a7..de7abe4e 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@geops/tree-lib": "^1.2.0", + "@geops/tree-lib": "^1.3.0", "i18next": "^19.1.0", "mapbox-gl": "^1.7.0", "ol": "^6.1.1", diff --git a/yarn.lock b/yarn.lock index 46a5d971..7158a286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,10 +1011,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@geops/tree-lib@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@geops/tree-lib/-/tree-lib-1.2.0.tgz#91ec16e71a5f01cab68a84b014c0025159c263e7" - integrity sha512-8nkPGbXyYmAqf0q7RApwLJovLOzPehWIOwryn9dpyGGP6OLuRrMK8pYmy0HYVNeLH7QpFzk3oF9n1wbqEzQKww== +"@geops/tree-lib@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@geops/tree-lib/-/tree-lib-1.3.0.tgz#32f857fb99a91ddc3c241df6bf82d7cf684d6b95" + integrity sha512-iSJ/OaW9GIvOrjpP0/h8haf/P1dMnXTe2V/G4zPYuJo+TmeHHVYyvzk5Jf9PJnMIq8R6ikyowr8xvEYq1Ndn5g== dependencies: lodash.difference "^4.5.0" lodash.intersection "^4.4.0" From 1e11ddaf0f2d4f5b04ebb75fdf51dc0fe5e39ef4 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 18 Mar 2020 06:47:35 +0100 Subject: [PATCH 03/13] fix: show projection result only if forest type and panes are available --- src/components/ProjectionResult.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/ProjectionResult.js b/src/components/ProjectionResult.js index b25a896a..9880336e 100644 --- a/src/components/ProjectionResult.js +++ b/src/components/ProjectionResult.js @@ -19,6 +19,7 @@ function ProjectionResult() { projectionResult: state.projectionResult, })); const { i18n, t } = useTranslation(); + const { forestType } = location; const panes = []; panes.push({ @@ -30,7 +31,7 @@ function ProjectionResult() { const p = r.projections[r.projections.length - 1]; const icons = []; const scenarios = []; - if (projectionMode === 'f') { + if (p && projectionMode === 'f') { if (location.altitudinalZone === p.altitudinalZone) { icons.push(); scenarios.push(t('projectionScenario.today')); @@ -81,9 +82,9 @@ function ProjectionResult() { } }); - return ( + return forestType ? (
- {panes.length > 0 ? ( + {panes.length > 1 ? ( )}
- ); + ) : null; } export default ProjectionResult; From 072a489f79fcb63552332b5ea46ebf7b03e18959 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 18 Mar 2020 06:48:27 +0100 Subject: [PATCH 04/13] chore: renaming and removing console.log statements --- src/store/enhancers/projection.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js index f8a0a978..5995c08e 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -51,7 +51,6 @@ const projection = store => next => action => { try { const locateResult = locate(location); - console.log(locateResult, location); store.dispatch(setLocateResult(locateResult)); } catch (error) { console.log('Locate error: ', error); @@ -60,26 +59,20 @@ const projection = store => next => action => { const projectionConfig = []; if (projectionMode === 'm') { const { - targetAltitudinalZoneModerate, - targetAltitudinalZoneExtreme, + targetAltitudinalZoneModerate: moderateZone, + targetAltitudinalZoneExtreme: extremeZone, } = mapLocation; - projectionConfig.push( - getProjectionConfig(location, targetAltitudinalZoneModerate), - ); - projectionConfig.push( - getProjectionConfig(location, targetAltitudinalZoneExtreme), - ); + projectionConfig.push(getProjectionConfig(location, moderateZone)); + projectionConfig.push(getProjectionConfig(location, extremeZone)); } else { - projectionConfig.push( - getProjectionConfig(location, formLocation.targetAltitudinalZone), - ); + const { targetAltitudinalZone: targetZone } = formLocation; + projectionConfig.push(getProjectionConfig(location, targetZone)); } try { const projectionResult = projectionConfig.map(config => project(config.location, config.targetAltitudinalZone), ); - console.log({ projectionConfig, projectionResult }); store.dispatch(setProjectionResult(projectionResult)); } catch (error) { console.log('Projection error: ', error); From acb01621c3237d256b3c1127b78c89c6b0ffd60d Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 18 Mar 2020 08:18:52 +0100 Subject: [PATCH 05/13] chore: upgrade dependencies --- package.json | 10 ++--- yarn.lock | 122 ++++++++++++++++++++++++++++----------------------- 2 files changed, 72 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index de7abe4e..bb0887de 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "dependencies": { "@geops/tree-lib": "^1.3.0", - "i18next": "^19.1.0", + "i18next": "^19.3.3", "mapbox-gl": "^1.7.0", "ol": "^6.1.1", "proj4": "^2.6.0", @@ -24,9 +24,9 @@ "semantic-ui-react": "^0.88.2" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "2.23.0", - "@typescript-eslint/parser": "2.23.0", - "cypress": "^4.1.0", + "@typescript-eslint/eslint-plugin": "2.24.0", + "@typescript-eslint/parser": "2.24.0", + "cypress": "^4.2.0", "eslint": "^6.8.0", "eslint-config-airbnb": "^18.1.0", "eslint-config-prettier": "^6.10.0", @@ -42,7 +42,7 @@ "lint-staged": "^10.0.8", "prettier": "^1.19.1", "react-test-renderer": "^16.13.0", - "start-server-and-test": "^1.10.10" + "start-server-and-test": "^1.10.11" }, "browserslist": { "production": [ diff --git a/yarn.lock b/yarn.lock index 7158a286..e9e8cdfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1553,12 +1553,12 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d" - integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw== +"@typescript-eslint/eslint-plugin@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz#a86cf618c965a462cddf3601f594544b134d6d68" + integrity sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA== dependencies: - "@typescript-eslint/experimental-utils" "2.23.0" + "@typescript-eslint/experimental-utils" "2.24.0" eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" @@ -1584,23 +1584,23 @@ "@typescript-eslint/typescript-estree" "2.21.0" eslint-scope "^5.0.0" -"@typescript-eslint/experimental-utils@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242" - integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ== +"@typescript-eslint/experimental-utils@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz#a5cb2ed89fedf8b59638dc83484eb0c8c35e1143" + integrity sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.23.0" + "@typescript-eslint/typescript-estree" "2.24.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212" - integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg== +"@typescript-eslint/parser@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" + integrity sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.23.0" - "@typescript-eslint/typescript-estree" "2.23.0" + "@typescript-eslint/experimental-utils" "2.24.0" + "@typescript-eslint/typescript-estree" "2.24.0" eslint-visitor-keys "^1.1.0" "@typescript-eslint/parser@^2.10.0": @@ -1626,10 +1626,10 @@ semver "^6.3.0" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36" - integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw== +"@typescript-eslint/typescript-estree@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" + integrity sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA== dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" @@ -2918,6 +2918,16 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" +cli-table3@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" + integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== + dependencies: + object-assign "^4.1.0" + string-width "^2.1.1" + optionalDependencies: + colors "^1.1.2" + cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" @@ -3036,6 +3046,11 @@ color@^3.0.0: color-convert "^1.9.1" color-string "^1.5.2" +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -3544,10 +3559,10 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.1.0.tgz#295f115d2e8a08fff2760ab49d94d876f5877aee" - integrity sha512-FFV8pS9iuriSX4M9rna6awJUhiqozZD1D5z5BprCUJoho1ctbcgpkEUIUnqxli2OwjQqVz07egO+iqoGL+tw7g== +cypress@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243" + integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw== dependencies: "@cypress/listr-verbose-renderer" "0.4.1" "@cypress/xvfb" "1.2.4" @@ -3557,6 +3572,7 @@ cypress@^4.1.0: cachedir "2.3.0" chalk "2.4.2" check-more-types "2.24.0" + cli-table3 "0.5.1" commander "4.1.0" common-tags "1.8.0" debug "4.1.1" @@ -3572,12 +3588,12 @@ cypress@^4.1.0: listr "0.14.3" lodash "4.17.15" log-symbols "3.0.0" - minimist "1.2.0" + minimist "1.2.2" moment "2.24.0" ospath "1.2.2" pretty-bytes "5.3.0" ramda "0.26.1" - request "2.88.0" + request cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16 request-progress "3.0.0" supports-color "7.1.0" tmp "0.1.0" @@ -5239,7 +5255,7 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.1.0, har-validator@~5.1.3: +har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== @@ -5553,10 +5569,10 @@ husky@^4.2.3: slash "^3.0.0" which-pm-runs "^1.0.0" -i18next@^19.1.0: - version "19.3.2" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.3.2.tgz#a17c3c8bb0dd2d8c4a8963429df99730275b3282" - integrity sha512-QDBQ8MqFWi4+L9OQjjZEKVyg9uSTy3NTU3Ri53QHe7nxtV+KD4PyLB8Kxu58gr6b9y5l8cU3mCiNHVeoxPMzAQ== +i18next@^19.3.3: + version "19.3.3" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.3.3.tgz#04bd79b315e5fe2c87ab8f411e5d55eda0a17bd8" + integrity sha512-CnuPqep5/JsltkGvQqzYN4d79eCe0TreCBRF3a8qHHi8x4SON1qqZ/pvR2X7BfNkNqpA5HXIqw0E731H+VsgSg== dependencies: "@babel/runtime" "^7.3.1" @@ -7383,6 +7399,11 @@ minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63" + integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -9149,7 +9170,7 @@ ps-tree@1.2.0: dependencies: event-stream "=3.3.4" -psl@^1.1.24, psl@^1.1.28: +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== @@ -9196,7 +9217,7 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@^1.2.4, punycode@^1.4.1: +punycode@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= @@ -9772,10 +9793,10 @@ request-promise-native@^1.0.5, request-promise-native@^1.0.8: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== +request@^2.87.0, request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -9784,7 +9805,7 @@ request@2.88.0: extend "~3.0.2" forever-agent "~0.6.1" form-data "~2.3.2" - har-validator "~5.1.0" + har-validator "~5.1.3" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -9794,14 +9815,13 @@ request@2.88.0: performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" - tough-cookie "~2.4.3" + tough-cookie "~2.5.0" tunnel-agent "^0.6.0" uuid "^3.3.2" -request@^2.87.0, request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== +"request@github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16": + version "2.88.1" + resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16" dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -10589,10 +10609,10 @@ stack-utils@^1.0.1: resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== -start-server-and-test@^1.10.10: - version "1.10.10" - resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.10.tgz#ad3dd8d389f9487214b617e884f85cca74244549" - integrity sha512-LCnngrqi4Ex7FDJwpzfByXK8SCAcITYJB5yj/K3k2onaBHcH6RMFf6q3Kz8iM7CLuJ3DZlzU76W6Ixwpt+n/sQ== +start-server-and-test@^1.10.11: + version "1.10.11" + resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.11.tgz#24290ee8a5ed15f4a34e9bb45a5d6ff93c93c83e" + integrity sha512-CZilaj293uQWdD4vgOxTOuzlCWxOyBm6bzmH1r6OGLG/q5zcBmGYevLfOimkg0kSn9jLHwYSXLuoKG/DDQJhww== dependencies: bluebird "3.7.2" check-more-types "2.24.0" @@ -11109,14 +11129,6 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0, tough-cookie@~2.5 psl "^1.1.28" punycode "^2.1.1" -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" From 9a4c68fbb803918ddbd69e3e5723d2f5bfb0b3d6 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 18 Mar 2020 08:19:36 +0100 Subject: [PATCH 06/13] fix: initial value for projectionResult --- src/store/reducers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/reducers.js b/src/store/reducers.js index 4cbdbc9f..ea8ec4a7 100644 --- a/src/store/reducers.js +++ b/src/store/reducers.js @@ -20,7 +20,7 @@ export const initialState = { mapView: '9|910001|5947112', projectionMode: 'm', projectionOptions: {}, - projectionResult: { options: {}, projections: [] }, + projectionResult: [{ options: {}, projections: [] }], targetAltitudinalZone: null, welcomeModalOpen: localStorage.getItem('tree.welcomeModal') !== 'close', }; From 10edf60bd8f2a5fdc5e53eaa933b4deb23c67549 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 18 Mar 2020 08:49:22 +0100 Subject: [PATCH 07/13] fix: force click to avoid hidden elements --- cypress/integration/projection.spec.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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+\)/); }); }); From 690f8bab0ec2558f4f0008d0bdbf2ea457c055fd Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Sun, 22 Mar 2020 10:31:33 +0100 Subject: [PATCH 08/13] feat: store projection result for each scenario --- src/components/ProjectionForm.js | 7 +- src/components/ProjectionResult.js | 141 ++++++++++++++++++----------- src/components/Recommendation.js | 16 +++- src/store/enhancers/projection.js | 38 ++++---- src/store/reducers.js | 7 +- 5 files changed, 128 insertions(+), 81 deletions(-) diff --git a/src/components/ProjectionForm.js b/src/components/ProjectionForm.js index 8c088e06..0ce710e5 100644 --- a/src/components/ProjectionForm.js +++ b/src/components/ProjectionForm.js @@ -29,7 +29,7 @@ function ProjectionForm() { mapLocation, formLocation, projectionMode, - projectionResult: [{ options }], + projectionResult, } = useSelector(state => ({ location: state.location, mapLocation: state.mapLocation, @@ -37,6 +37,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 9880336e..4fac92c4 100644 --- a/src/components/ProjectionResult.js +++ b/src/components/ProjectionResult.js @@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; import { Header, Menu, Tab } from 'semantic-ui-react'; +import { hochmontanAltitudinalZones } from '../store/enhancers/projection'; import ProjectionTab from './ProjectionTab'; import Recommendation from './Recommendation'; import styles from './ProjectionResult.module.css'; @@ -12,6 +13,60 @@ 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, projectionMode, projectionResult } = useSelector(state => ({ location: state.location, @@ -19,7 +74,7 @@ function ProjectionResult() { projectionResult: state.projectionResult, })); const { i18n, t } = useTranslation(); - const { forestType } = location; + const { altitudinalZone, forestType } = location; const panes = []; panes.push({ @@ -27,64 +82,42 @@ function ProjectionResult() { render: () => , }); - projectionResult.forEach(r => { - const p = r.projections[r.projections.length - 1]; - const icons = []; - const scenarios = []; - if (p && 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')); - } - } else if (p) { - 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')); + 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 { + panes.push(getPane('today', location, i18n.language, t)); + panes.push(getPane('moderate', moderate, i18n.language, t)); + panes.push(getPane('extreme', extreme, i18n.language, t)); } - 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: () => , - }); - } - }); + } - return forestType ? ( + return altitudinalZone && forestType ? (
- {panes.length > 1 ? ( + {panes.filter(p => p).length > 1 ? ( ({ + const { location, projectionMode, projectionResult } = useSelector(state => ({ location: state.location, - projections: state.projectionResult[0].projections, + 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); @@ -33,7 +43,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 5995c08e..de4329e7 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -17,9 +17,9 @@ const projectionActionTypes = [ SET_PROJECTION_MODE, ]; -const hochmontanAltitudinalZones = ['81', '82', '83']; +export const hochmontanAltitudinalZones = ['81', '82', '83']; -const getProjectionConfig = (location, targetAltitudinalZone) => { +const runProjection = (location, targetAltitudinalZone) => { let newTargetAltitudinalZone = targetAltitudinalZone; let { altitudinalZone, silverFirArea } = location; if (hochmontanAltitudinalZones.includes(targetAltitudinalZone)) { @@ -29,10 +29,8 @@ const getProjectionConfig = (location, targetAltitudinalZone) => { if (hochmontanAltitudinalZones.includes(altitudinalZone)) { altitudinalZone = '80'; } - return { - location: { ...location, altitudinalZone, silverFirArea }, - targetAltitudinalZone: newTargetAltitudinalZone, - }; + const newLocation = { ...location, altitudinalZone, silverFirArea }; + return project(newLocation, newTargetAltitudinalZone); }; const projection = store => next => action => { @@ -56,23 +54,19 @@ const projection = store => next => action => { console.log('Locate error: ', error); } - const projectionConfig = []; - if (projectionMode === 'm') { - const { - targetAltitudinalZoneModerate: moderateZone, - targetAltitudinalZoneExtreme: extremeZone, - } = mapLocation; - projectionConfig.push(getProjectionConfig(location, moderateZone)); - projectionConfig.push(getProjectionConfig(location, extremeZone)); - } else { - const { targetAltitudinalZone: targetZone } = formLocation; - projectionConfig.push(getProjectionConfig(location, targetZone)); - } - try { - const projectionResult = projectionConfig.map(config => - project(config.location, config.targetAltitudinalZone), - ); + const projectionResult = { extreme: {}, moderate: {}, form: {} }; + if (projectionMode === 'm') { + const { + targetAltitudinalZoneModerate: targetAZModerate, + targetAltitudinalZoneExtreme: targetAZExtreme, + } = mapLocation; + projectionResult.moderate = runProjection(location, targetAZModerate); + projectionResult.extreme = runProjection(location, targetAZExtreme); + } else { + const { targetAltitudinalZone: targetAZForm } = formLocation; + projectionResult.form = runProjection(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 ea8ec4a7..9333ed06 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', }; From ac16cff313a30b1cff3b78318a14110319f18473 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Sun, 22 Mar 2020 10:37:58 +0100 Subject: [PATCH 09/13] chore: upgrade dependencies --- package.json | 19 +- src/components/ChoiceButton.js | 4 +- src/components/Ecogram.js | 2 +- src/components/LocationForm.js | 6 +- src/components/MapBaseLayer.js | 4 +- src/components/MapLocation.js | 15 +- src/components/MapVectorLayer.js | 16 +- src/components/MapView.js | 6 +- src/components/Navigation.js | 4 +- src/components/ProjectionForm.js | 14 +- src/components/ProjectionMode.js | 6 +- src/components/ProjectionResult.js | 14 +- src/components/Recommendation.js | 12 +- src/components/TreeTypeList.js | 2 +- src/components/WelcomeModal.js | 2 +- src/serviceWorker.js | 10 +- src/spatial/components/Map.js | 2 +- src/spatial/renderer/Mapbox.js | 2 +- src/store/enhancers/projection.js | 2 +- src/store/enhancers/querySync.js | 64 +-- yarn.lock | 794 +++++++++++++++++++++-------- 21 files changed, 677 insertions(+), 323 deletions(-) diff --git a/package.json b/package.json index bb0887de..ef1c3f27 100644 --- a/package.json +++ b/package.json @@ -5,18 +5,18 @@ "version": "0.1.0", "private": true, "dependencies": { - "@geops/tree-lib": "^1.3.0", + "@geops/tree-lib": "^1.3.1-beta.1", "i18next": "^19.3.3", "mapbox-gl": "^1.7.0", "ol": "^6.1.1", "proj4": "^2.6.0", "prop-types": "^15.7.2", - "react": "^16.12.0", - "react-dom": "^16.12.0", - "react-i18next": "^11.3.1", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-i18next": "^11.3.4", "react-redux": "^7.1.3", "react-router-dom": "^5.1.2", - "react-scripts": "^3.3.1", + "react-scripts": "^3.4.1", "react-toastify": "^5.5.0", "redux": "^4.0.5", "redux-query-sync": "^0.1.9", @@ -30,18 +30,18 @@ "eslint": "^6.8.0", "eslint-config-airbnb": "^18.1.0", "eslint-config-prettier": "^6.10.0", - "eslint-config-react-app": "^5.2.0", + "eslint-config-react-app": "^5.2.1", "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-flowtype": "4.6.0", "eslint-plugin-import": "^2.20.1", "eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.19.0", - "eslint-plugin-react-hooks": "2.5.0", + "eslint-plugin-react-hooks": "2.5.1", "husky": "^4.2.3", "lint-staged": "^10.0.8", - "prettier": "^1.19.1", - "react-test-renderer": "^16.13.0", + "prettier": "^2.0.1", + "react-test-renderer": "^16.13.1", "start-server-and-test": "^1.10.11" }, "browserslist": { @@ -112,6 +112,7 @@ "start": "react-scripts start", "build": "react-scripts build", "lint": "eslint src", + "format": "prettier --write 'src/**/*.js'", "test": "react-scripts test --transformIgnorePatterns \"node_modules/(?!ol)/\"", "eject": "react-scripts eject" } diff --git a/src/components/ChoiceButton.js b/src/components/ChoiceButton.js index 45463b11..d4c5d562 100644 --- a/src/components/ChoiceButton.js +++ b/src/components/ChoiceButton.js @@ -8,11 +8,11 @@ function ChoiceButton({ onChange, options, value, label, ...props }) { - {options.map(option => ( + {options.map((option) => ( diff --git a/src/components/Ecogram.js b/src/components/Ecogram.js index 09326271..0bc758d2 100644 --- a/src/components/Ecogram.js +++ b/src/components/Ecogram.js @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; function Ecogram() { - const { ecogram } = useSelector(state => state.locateResult); + const { ecogram } = useSelector((state) => state.locateResult); const { t } = useTranslation(); if (!ecogram) { diff --git a/src/components/LocationForm.js b/src/components/LocationForm.js index 74a3791a..09230055 100644 --- a/src/components/LocationForm.js +++ b/src/components/LocationForm.js @@ -8,7 +8,7 @@ import Dropdown from './Dropdown'; import styles from './LocationForm.module.css'; import { setFormLocation } from '../store/actions'; -const getDropdownOptions = (type, lng, includeKey = false) => key => ({ +const getDropdownOptions = (type, lng, includeKey = false) => (key) => ({ key, text: includeKey ? `${key} - ${info(type, key)[lng]}` : info(type, key)[lng], value: key, @@ -22,7 +22,7 @@ function LocationForm() { location, mapLocation, projectionMode, - } = useSelector(state => ({ + } = useSelector((state) => ({ formLocation: state.formLocation, locateResult: state.locateResult, location: state.location, @@ -30,7 +30,7 @@ function LocationForm() { projectionMode: state.projectionMode, })); const { t, i18n } = useTranslation(); - const isDifferent = field => mapLocation[field] !== formLocation[field]; + const isDifferent = (field) => mapLocation[field] !== formLocation[field]; return (
{projectionMode === 'f' && options.forestEcoregion && ( diff --git a/src/components/MapBaseLayer.js b/src/components/MapBaseLayer.js index 166a8d63..990f5425 100644 --- a/src/components/MapBaseLayer.js +++ b/src/components/MapBaseLayer.js @@ -5,7 +5,7 @@ import { LayerContext } from '../spatial/components/layer/Base'; import Button from './Button'; import styles from './MapBaseLayer.module.css'; -const getUrl = baseLayer => { +const getUrl = (baseLayer) => { const layer = baseLayer === 'map' ? 'ch.swisstopo.pixelkarte-grau' @@ -13,7 +13,7 @@ const getUrl = baseLayer => { return `https://wmts10.geo.admin.ch/1.0.0/${layer}/default/current/3857/{z}/{x}/{y}.jpeg`; }; -const toggle = baseLayer => (baseLayer === 'map' ? 'aerial' : 'map'); +const toggle = (baseLayer) => (baseLayer === 'map' ? 'aerial' : 'map'); function MapBaseLayer() { const { t } = useTranslation(); diff --git a/src/components/MapLocation.js b/src/components/MapLocation.js index 04c682f8..34daee8e 100644 --- a/src/components/MapLocation.js +++ b/src/components/MapLocation.js @@ -12,9 +12,12 @@ import Mapbox from '../spatial/components/layer/Mapbox'; import Vector from '../spatial/components/layer/Vector'; import { setMapLocation } from '../store/actions'; -const getKey = sl => - (layers.find(l => l['source-layer'] === sl && l.metadata) || { metadata: {} }) - .metadata.mapping; +const getKey = (sl) => + ( + layers.find((l) => l['source-layer'] === sl && l.metadata) || { + metadata: {}, + } + ).metadata.mapping; const featuresToLocation = (location, f) => ({ ...location, @@ -38,7 +41,7 @@ const vectorSource = new VectorSource({ function MapLocation() { const map = useContext(MapContext); const dispatch = useDispatch(); - const mapLocation = useSelector(state => state.mapLocation); + const mapLocation = useSelector((state) => state.mapLocation); useEffect(() => { const handleMapLocation = ({ coordinate }) => { @@ -46,7 +49,7 @@ function MapLocation() { const pixel = map.getPixelFromCoordinate(coordinate); const features = map.getFeaturesAtPixel(pixel) || []; const location = features - .filter(feature => feature.properties && feature.properties.code) + .filter((feature) => feature.properties && feature.properties.code) .reduce(featuresToLocation, {}); dispatch(setMapLocation({ ...location, coordinate })); }; @@ -54,7 +57,7 @@ function MapLocation() { const mapboxLayer = map .getLayers() .getArray() - .find(layer => layer instanceof Mapbox.Layer); + .find((layer) => layer instanceof Mapbox.Layer); if (mapboxLayer && mapLocation && mapLocation.coordinate) { const { coordinate } = mapLocation; mapboxLayer.on('loadend', () => handleMapLocation({ coordinate })); diff --git a/src/components/MapVectorLayer.js b/src/components/MapVectorLayer.js index b8251827..469e7108 100644 --- a/src/components/MapVectorLayer.js +++ b/src/components/MapVectorLayer.js @@ -12,13 +12,13 @@ const { REACT_APP_VECTOR_TILES_ENDPOINT: endpoint } = process.env; mapStyle.glyphs = `${endpoint}/fonts/{fontstack}/{range}.pbf`; mapStyle.sources.tree.tiles = [`${endpoint}/tree/{z}/{x}/{y}.pbf`]; -const getSourcLayer = layerId => - (mapStyle.layers.find(l => l.id === layerId) || {})['source-layer']; +const getSourcLayer = (layerId) => + (mapStyle.layers.find((l) => l.id === layerId) || {})['source-layer']; -const getStyle = sourceLayer => { +const getStyle = (sourceLayer) => { return { ...mapStyle, - layers: mapStyle.layers.map(layer => ({ + layers: mapStyle.layers.map((layer) => ({ ...layer, paint: layer.type === 'fill' @@ -33,19 +33,19 @@ const getStyle = sourceLayer => { })), }; }; -const getLayersByGroup = group => - mapStyle.layers.filter(l => l.metadata && l.metadata.group === group); +const getLayersByGroup = (group) => + mapStyle.layers.filter((l) => l.metadata && l.metadata.group === group); function MapVectorLayer() { const { t } = useTranslation(); const dispatch = useDispatch(); const layer = useContext(LayerContext); - const mapLayer = useSelector(state => state.mapLayer); + const mapLayer = useSelector((state) => state.mapLayer); const sourceLayer = getSourcLayer(mapLayer); const style = getStyle(sourceLayer); useMemo(() => layer.mapboxMap.setStyle(style), [layer, style]); - const getDropdownItem = l => ( + const getDropdownItem = (l) => ( { +const getMapViewString = (view) => { const [lon, lat] = view.getCenter(); const zoom = Math.round(view.getZoom()); return [zoom, Math.round(lon), Math.round(lat)].join('|'); }; -const parseMapViewString = mapViewString => { +const parseMapViewString = (mapViewString) => { const [zoom, lon, lat] = mapViewString.split('|'); return { center: [lon, lat], zoom }; }; @@ -22,7 +22,7 @@ const minZoom = 2; function MapView() { const map = useContext(MapContext); const dispatch = useDispatch(); - const mapViewString = useSelector(state => state.mapView); + const mapViewString = useSelector((state) => state.mapView); useEffect(() => { const { center, zoom } = parseMapViewString(mapViewString); const mapView = new View({ center, extent, maxZoom, minZoom, zoom }); diff --git a/src/components/Navigation.js b/src/components/Navigation.js index 9bc07a42..6ea26ed3 100644 --- a/src/components/Navigation.js +++ b/src/components/Navigation.js @@ -19,8 +19,8 @@ import styles from './Navigation.module.css'; function Navigation() { const history = useHistory(); const { pathname, search } = useLocation(); - const go = page => () => history.push(`/${page}${search}`); - const is = page => pathname === `/${page}`; + const go = (page) => () => history.push(`/${page}${search}`); + const is = (page) => pathname === `/${page}`; const { t } = useTranslation(); const isMobile = useIsMobile(); document.title = t('app.title'); diff --git a/src/components/ProjectionForm.js b/src/components/ProjectionForm.js index 0ce710e5..8b39d59f 100644 --- a/src/components/ProjectionForm.js +++ b/src/components/ProjectionForm.js @@ -11,12 +11,12 @@ import Dropdown from './Dropdown'; import { setFormLocation } from '../store/actions'; import styles from './ProjectionForm.module.css'; -const capitalize = text => text[0].toUpperCase() + text.slice(1); -const getButtonOptions = (type, lng) => key => ({ +const capitalize = (text) => text[0].toUpperCase() + text.slice(1); +const getButtonOptions = (type, lng) => (key) => ({ key, label: info(type, key)[lng], }); -const getDropdownOptions = (type, lng, includeKey = false) => key => ({ +const getDropdownOptions = (type, lng, includeKey = false) => (key) => ({ key, text: includeKey ? `${key} - ${info(type, key)[lng]}` : info(type, key)[lng], value: key, @@ -30,7 +30,7 @@ function ProjectionForm() { formLocation, projectionMode, projectionResult, - } = useSelector(state => ({ + } = useSelector((state) => ({ location: state.location, mapLocation: state.mapLocation, formLocation: state.formLocation, @@ -43,7 +43,7 @@ function ProjectionForm() { : projectionResult.form.options; const [fieldActive, setFieldActive] = useState(''); - const activateField = field => setFieldActive(field); + const activateField = (field) => setFieldActive(field); const deactivateField = () => setFieldActive(''); const getValue = (field, { first, transition } = {}) => { @@ -57,7 +57,7 @@ function ProjectionForm() { return value; }; - const isDifferent = field => mapLocation[field] !== formLocation[field]; + const isDifferent = (field) => mapLocation[field] !== formLocation[field]; const setLocation = (key, value) => { setFieldActive(''); @@ -118,7 +118,7 @@ function ProjectionForm() { ({ + options={[false, true].map((key) => ({ key: key.toString(), label: t(`projection.transition.${key}`), }))} diff --git a/src/components/ProjectionMode.js b/src/components/ProjectionMode.js index cc558d77..6f6196ff 100644 --- a/src/components/ProjectionMode.js +++ b/src/components/ProjectionMode.js @@ -12,14 +12,14 @@ import { EPSG2056 } from '../map/projection'; import { setProjectionMode } from '../store/actions'; import styles from './ProjectionMode.module.css'; -const formatCoordinates = coordinates => +const formatCoordinates = (coordinates) => transform(coordinates, 'EPSG:3857', EPSG2056) - .map(c => c.toFixed().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1'")) + .map((c) => c.toFixed().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1'")) .join(', '); function ProjectionMode() { const dispatch = useDispatch(); - const { coordinate, projectionMode } = useSelector(state => ({ + const { coordinate, projectionMode } = useSelector((state) => ({ coordinate: state.mapLocation.coordinate, projectionMode: state.projectionMode, })); diff --git a/src/components/ProjectionResult.js b/src/components/ProjectionResult.js index 4fac92c4..80009d29 100644 --- a/src/components/ProjectionResult.js +++ b/src/components/ProjectionResult.js @@ -68,11 +68,13 @@ function getPane(scenario, projection, language, t) { } function ProjectionResult() { - const { location, projectionMode, projectionResult } = useSelector(state => ({ - location: state.location, - projectionMode: state.projectionMode, - projectionResult: state.projectionResult, - })); + const { location, projectionMode, projectionResult } = useSelector( + (state) => ({ + location: state.location, + projectionMode: state.projectionMode, + projectionResult: state.projectionResult, + }), + ); const { i18n, t } = useTranslation(); const { altitudinalZone, forestType } = location; @@ -117,7 +119,7 @@ function ProjectionResult() { return altitudinalZone && forestType ? (
- {panes.filter(p => p).length > 1 ? ( + {panes.filter((p) => p).length > 1 ? ( ({ - location: state.location, - projectionMode: state.projectionMode, - projectionResult: state.projectionResult, - })); + const { location, projectionMode, projectionResult } = useSelector( + (state) => ({ + location: state.location, + projectionMode: state.projectionMode, + projectionResult: state.projectionResult, + }), + ); const recommendations = useMemo(() => { let projections; diff --git a/src/components/TreeTypeList.js b/src/components/TreeTypeList.js index 013a1c89..c1dad063 100644 --- a/src/components/TreeTypeList.js +++ b/src/components/TreeTypeList.js @@ -8,7 +8,7 @@ function TreeTypeList({ className, codes }) { return ( {codes - .map(code => { + .map((code) => { const treeInfo = info('treeType', code); return treeInfo[i18n.language] + (treeInfo.endangered ? '*' : ''); }) diff --git a/src/components/WelcomeModal.js b/src/components/WelcomeModal.js index 228f20fd..6a3c09bc 100644 --- a/src/components/WelcomeModal.js +++ b/src/components/WelcomeModal.js @@ -12,7 +12,7 @@ import styles from './WelcomeModal.module.css'; function WelcomeModal() { const { t } = useTranslation(); const dispatch = useDispatch(); - const welcomeModalOpen = useSelector(state => state.welcomeModalOpen); + const welcomeModalOpen = useSelector((state) => state.welcomeModalOpen); return ( {t('welcome.header')} diff --git a/src/serviceWorker.js b/src/serviceWorker.js index 77cbdb14..e156d654 100644 --- a/src/serviceWorker.js +++ b/src/serviceWorker.js @@ -58,7 +58,7 @@ export function register(config) { function registerValidSW(swUrl, config) { navigator.serviceWorker .register(swUrl) - .then(registration => { + .then((registration) => { registration.onupdatefound = () => { const installingWorker = registration.installing; if (installingWorker == null) { @@ -94,7 +94,7 @@ function registerValidSW(swUrl, config) { }; }; }) - .catch(error => { + .catch((error) => { console.error('Error during service worker registration:', error); }); } @@ -102,7 +102,7 @@ function registerValidSW(swUrl, config) { function checkValidServiceWorker(swUrl, config) { // Check if the service worker can be found. If it can't reload the page. fetch(swUrl) - .then(response => { + .then((response) => { // Ensure service worker exists, and that we really are getting a JS file. const contentType = response.headers.get('content-type'); if ( @@ -110,7 +110,7 @@ function checkValidServiceWorker(swUrl, config) { (contentType != null && contentType.indexOf('javascript') === -1) ) { // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { + navigator.serviceWorker.ready.then((registration) => { registration.unregister().then(() => { window.location.reload(); }); @@ -129,7 +129,7 @@ function checkValidServiceWorker(swUrl, config) { export function unregister() { if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then(registration => { + navigator.serviceWorker.ready.then((registration) => { registration.unregister(); }); } diff --git a/src/spatial/components/Map.js b/src/spatial/components/Map.js index 931f8da7..d2c638ef 100644 --- a/src/spatial/components/Map.js +++ b/src/spatial/components/Map.js @@ -10,7 +10,7 @@ function Map({ children, className, ...props }) { const map = useMemo( () => new OLMap(props), // eslint-disable-next-line react-hooks/exhaustive-deps - Object.values(props).map(prop => getUid(prop)), + Object.values(props).map((prop) => getUid(prop)), ); const target = useRef(null); diff --git a/src/spatial/renderer/Mapbox.js b/src/spatial/renderer/Mapbox.js index 24cb270f..315192c6 100644 --- a/src/spatial/renderer/Mapbox.js +++ b/src/spatial/renderer/Mapbox.js @@ -43,7 +43,7 @@ class MapboxRenderer { forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback) { const pixel = this.layer.map.getPixelFromCoordinate(coordinate); const features = this.layer.mapboxMap.queryRenderedFeatures(pixel) || []; - features.forEach(f => callback(f)); + features.forEach((f) => callback(f)); return features; } } diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js index de4329e7..5126dd20 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -33,7 +33,7 @@ const runProjection = (location, targetAltitudinalZone) => { return project(newLocation, newTargetAltitudinalZone); }; -const projection = store => next => action => { +const projection = (store) => (next) => (action) => { const result = next(action); if (projectionActionTypes.includes(action.type)) { const { formLocation, mapLocation, projectionMode } = store.getState(); diff --git a/src/store/enhancers/querySync.js b/src/store/enhancers/querySync.js index 8e6fa203..ac4201ee 100644 --- a/src/store/enhancers/querySync.js +++ b/src/store/enhancers/querySync.js @@ -12,71 +12,73 @@ import { initialState } from '../reducers'; const querySync = ReduxQuerySync.enhancer({ params: { flfe: { - selector: s => s.formLocation && s.formLocation.forestEcoregion, - action: forestEcoregion => setFormLocation({ forestEcoregion }), + selector: (s) => s.formLocation && s.formLocation.forestEcoregion, + action: (forestEcoregion) => setFormLocation({ forestEcoregion }), }, flaz: { - selector: s => s.formLocation && s.formLocation.altitudinalZone, - action: altitudinalZone => setFormLocation({ altitudinalZone }), + selector: (s) => s.formLocation && s.formLocation.altitudinalZone, + action: (altitudinalZone) => setFormLocation({ altitudinalZone }), }, fltraz: { - selector: s => s.formLocation && s.formLocation.transitionAltitudinalZone, - action: transitionAltitudinalZone => + selector: (s) => + s.formLocation && s.formLocation.transitionAltitudinalZone, + action: (transitionAltitudinalZone) => setFormLocation({ transitionAltitudinalZone }), }, flft: { - selector: s => s.formLocation && s.formLocation.forestType, - action: forestType => setFormLocation({ forestType }), + selector: (s) => s.formLocation && s.formLocation.forestType, + action: (forestType) => setFormLocation({ forestType }), }, flt: { - selector: s => s.formLocation && s.formLocation.transition, - valueToString: value => (value ? 't' : 'f'), - stringToValue: value => value === 't', - action: transition => setFormLocation({ transition }), + selector: (s) => s.formLocation && s.formLocation.transition, + valueToString: (value) => (value ? 't' : 'f'), + stringToValue: (value) => value === 't', + action: (transition) => setFormLocation({ transition }), }, fltft: { - selector: s => s.formLocation && s.formLocation.transitionForestType, - action: transitionForestType => setFormLocation({ transitionForestType }), + selector: (s) => s.formLocation && s.formLocation.transitionForestType, + action: (transitionForestType) => + setFormLocation({ transitionForestType }), }, fls: { - selector: s => s.formLocation && s.formLocation.slope, - action: slope => setFormLocation({ slope }), + selector: (s) => s.formLocation && s.formLocation.slope, + action: (slope) => setFormLocation({ slope }), }, fla: { - selector: s => s.formLocation && s.formLocation.additional, - action: additional => setFormLocation({ additional }), + selector: (s) => s.formLocation && s.formLocation.additional, + action: (additional) => setFormLocation({ additional }), }, flsfa: { - selector: s => s.formLocation && s.formLocation.silverFirArea, - action: silverFirArea => setFormLocation({ silverFirArea }), + selector: (s) => s.formLocation && s.formLocation.silverFirArea, + action: (silverFirArea) => setFormLocation({ silverFirArea }), }, flr: { - selector: s => s.formLocation && s.formLocation.relief, - action: relief => setFormLocation({ relief }), + selector: (s) => s.formLocation && s.formLocation.relief, + action: (relief) => setFormLocation({ relief }), }, fltaz: { - selector: s => s.formLocation && s.formLocation.targetAltitudinalZone, - action: targetAltitudinalZone => + selector: (s) => s.formLocation && s.formLocation.targetAltitudinalZone, + action: (targetAltitudinalZone) => setFormLocation({ targetAltitudinalZone }), }, ml: { - selector: state => state.mapLayer, + selector: (state) => state.mapLayer, action: setMapLayer, defaultValue: initialState.mapLayer, }, mp: { - selector: state => state.mapLocation && state.mapLocation.coordinate, - valueToString: value => value.map(c => Math.round(c)).join('|'), - stringToValue: value => value.split('|').map(parseFloat), - action: coordinate => setMapLocation({ coordinate }), + selector: (state) => state.mapLocation && state.mapLocation.coordinate, + valueToString: (value) => value.map((c) => Math.round(c)).join('|'), + stringToValue: (value) => value.split('|').map(parseFloat), + action: (coordinate) => setMapLocation({ coordinate }), }, mv: { - selector: state => state.mapView, + selector: (state) => state.mapView, action: setMapView, defaultValue: initialState.mapView, }, pm: { - selector: state => state.projectionMode, + selector: (state) => state.projectionMode, action: setProjectionMode, defaultValue: initialState.projectionMode, }, diff --git a/yarn.lock b/yarn.lock index e9e8cdfb..2f4ae9d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/compat-data@^7.8.4", "@babel/compat-data@^7.8.6": +"@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== @@ -18,22 +18,32 @@ invariant "^2.2.4" semver "^5.5.0" -"@babel/core@7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e" - integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA== +"@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== + dependencies: + browserslist "^4.9.1" + invariant "^2.2.4" + semver "^5.5.0" + +"@babel/core@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" + integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.4" - "@babel/helpers" "^7.8.4" - "@babel/parser" "^7.8.4" - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.4" - "@babel/types" "^7.8.3" + "@babel/generator" "^7.9.0" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helpers" "^7.9.0" + "@babel/parser" "^7.9.0" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" - json5 "^2.1.0" + json5 "^2.1.2" lodash "^4.17.13" resolve "^1.3.2" semver "^5.4.1" @@ -60,7 +70,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.8.4", "@babel/generator@^7.8.6": +"@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== @@ -70,6 +80,16 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89" + integrity sha512-onl4Oy46oGCzymOXtKMQpI7VXtCbTSHK1kqBydZ6AmzuNcacEVqGk9tZtAS+48IA9IstZcDCgIg8hQKnb7suRw== + dependencies: + "@babel/types" "^7.9.0" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" @@ -85,6 +105,15 @@ "@babel/helper-explode-assignable-expression" "^7.8.3" "@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== + 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" @@ -93,6 +122,14 @@ "@babel/types" "^7.8.3" esutils "^2.0.0" +"@babel/helper-builder-react-jsx@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32" + integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw== + dependencies: + "@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" @@ -102,7 +139,16 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.6": +"@babel/helper-call-delegate@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab" + integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ== + dependencies: + "@babel/helper-hoist-variables" "^7.8.3" + "@babel/traverse" "^7.8.3" + "@babel/types" "^7.8.7" + +"@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== @@ -113,6 +159,17 @@ 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" + integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw== + dependencies: + "@babel/compat-data" "^7.8.6" + browserslist "^4.9.1" + invariant "^2.2.4" + levenary "^1.1.1" + 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" @@ -134,6 +191,15 @@ "@babel/helper-regex" "^7.8.3" regexpu-core "^4.6.0" +"@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== + dependencies: + "@babel/helper-annotate-as-pure" "^7.8.3" + "@babel/helper-regex" "^7.8.3" + regexpu-core "^4.7.0" + "@babel/helper-define-map@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15" @@ -201,6 +267,19 @@ "@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" + integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA== + 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.9.0" + lodash "^4.17.13" + "@babel/helper-optimise-call-expression@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9" @@ -256,6 +335,11 @@ 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-wrap-function@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610" @@ -275,6 +359,15 @@ "@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" + integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA== + dependencies: + "@babel/template" "^7.8.3" + "@babel/traverse" "^7.9.0" + "@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" @@ -284,11 +377,16 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.8.4", "@babel/parser@^7.8.6": +"@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.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158" + integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA== + "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f" @@ -331,7 +429,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-proposal-nullish-coalescing-operator@7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2" integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw== @@ -339,7 +437,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@7.8.3": +"@babel/plugin-proposal-numeric-separator@7.8.3", "@babel/plugin-proposal-numeric-separator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8" integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ== @@ -355,6 +453,14 @@ "@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== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9" @@ -363,6 +469,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" +"@babel/plugin-proposal-optional-chaining@7.9.0", "@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58" + integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w== + dependencies: + "@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" @@ -371,6 +485,14 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" +"@babel/plugin-proposal-unicode-property-regex@^7.4.4": + 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== + dependencies: + "@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" @@ -428,7 +550,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.8.3": +"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f" integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw== @@ -501,7 +623,7 @@ "@babel/helper-plugin-utils" "^7.8.3" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.8.3", "@babel/plugin-transform-classes@^7.8.6": +"@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== @@ -515,6 +637,20 @@ "@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-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-computed-properties@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b" @@ -529,7 +665,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-dotall-regex@^7.8.3": +"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e" integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw== @@ -552,21 +688,28 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-flow-strip-types@7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz#da705a655466b2a9b36046b57bf0cbcd53551bd4" - integrity sha512-g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA== +"@babel/plugin-transform-flow-strip-types@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392" + integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow" "^7.8.3" -"@babel/plugin-transform-for-of@^7.8.4", "@babel/plugin-transform-for-of@^7.8.6": +"@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" + integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-function-name@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b" @@ -598,6 +741,15 @@ "@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" + integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@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" @@ -608,6 +760,16 @@ "@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" + integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@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-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" @@ -618,6 +780,16 @@ "@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" + integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ== + dependencies: + "@babel/helper-hoist-variables" "^7.8.3" + "@babel/helper-module-transforms" "^7.9.0" + "@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" @@ -626,6 +798,14 @@ "@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" + integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ== + dependencies: + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c" @@ -657,6 +837,15 @@ "@babel/helper-get-function-arity" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-parameters@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz#0381de466c85d5404565243660c4496459525daf" + integrity sha512-hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA== + dependencies: + "@babel/helper-call-delegate" "^7.8.7" + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-property-literals@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263" @@ -679,6 +868,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-react-jsx-development@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754" + integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw== + dependencies: + "@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-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" @@ -687,6 +885,14 @@ "@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" + integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ== + dependencies: + "@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" @@ -695,6 +901,14 @@ "@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" + integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw== + dependencies: + "@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" @@ -704,6 +918,16 @@ "@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== + 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" @@ -711,6 +935,13 @@ 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" + integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA== + dependencies: + regenerator-transform "^0.14.2" + "@babel/plugin-transform-reserved-words@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5" @@ -718,10 +949,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-runtime@7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169" - integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ== +"@babel/plugin-transform-runtime@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b" + integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw== dependencies: "@babel/helper-module-imports" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -765,10 +996,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-transform-typescript@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917" - integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ== +"@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== dependencies: "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" @@ -782,27 +1013,29 @@ "@babel/helper-create-regexp-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/preset-env@7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e" - integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w== +"@babel/preset-env@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" + integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ== dependencies: - "@babel/compat-data" "^7.8.4" - "@babel/helper-compilation-targets" "^7.8.4" + "@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.0" "@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" @@ -811,26 +1044,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.3" + "@babel/plugin-transform-classes" "^7.9.0" "@babel/plugin-transform-computed-properties" "^7.8.3" "@babel/plugin-transform-destructuring" "^7.8.3" "@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.4" + "@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.8.7" "@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" @@ -838,8 +1071,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.3" - browserslist "^4.8.5" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.9.0" + browserslist "^4.9.1" core-js-compat "^3.6.2" invariant "^2.2.2" levenary "^1.1.1" @@ -908,7 +1142,30 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/preset-react@7.8.3", "@babel/preset-react@^7.0.0": +"@babel/preset-modules@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" + integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/preset-react@7.9.1": + version "7.9.1" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz#b346403c36d58c3bb544148272a0cefd9c28677a" + integrity sha512-aJBYF23MPj0RNdp/4bHnAP0NVqqZRr9kl0NAOP4nJCex6OYVio59+dnQzsAWFuogdLyeaKA1hmfUIVZkY5J+TQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-react-display-name" "^7.8.3" + "@babel/plugin-transform-react-jsx" "^7.9.1" + "@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-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== @@ -919,13 +1176,13 @@ "@babel/plugin-transform-react-jsx-self" "^7.8.3" "@babel/plugin-transform-react-jsx-source" "^7.8.3" -"@babel/preset-typescript@7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz#90af8690121beecd9a75d0cc26c6be39d1595d13" - integrity sha512-qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA== +"@babel/preset-typescript@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192" + integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg== dependencies: "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-transform-typescript" "^7.8.3" + "@babel/plugin-transform-typescript" "^7.9.0" "@babel/runtime-corejs3@^7.8.3": version "7.8.7" @@ -935,13 +1192,27 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@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.6.3", "@babel/runtime@^7.7.2": +"@babel/runtime@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz#337eda67401f5b066a6f205a3113d4ac18ba495b" + integrity sha512-cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA== + 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": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06" + integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -951,7 +1222,7 @@ "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" -"@babel/traverse@^7.0.0", "@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": +"@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== @@ -966,6 +1237,21 @@ 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/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.0" + "@babel/types" "^7.9.0" + 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" @@ -975,6 +1261,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.7.0", "@babel/types@^7.8.7", "@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== + dependencies: + "@babel/helper-validator-identifier" "^7.9.0" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1011,10 +1306,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@geops/tree-lib@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@geops/tree-lib/-/tree-lib-1.3.0.tgz#32f857fb99a91ddc3c241df6bf82d7cf684d6b95" - integrity sha512-iSJ/OaW9GIvOrjpP0/h8haf/P1dMnXTe2V/G4zPYuJo+TmeHHVYyvzk5Jf9PJnMIq8R6ikyowr8xvEYq1Ndn5g== +"@geops/tree-lib@^1.3.1-beta.1": + version "1.3.1-beta.1" + resolved "https://registry.yarnpkg.com/@geops/tree-lib/-/tree-lib-1.3.1-beta.1.tgz#7cd631f75c506be7371e15a229d03d41924f8caf" + integrity sha512-bxq/s2k3/Ji+BUrOgI5QCmGNxgKSDheAGUvWB6ForQ9HBFcM8Pr+H4i2MvHA2fTwdmdA8Wk/QrAn91k6szH4Eg== dependencies: lodash.difference "^4.5.0" lodash.intersection "^4.4.0" @@ -1880,7 +2175,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: version "6.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== @@ -2207,15 +2502,15 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-eslint@10.0.3: - version "10.0.3" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" - integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA== +babel-eslint@10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" eslint-visitor-keys "^1.0.0" resolve "^1.12.0" @@ -2239,15 +2534,16 @@ babel-jest@^24.9.0: chalk "^2.4.2" slash "^2.0.0" -babel-loader@8.0.6: - version "8.0.6" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" - integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw== +babel-loader@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== dependencies: - find-cache-dir "^2.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.1" + find-cache-dir "^2.1.0" + loader-utils "^1.4.0" + mkdirp "^0.5.3" pify "^4.0.1" + schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" @@ -2313,22 +2609,24 @@ babel-preset-jest@^24.9.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.9.0" -babel-preset-react-app@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz#d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e" - integrity sha512-YkWP2UwY//TLltNlEBRngDOrYhvSLb+CA330G7T9M5UhGEMWe+JK/8IXJc5p2fDTSfSiETf+PY0+PYXFMix81Q== +babel-preset-react-app@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz#54775d976588a8a6d1a99201a702befecaf48030" + integrity sha512-k58RtQOKH21NyKtzptoAvtAODuAJJs3ZhqBMl456/GnXEQ/0La92pNmwgWoMn5pBTrsvk3YYXdY7zpY4e3UIxA== dependencies: - "@babel/core" "7.8.4" + "@babel/core" "7.9.0" "@babel/plugin-proposal-class-properties" "7.8.3" "@babel/plugin-proposal-decorators" "7.8.3" + "@babel/plugin-proposal-nullish-coalescing-operator" "7.8.3" "@babel/plugin-proposal-numeric-separator" "7.8.3" - "@babel/plugin-transform-flow-strip-types" "7.8.3" + "@babel/plugin-proposal-optional-chaining" "7.9.0" + "@babel/plugin-transform-flow-strip-types" "7.9.0" "@babel/plugin-transform-react-display-name" "7.8.3" - "@babel/plugin-transform-runtime" "7.8.3" - "@babel/preset-env" "7.8.4" - "@babel/preset-react" "7.8.3" - "@babel/preset-typescript" "7.8.3" - "@babel/runtime" "7.8.4" + "@babel/plugin-transform-runtime" "7.9.0" + "@babel/preset-env" "7.9.0" + "@babel/preset-react" "7.9.1" + "@babel/preset-typescript" "7.9.0" + "@babel/runtime" "7.9.0" babel-plugin-macros "2.8.0" babel-plugin-transform-react-remove-prop-types "0.4.24" @@ -2552,14 +2850,15 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@4.8.6: - version "4.8.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz#96406f3f5f0755d272e27a66f4163ca821590a7e" - integrity sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg== +browserslist@4.10.0, browserslist@^4.9.1: + version "4.10.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9" + integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA== dependencies: - caniuse-lite "^1.0.30001023" - electron-to-chromium "^1.3.341" - node-releases "^1.1.47" + caniuse-lite "^1.0.30001035" + electron-to-chromium "^1.3.378" + 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" @@ -2743,11 +3042,16 @@ 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.30001023, caniuse-lite@^1.0.30001030: +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.30001035" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e" + integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -3969,11 +4273,16 @@ 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.341, electron-to-chromium@^1.3.361: +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: + 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== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -4166,10 +4475,10 @@ eslint-config-prettier@^6.10.0: dependencies: get-stdin "^6.0.0" -eslint-config-react-app@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz#135110ba56a9e378f7acfe5f36e2ae76a2317899" - integrity sha512-WrHjoGpKr1kLLiWDD81tme9jMM0hk5cMxasLSdyno6DdPt+IfLOrDJBVo6jN7tn4y1nzhs43TmUaZWO6Sf0blw== +eslint-config-react-app@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df" + integrity sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ== dependencies: confusing-browser-globals "^1.0.9" @@ -4214,25 +4523,7 @@ eslint-plugin-flowtype@4.6.0: dependencies: lodash "^4.17.15" -eslint-plugin-import@2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz#d749a7263fb6c29980def8e960d380a6aa6aecaa" - integrity sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ== - dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" - contains-path "^0.1.0" - debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" - has "^1.0.3" - minimatch "^3.0.4" - object.values "^1.1.0" - read-pkg-up "^2.0.0" - resolve "^1.12.0" - -eslint-plugin-import@^2.20.1: +eslint-plugin-import@2.20.1, eslint-plugin-import@^2.20.1: version "2.20.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== @@ -4272,32 +4563,17 @@ eslint-plugin-prettier@^3.1.2: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react-hooks@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.0.tgz#c50ab7ca5945ce6d1cf8248d9e185c80b54171b6" - integrity sha512-bzvdX47Jx847bgAYf0FPX3u1oxU+mKU8tqrpj4UX9A96SbAmj/HVEefEy6rJUog5u8QIlOPTKZcBpGn5kkKfAQ== +eslint-plugin-react-hooks@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0" + integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g== eslint-plugin-react-hooks@^1.6.1: version "1.7.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04" integrity sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA== -eslint-plugin-react@7.18.0: - version "7.18.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz#2317831284d005b30aff8afb7c4e906f13fa8e7e" - integrity sha512-p+PGoGeV4SaZRDsXqdj9OWcOrOpZn8gXoGPcIQTzo2IDMbAKhNDnME9myZWqO3Ic4R3YmwAZ1lDjWl2R2hMUVQ== - dependencies: - array-includes "^3.1.1" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.14.2" - -eslint-plugin-react@^7.19.0: +eslint-plugin-react@7.19.0, eslint-plugin-react@^7.19.0: version "7.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ== @@ -4822,7 +5098,7 @@ find-cache-dir@^0.1.1: mkdirp "^0.5.1" pkg-dir "^1.0.0" -find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: +find-cache-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== @@ -6726,6 +7002,13 @@ json5@^2.1.0: 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== + dependencies: + minimist "^1.2.5" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -6972,7 +7255,7 @@ loader-utils@1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" -loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: +loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -7404,6 +7687,11 @@ minimist@1.2.2: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63" integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA== +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== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -7471,6 +7759,13 @@ mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1: 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" + moment@2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" @@ -7636,13 +7931,20 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-releases@^1.1.47, node-releases@^1.1.50: +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== 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== + dependencies: + semver "^6.3.0" + normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -8332,7 +8634,7 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-up@3.1.0: +pkg-up@3.1.0, pkg-up@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== @@ -8351,12 +8653,12 @@ pn@^1.1.0: resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== -pnp-webpack-plugin@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.0.tgz#d5c068013a2fdc82224ca50ed179c8fba9036a8e" - integrity sha512-ZcMGn/xF/fCOq+9kWMP9vVVxjIkMCja72oy3lziR7UHy0hHFZ57iVpQ71OtveVbmzeCmphBg8pxNdk/hlK99aQ== +pnp-webpack-plugin@1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" + integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== dependencies: - ts-pnp "^1.1.2" + ts-pnp "^1.1.6" popper.js@^1.14.4: version "1.16.1" @@ -9060,10 +9362,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.1.tgz#3f00ac71263be34684b2b2c8d7e7f63737592dac" + integrity sha512-piXGBcY1zoFOG0MvHpNE5reAGseLmaCRifQ/fmfF49BcYkInEs/naD/unxGNAeOKFA5+JxVrPyMvMlpzcd20UA== pretty-bytes@5.3.0, pretty-bytes@^5.1.0: version "5.3.0" @@ -9088,7 +9390,7 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -private@^0.1.6: +private@^0.1.6, 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== @@ -9331,14 +9633,14 @@ react-app-polyfill@^1.0.6: regenerator-runtime "^0.13.3" whatwg-fetch "^3.0.0" -react-dev-utils@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz#b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0" - integrity sha512-MwrvQW2TFjLblhqpDNeqCXHBkz3G5vc7k4wntgutAJZX4ia3o07eGKo6uYGhUOeJ0hfOxcpJFNFk7+4XCc1S8g== +react-dev-utils@^10.2.1: + version "10.2.1" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19" + integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ== dependencies: "@babel/code-frame" "7.8.3" address "1.1.2" - browserslist "4.8.6" + browserslist "4.10.0" chalk "2.4.2" cross-spawn "7.0.1" detect-port-alt "1.1.6" @@ -9355,31 +9657,31 @@ react-dev-utils@^10.2.0: loader-utils "1.2.3" open "^7.0.2" pkg-up "3.1.0" - react-error-overlay "^6.0.6" + react-error-overlay "^6.0.7" recursive-readdir "2.2.2" shell-quote "1.7.2" strip-ansi "6.0.0" text-table "0.2.0" -react-dom@^16.12.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866" - integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg== +react-dom@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" + integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.19.0" + scheduler "^0.19.1" -react-error-overlay@^6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz#ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2" - integrity sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw== +react-error-overlay@^6.0.7: + version "6.0.7" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" + integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA== -react-i18next@^11.3.1: - version "11.3.3" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.3.3.tgz#a84dcc32e3ad013012964d836790d8c6afac8e88" - integrity sha512-sGnPwJ0Kf8qTRLTnTRk030KiU6WYEZ49rP9ILPvCnsmgEKyucQfTxab+klSYnCSKYija+CWL+yo+c9va9BmJeg== +react-i18next@^11.3.4: + version "11.3.4" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.3.4.tgz#355df5fe5133e5e30302d166f529678100ffc968" + integrity sha512-IRZMD7PAM3C+fJNzRbyLNi1ZD0kc3Z3obBspJjEl+9H+ME41PhVor3BpdIqv/Rm7lUoGhMjmpu42J45ooJ61KA== dependencies: "@babel/runtime" "^7.3.1" html-parse-stringify2 "2.0.1" @@ -9442,32 +9744,32 @@ react-router@5.1.2: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-scripts@^3.3.1: - version "3.4.0" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.0.tgz#f413680f0b5b937c8879ba1ffdae9b8c5b364bf5" - integrity sha512-pBqaAroFoHnFAkuX+uSK9Th1uEh2GYdGY2IG1I9/7HmuEf+ls3lLCk1p2GFYRSrLMz6ieQR/SyN6TLIGK3hKRg== +react-scripts@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz#f551298b5c71985cc491b9acf3c8e8c0ae3ada0a" + integrity sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ== dependencies: - "@babel/core" "7.8.4" + "@babel/core" "7.9.0" "@svgr/webpack" "4.3.3" "@typescript-eslint/eslint-plugin" "^2.10.0" "@typescript-eslint/parser" "^2.10.0" - babel-eslint "10.0.3" + babel-eslint "10.1.0" babel-jest "^24.9.0" - babel-loader "8.0.6" + babel-loader "8.1.0" babel-plugin-named-asset-import "^0.3.6" - babel-preset-react-app "^9.1.1" + babel-preset-react-app "^9.1.2" camelcase "^5.3.1" case-sensitive-paths-webpack-plugin "2.3.0" css-loader "3.4.2" dotenv "8.2.0" dotenv-expand "5.1.0" eslint "^6.6.0" - eslint-config-react-app "^5.2.0" + eslint-config-react-app "^5.2.1" eslint-loader "3.0.3" eslint-plugin-flowtype "4.6.0" - eslint-plugin-import "2.20.0" + eslint-plugin-import "2.20.1" eslint-plugin-jsx-a11y "6.2.3" - eslint-plugin-react "7.18.0" + eslint-plugin-react "7.19.0" eslint-plugin-react-hooks "^1.6.1" file-loader "4.3.0" fs-extra "^8.1.0" @@ -9479,38 +9781,38 @@ react-scripts@^3.3.1: jest-watch-typeahead "0.4.2" mini-css-extract-plugin "0.9.0" optimize-css-assets-webpack-plugin "5.0.3" - pnp-webpack-plugin "1.6.0" + pnp-webpack-plugin "1.6.4" postcss-flexbugs-fixes "4.1.0" postcss-loader "3.0.0" postcss-normalize "8.0.1" postcss-preset-env "6.7.0" postcss-safe-parser "4.0.1" react-app-polyfill "^1.0.6" - react-dev-utils "^10.2.0" + react-dev-utils "^10.2.1" resolve "1.15.0" resolve-url-loader "3.1.1" sass-loader "8.0.2" semver "6.3.0" style-loader "0.23.1" - terser-webpack-plugin "2.3.4" - ts-pnp "1.1.5" + terser-webpack-plugin "2.3.5" + ts-pnp "1.1.6" url-loader "2.3.0" - webpack "4.41.5" - webpack-dev-server "3.10.2" + webpack "4.42.0" + webpack-dev-server "3.10.3" webpack-manifest-plugin "2.2.0" workbox-webpack-plugin "4.3.1" optionalDependencies: fsevents "2.1.2" -react-test-renderer@^16.13.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.0.tgz#39ba3bf72cedc8210c3f81983f0bb061b14a3014" - integrity sha512-NQ2S9gdMUa7rgPGpKGyMcwl1d6D9MCF0lftdI3kts6kkiX+qvpC955jNjAZXlIDTjnN9jwFI8A8XhRh/9v0spA== +react-test-renderer@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1" + integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ== dependencies: object-assign "^4.1.1" prop-types "^15.6.2" react-is "^16.8.6" - scheduler "^0.19.0" + scheduler "^0.19.1" react-toastify@^5.5.0: version "5.5.0" @@ -9532,10 +9834,10 @@ react-transition-group@^4: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^16.12.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" - integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== +react@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -9657,6 +9959,13 @@ regenerate-unicode-properties@^8.1.0: 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" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== + dependencies: + regenerate "^1.4.0" + regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -9684,6 +9993,14 @@ regenerator-transform@^0.14.0: dependencies: private "^0.1.6" +regenerator-transform@^0.14.2: + version "0.14.4" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" + integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw== + dependencies: + "@babel/runtime" "^7.8.4" + private "^0.1.8" + regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -9727,7 +10044,19 @@ regexpu-core@^4.6.0: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.1.0" -regjsgen@^0.5.0: +regexpu-core@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" + integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.2.0" + +regjsgen@^0.5.0, regjsgen@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== @@ -9739,6 +10068,13 @@ regjsparser@^0.6.0: 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" + integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw== + dependencies: + jsesc "~0.5.0" + relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" @@ -9819,7 +10155,7 @@ request@^2.87.0, request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" -"request@github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16": +request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16: version "2.88.1" resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16" dependencies: @@ -9926,7 +10262,7 @@ resolve@1.15.0: dependencies: path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -10108,10 +10444,10 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" -scheduler@^0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d" - integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA== +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -10133,6 +10469,14 @@ schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6 ajv "^6.10.2" ajv-keywords "^3.4.1" +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== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -10946,10 +11290,10 @@ 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== -terser-webpack-plugin@2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.4.tgz#ac045703bd8da0936ce910d8fb6350d0e1dee5fe" - integrity sha512-Nv96Nws2R2nrFOpbzF6IxRDpIkkIfmhvOws+IqMvYdFLO7o6wAILWFKONFgaYy8+T4LVz77DQW0f7wOeDEAjrg== +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" + integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w== dependencies: cacache "^13.0.1" find-cache-dir "^3.2.0" @@ -11136,12 +11480,7 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -ts-pnp@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz#840e0739c89fce5f3abd9037bb091dbff16d9dec" - integrity sha512-ti7OGMOUOzo66wLF3liskw6YQIaSsBgc4GOAlWRnIEj8htCxJUxskanMUoJOD6MDCRAXo36goXJZch+nOS0VMA== - -ts-pnp@^1.1.2: +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== @@ -11233,6 +11572,11 @@ unicode-match-property-value-ecmascript@^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" @@ -11529,10 +11873,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.10.2: - version "3.10.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.2.tgz#3403287d674c7407aab6d9b3f72259ecd0aa0874" - integrity sha512-pxZKPYb+n77UN8u9YxXT4IaIrGcNtijh/mi8TXbErHmczw0DtPnMTTjHj+eNjkqLOaAZM/qD7V59j/qJsEiaZA== +webpack-dev-server@3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" + integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -11594,10 +11938,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4.41.5: - version "4.41.5" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c" - integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw== +webpack@4.42.0: + version "4.42.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" + integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" From fb7bc0294b3e839707532d7e3c57440f33b3d0c0 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 8 Apr 2020 06:50:42 +0200 Subject: [PATCH 10/13] chore: do not run unit tests in git hooks to speed up commits --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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": { From 3580a80b6017a2c828bb56675f7f5a26c56ab0ea Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Wed, 8 Apr 2020 10:50:33 +0200 Subject: [PATCH 11/13] feat: merge hochmontan into single altitudinal zone --- lib/data/projections.json | 1902 +++++++++++------------ lib/data/sql/V3__create_types.sql | 22 +- lib/data/sql/V5__export_projections.sql | 19 +- lib/data/types.json | 548 ++++--- lib/src/project.js | 9 +- lib/test/project.fixtures.json | 6 +- lib/test/project.test.js | 49 +- 7 files changed, 1277 insertions(+), 1278 deletions(-) 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..4e99b43f 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) 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', () => { From b114ac80016e3b613fecfc498b0bde6f2da73293 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Thu, 9 Apr 2020 07:14:32 +0200 Subject: [PATCH 12/13] feat: handle hochmontan altitudinal zones for locate function --- src/store/enhancers/projection.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/store/enhancers/projection.js b/src/store/enhancers/projection.js index ea994e71..8420fe36 100644 --- a/src/store/enhancers/projection.js +++ b/src/store/enhancers/projection.js @@ -20,7 +20,7 @@ const projectionActionTypes = [ export const hochmontanAltitudinalZones = ['81', '82', '83']; -const runProjection = (location, targetAltitudinalZone) => { +const runProject = (location, targetAltitudinalZone) => { let newTargetAltitudinalZone = targetAltitudinalZone; let { altitudinalZone, silverFirArea } = location; if (hochmontanAltitudinalZones.includes(targetAltitudinalZone)) { @@ -34,6 +34,16 @@ const runProjection = (location, targetAltitudinalZone) => { 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)) { @@ -49,7 +59,7 @@ const projection = (store) => (next) => (action) => { store.dispatch(setLocation(location)); try { - const locateResult = locate(location); + const locateResult = runLocate(location); store.dispatch(setLocationResult(locateResult)); } catch (error) { console.log('Locate error: ', error); @@ -62,11 +72,11 @@ const projection = (store) => (next) => (action) => { targetAltitudinalZoneModerate: targetAZModerate, targetAltitudinalZoneExtreme: targetAZExtreme, } = mapLocation; - projectionResult.moderate = runProjection(location, targetAZModerate); - projectionResult.extreme = runProjection(location, targetAZExtreme); + projectionResult.moderate = runProject(location, targetAZModerate); + projectionResult.extreme = runProject(location, targetAZExtreme); } else { const { targetAltitudinalZone: targetAZForm } = formLocation; - projectionResult.form = runProjection(location, targetAZForm); + projectionResult.form = runProject(location, targetAZForm); } store.dispatch(setProjectionResult(projectionResult)); } catch (error) { From 35b472e6dfea57e502399da1d670bf7addf82783 Mon Sep 17 00:00:00 2001 From: Friedjoff Trautwein Date: Thu, 9 Apr 2020 07:15:53 +0200 Subject: [PATCH 13/13] fix: remove remaining references to deprecated hochmontan zones --- lib/data/locations.json | 46 ++++++------------------------- lib/data/nais/ecogram.js | 9 ++---- lib/data/sql/V3__create_types.sql | 10 +++---- 3 files changed, 14 insertions(+), 51 deletions(-) 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/sql/V3__create_types.sql b/lib/data/sql/V3__create_types.sql index 4e99b43f..c677c893 100644 --- a/lib/data/sql/V3__create_types.sql +++ b/lib/data/sql/V3__create_types.sql @@ -577,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' @@ -851,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