diff --git a/package-lock.json b/package-lock.json
index 9de4864..66f2601 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,15 +50,15 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.13.12",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
- "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
+ "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
"dev": true
},
"node_modules/@babel/core": {
- "version": "7.13.14",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
- "integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.15.tgz",
+ "integrity": "sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.12.13",
@@ -66,9 +66,9 @@
"@babel/helper-compilation-targets": "^7.13.13",
"@babel/helper-module-transforms": "^7.13.14",
"@babel/helpers": "^7.13.10",
- "@babel/parser": "^7.13.13",
+ "@babel/parser": "^7.13.15",
"@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.13",
+ "@babel/traverse": "^7.13.15",
"@babel/types": "^7.13.14",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
@@ -160,9 +160,9 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
- "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz",
+ "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==",
"dev": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.13.0",
@@ -363,9 +363,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.13.13",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
- "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz",
+ "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -389,9 +389,9 @@
}
},
"node_modules/@babel/plugin-proposal-async-generator-functions": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz",
- "integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz",
+ "integrity": "sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==",
"dev": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.13.0",
@@ -416,12 +416,12 @@
}
},
"node_modules/@babel/plugin-proposal-decorators": {
- "version": "7.13.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz",
- "integrity": "sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz",
+ "integrity": "sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==",
"dev": true,
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
+ "@babel/helper-create-class-features-plugin": "^7.13.11",
"@babel/helper-plugin-utils": "^7.13.0",
"@babel/plugin-syntax-decorators": "^7.12.13"
},
@@ -1034,9 +1034,9 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.12.13",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
- "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz",
+ "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==",
"dev": true,
"dependencies": {
"regenerator-transform": "^0.14.2"
@@ -1058,16 +1058,16 @@
}
},
"node_modules/@babel/plugin-transform-runtime": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz",
- "integrity": "sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz",
+ "integrity": "sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==",
"dev": true,
"dependencies": {
- "@babel/helper-module-imports": "^7.12.13",
+ "@babel/helper-module-imports": "^7.13.12",
"@babel/helper-plugin-utils": "^7.13.0",
- "babel-plugin-polyfill-corejs2": "^0.1.4",
- "babel-plugin-polyfill-corejs3": "^0.1.3",
- "babel-plugin-polyfill-regenerator": "^0.1.2",
+ "babel-plugin-polyfill-corejs2": "^0.2.0",
+ "babel-plugin-polyfill-corejs3": "^0.2.0",
+ "babel-plugin-polyfill-regenerator": "^0.2.0",
"semver": "^6.3.0"
},
"peerDependencies": {
@@ -1161,17 +1161,17 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.13.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz",
- "integrity": "sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.15.tgz",
+ "integrity": "sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==",
"dev": true,
"dependencies": {
- "@babel/compat-data": "^7.13.12",
- "@babel/helper-compilation-targets": "^7.13.10",
+ "@babel/compat-data": "^7.13.15",
+ "@babel/helper-compilation-targets": "^7.13.13",
"@babel/helper-plugin-utils": "^7.13.0",
"@babel/helper-validator-option": "^7.12.17",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
+ "@babel/plugin-proposal-async-generator-functions": "^7.13.15",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-dynamic-import": "^7.13.8",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
@@ -1219,7 +1219,7 @@
"@babel/plugin-transform-object-super": "^7.12.13",
"@babel/plugin-transform-parameters": "^7.13.0",
"@babel/plugin-transform-property-literals": "^7.12.13",
- "@babel/plugin-transform-regenerator": "^7.12.13",
+ "@babel/plugin-transform-regenerator": "^7.13.15",
"@babel/plugin-transform-reserved-words": "^7.12.13",
"@babel/plugin-transform-shorthand-properties": "^7.12.13",
"@babel/plugin-transform-spread": "^7.13.0",
@@ -1229,10 +1229,10 @@
"@babel/plugin-transform-unicode-escapes": "^7.12.13",
"@babel/plugin-transform-unicode-regex": "^7.12.13",
"@babel/preset-modules": "^0.1.4",
- "@babel/types": "^7.13.12",
- "babel-plugin-polyfill-corejs2": "^0.1.4",
- "babel-plugin-polyfill-corejs3": "^0.1.3",
- "babel-plugin-polyfill-regenerator": "^0.1.2",
+ "@babel/types": "^7.13.14",
+ "babel-plugin-polyfill-corejs2": "^0.2.0",
+ "babel-plugin-polyfill-corejs3": "^0.2.0",
+ "babel-plugin-polyfill-regenerator": "^0.2.0",
"core-js-compat": "^3.9.0",
"semver": "^6.3.0"
},
@@ -1277,17 +1277,17 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.13.13",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
- "integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.15.tgz",
+ "integrity": "sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.13.9",
"@babel/helper-function-name": "^7.12.13",
"@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/parser": "^7.13.13",
- "@babel/types": "^7.13.13",
+ "@babel/parser": "^7.13.15",
+ "@babel/types": "^7.13.14",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
@@ -1360,9 +1360,9 @@
}
},
"node_modules/@types/eslint": {
- "version": "7.2.8",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.8.tgz",
- "integrity": "sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ==",
+ "version": "7.2.9",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.9.tgz",
+ "integrity": "sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA==",
"dev": true,
"dependencies": {
"@types/estree": "*",
@@ -1622,9 +1622,9 @@
"dev": true
},
"node_modules/acorn": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
- "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
+ "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -1854,13 +1854,13 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
- "version": "0.1.10",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
- "integrity": "sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz",
+ "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==",
"dev": true,
"dependencies": {
- "@babel/compat-data": "^7.13.0",
- "@babel/helper-define-polyfill-provider": "^0.1.5",
+ "@babel/compat-data": "^7.13.11",
+ "@babel/helper-define-polyfill-provider": "^0.2.0",
"semver": "^6.1.1"
},
"peerDependencies": {
@@ -1868,34 +1868,34 @@
}
},
"node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
- "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz",
+ "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==",
"dev": true,
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.1.5",
- "core-js-compat": "^3.8.1"
+ "@babel/helper-define-polyfill-provider": "^0.2.0",
+ "core-js-compat": "^3.9.1"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz",
- "integrity": "sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz",
+ "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==",
"dev": true,
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.1.5"
+ "@babel/helper-define-polyfill-provider": "^0.2.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/balanced-match": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.1.tgz",
- "integrity": "sha512-qyTw2VPYRg31SlVU5WDdvCSyMTJ3YSP4Kz2CidWZFPFawCiHJdCyKyZeXIGMJ5ebMQYXEI56kDR8tcnDkbZstg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
"node_modules/bcrypt-pbkdf": {
@@ -2021,9 +2021,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001207",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
- "integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==",
+ "version": "1.0.30001208",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
+ "integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
"dev": true
},
"node_modules/caseless": {
@@ -2056,13 +2056,10 @@
}
},
"node_modules/chrome-trace-event": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
- "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
"dev": true,
- "dependencies": {
- "tslib": "^1.9.0"
- },
"engines": {
"node": ">=6.0"
}
@@ -2329,9 +2326,9 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.0.tgz",
- "integrity": "sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz",
+ "integrity": "sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==",
"dev": true,
"dependencies": {
"browserslist": "^4.16.3",
@@ -2384,9 +2381,9 @@
}
},
"node_modules/css-loader": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
- "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz",
+ "integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==",
"dev": true,
"dependencies": {
"camelcase": "^6.2.0",
@@ -2516,9 +2513,9 @@
}
},
"node_modules/date-fns": {
- "version": "2.19.0",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.19.0.tgz",
- "integrity": "sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg==",
+ "version": "2.20.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.20.1.tgz",
+ "integrity": "sha512-8P5M8Kxbnovd0zfvOs7ipkiVJ3/zZQ0F/nrBW4x5E+I0uAZVZ80h6CKd24fSXQ5TLK5hXMtI4yb2O5rEZdUt2A==",
"dev": true,
"engines": {
"node": ">=0.11"
@@ -2623,9 +2620,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.3.708",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
- "integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw==",
+ "version": "1.3.712",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz",
+ "integrity": "sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw==",
"dev": true
},
"node_modules/emoji-regex": {
@@ -3319,9 +3316,9 @@
"dev": true
},
"node_modules/hosted-git-info": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
- "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"node_modules/http-signature": {
@@ -3932,17 +3929,17 @@
"integrity": "sha1-+5FYjnjJACVnI5XLQLJffNatGCk="
},
"node_modules/micromatch": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
- "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+ "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
"dev": true,
"peer": true,
"dependencies": {
"braces": "^3.0.1",
- "picomatch": "^2.0.5"
+ "picomatch": "^2.2.3"
},
"engines": {
- "node": ">=8"
+ "node": ">=8.6"
}
},
"node_modules/mime-db": {
@@ -3976,9 +3973,9 @@
}
},
"node_modules/mini-css-extract-plugin": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.0.tgz",
- "integrity": "sha512-DyQr5DhXXARKZoc4kwvCvD95kh69dUupfuKOmBUqZ4kBTmRaRZcU32lYu3cLd6nEGXhQ1l7LzZ3F/CjItaY6VQ==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz",
+ "integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==",
"dev": true,
"dependencies": {
"loader-utils": "^2.0.0",
@@ -4489,9 +4486,9 @@
"dev": true
},
"node_modules/picomatch": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
- "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+ "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
"dev": true,
"peer": true,
"engines": {
@@ -4544,9 +4541,9 @@
}
},
"node_modules/postcss": {
- "version": "8.2.9",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.9.tgz",
- "integrity": "sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q==",
+ "version": "8.2.10",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz",
+ "integrity": "sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==",
"dev": true,
"dependencies": {
"colorette": "^1.2.2",
@@ -5372,9 +5369,9 @@
}
},
"node_modules/sass-graph/node_modules/y18n": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
- "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
"dev": true
},
"node_modules/sass-graph/node_modules/yargs": {
@@ -6223,9 +6220,9 @@
}
},
"node_modules/webpack": {
- "version": "5.30.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.30.0.tgz",
- "integrity": "sha512-Zr9NIri5yzpfmaMea2lSMV1UygbW0zQsSlGLMgKUm63ACXg6alhd1u4v5UBSBjzYKXJN6BNMGVM7w165e7NxYA==",
+ "version": "5.31.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.2.tgz",
+ "integrity": "sha512-0bCQe4ybo7T5Z0SC5axnIAH+1WuIdV4FwLYkaAlLtvfBhIx8bPS48WHTfiRZS1VM+pSiYt7e/rgLs3gLrH82lQ==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -6536,9 +6533,9 @@
"dev": true
},
"node_modules/y18n": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.6.tgz",
- "integrity": "sha512-PlVX4Y0lDTN6E2V4ES2tEdyvXkeKzxa8c/vo0pxPr/TqbztddTP0yn7zZylIyiAuxerqj0Q5GhpJ1YJCP8LaZQ==",
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true,
"engines": {
"node": ">=10"
@@ -6645,15 +6642,15 @@
}
},
"@babel/compat-data": {
- "version": "7.13.12",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
- "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
+ "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
"dev": true
},
"@babel/core": {
- "version": "7.13.14",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
- "integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.15.tgz",
+ "integrity": "sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.12.13",
@@ -6661,9 +6658,9 @@
"@babel/helper-compilation-targets": "^7.13.13",
"@babel/helper-module-transforms": "^7.13.14",
"@babel/helpers": "^7.13.10",
- "@babel/parser": "^7.13.13",
+ "@babel/parser": "^7.13.15",
"@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.13",
+ "@babel/traverse": "^7.13.15",
"@babel/types": "^7.13.14",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
@@ -6739,9 +6736,9 @@
}
},
"@babel/helper-define-polyfill-provider": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
- "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz",
+ "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==",
"dev": true,
"requires": {
"@babel/helper-compilation-targets": "^7.13.0",
@@ -6939,9 +6936,9 @@
}
},
"@babel/parser": {
- "version": "7.13.13",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
- "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz",
+ "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==",
"dev": true
},
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
@@ -6956,9 +6953,9 @@
}
},
"@babel/plugin-proposal-async-generator-functions": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz",
- "integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz",
+ "integrity": "sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==",
"dev": true,
"requires": {
"@babel/helper-plugin-utils": "^7.13.0",
@@ -6977,12 +6974,12 @@
}
},
"@babel/plugin-proposal-decorators": {
- "version": "7.13.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz",
- "integrity": "sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz",
+ "integrity": "sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==",
"dev": true,
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
+ "@babel/helper-create-class-features-plugin": "^7.13.11",
"@babel/helper-plugin-utils": "^7.13.0",
"@babel/plugin-syntax-decorators": "^7.12.13"
}
@@ -7448,9 +7445,9 @@
}
},
"@babel/plugin-transform-regenerator": {
- "version": "7.12.13",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
- "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz",
+ "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==",
"dev": true,
"requires": {
"regenerator-transform": "^0.14.2"
@@ -7466,16 +7463,16 @@
}
},
"@babel/plugin-transform-runtime": {
- "version": "7.13.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz",
- "integrity": "sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz",
+ "integrity": "sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==",
"dev": true,
"requires": {
- "@babel/helper-module-imports": "^7.12.13",
+ "@babel/helper-module-imports": "^7.13.12",
"@babel/helper-plugin-utils": "^7.13.0",
- "babel-plugin-polyfill-corejs2": "^0.1.4",
- "babel-plugin-polyfill-corejs3": "^0.1.3",
- "babel-plugin-polyfill-regenerator": "^0.1.2",
+ "babel-plugin-polyfill-corejs2": "^0.2.0",
+ "babel-plugin-polyfill-corejs3": "^0.2.0",
+ "babel-plugin-polyfill-regenerator": "^0.2.0",
"semver": "^6.3.0"
}
},
@@ -7545,17 +7542,17 @@
}
},
"@babel/preset-env": {
- "version": "7.13.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz",
- "integrity": "sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.15.tgz",
+ "integrity": "sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==",
"dev": true,
"requires": {
- "@babel/compat-data": "^7.13.12",
- "@babel/helper-compilation-targets": "^7.13.10",
+ "@babel/compat-data": "^7.13.15",
+ "@babel/helper-compilation-targets": "^7.13.13",
"@babel/helper-plugin-utils": "^7.13.0",
"@babel/helper-validator-option": "^7.12.17",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
+ "@babel/plugin-proposal-async-generator-functions": "^7.13.15",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-dynamic-import": "^7.13.8",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
@@ -7603,7 +7600,7 @@
"@babel/plugin-transform-object-super": "^7.12.13",
"@babel/plugin-transform-parameters": "^7.13.0",
"@babel/plugin-transform-property-literals": "^7.12.13",
- "@babel/plugin-transform-regenerator": "^7.12.13",
+ "@babel/plugin-transform-regenerator": "^7.13.15",
"@babel/plugin-transform-reserved-words": "^7.12.13",
"@babel/plugin-transform-shorthand-properties": "^7.12.13",
"@babel/plugin-transform-spread": "^7.13.0",
@@ -7613,10 +7610,10 @@
"@babel/plugin-transform-unicode-escapes": "^7.12.13",
"@babel/plugin-transform-unicode-regex": "^7.12.13",
"@babel/preset-modules": "^0.1.4",
- "@babel/types": "^7.13.12",
- "babel-plugin-polyfill-corejs2": "^0.1.4",
- "babel-plugin-polyfill-corejs3": "^0.1.3",
- "babel-plugin-polyfill-regenerator": "^0.1.2",
+ "@babel/types": "^7.13.14",
+ "babel-plugin-polyfill-corejs2": "^0.2.0",
+ "babel-plugin-polyfill-corejs3": "^0.2.0",
+ "babel-plugin-polyfill-regenerator": "^0.2.0",
"core-js-compat": "^3.9.0",
"semver": "^6.3.0"
}
@@ -7655,17 +7652,17 @@
}
},
"@babel/traverse": {
- "version": "7.13.13",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
- "integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
+ "version": "7.13.15",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.15.tgz",
+ "integrity": "sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.13.9",
"@babel/helper-function-name": "^7.12.13",
"@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/parser": "^7.13.13",
- "@babel/types": "^7.13.13",
+ "@babel/parser": "^7.13.15",
+ "@babel/types": "^7.13.14",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
@@ -7722,9 +7719,9 @@
}
},
"@types/eslint": {
- "version": "7.2.8",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.8.tgz",
- "integrity": "sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ==",
+ "version": "7.2.9",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.9.tgz",
+ "integrity": "sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA==",
"dev": true,
"requires": {
"@types/estree": "*",
@@ -7971,9 +7968,9 @@
"dev": true
},
"acorn": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
- "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
+ "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
"dev": true
},
"adjust-sourcemap-loader": {
@@ -8147,39 +8144,39 @@
}
},
"babel-plugin-polyfill-corejs2": {
- "version": "0.1.10",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
- "integrity": "sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz",
+ "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==",
"dev": true,
"requires": {
- "@babel/compat-data": "^7.13.0",
- "@babel/helper-define-polyfill-provider": "^0.1.5",
+ "@babel/compat-data": "^7.13.11",
+ "@babel/helper-define-polyfill-provider": "^0.2.0",
"semver": "^6.1.1"
}
},
"babel-plugin-polyfill-corejs3": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
- "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz",
+ "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==",
"dev": true,
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.1.5",
- "core-js-compat": "^3.8.1"
+ "@babel/helper-define-polyfill-provider": "^0.2.0",
+ "core-js-compat": "^3.9.1"
}
},
"babel-plugin-polyfill-regenerator": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz",
- "integrity": "sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz",
+ "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==",
"dev": true,
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.1.5"
+ "@babel/helper-define-polyfill-provider": "^0.2.0"
}
},
"balanced-match": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.1.tgz",
- "integrity": "sha512-qyTw2VPYRg31SlVU5WDdvCSyMTJ3YSP4Kz2CidWZFPFawCiHJdCyKyZeXIGMJ5ebMQYXEI56kDR8tcnDkbZstg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
"bcrypt-pbkdf": {
@@ -8276,9 +8273,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001207",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
- "integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==",
+ "version": "1.0.30001208",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
+ "integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
"dev": true
},
"caseless": {
@@ -8305,13 +8302,10 @@
"dev": true
},
"chrome-trace-event": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
- "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
- "dev": true,
- "requires": {
- "tslib": "^1.9.0"
- }
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+ "dev": true
},
"cliui": {
"version": "7.0.4",
@@ -8527,9 +8521,9 @@
}
},
"core-js-compat": {
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.0.tgz",
- "integrity": "sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz",
+ "integrity": "sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==",
"dev": true,
"requires": {
"browserslist": "^4.16.3",
@@ -8582,9 +8576,9 @@
}
},
"css-loader": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
- "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz",
+ "integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==",
"dev": true,
"requires": {
"camelcase": "^6.2.0",
@@ -8669,9 +8663,9 @@
}
},
"date-fns": {
- "version": "2.19.0",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.19.0.tgz",
- "integrity": "sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg==",
+ "version": "2.20.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.20.1.tgz",
+ "integrity": "sha512-8P5M8Kxbnovd0zfvOs7ipkiVJ3/zZQ0F/nrBW4x5E+I0uAZVZ80h6CKd24fSXQ5TLK5hXMtI4yb2O5rEZdUt2A==",
"dev": true
},
"debug": {
@@ -8743,9 +8737,9 @@
}
},
"electron-to-chromium": {
- "version": "1.3.708",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
- "integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw==",
+ "version": "1.3.712",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz",
+ "integrity": "sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw==",
"dev": true
},
"emoji-regex": {
@@ -9286,9 +9280,9 @@
"dev": true
},
"hosted-git-info": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
- "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"http-signature": {
@@ -9770,14 +9764,14 @@
"integrity": "sha1-+5FYjnjJACVnI5XLQLJffNatGCk="
},
"micromatch": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
- "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+ "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
"dev": true,
"peer": true,
"requires": {
"braces": "^3.0.1",
- "picomatch": "^2.0.5"
+ "picomatch": "^2.2.3"
}
},
"mime-db": {
@@ -9802,9 +9796,9 @@
"dev": true
},
"mini-css-extract-plugin": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.0.tgz",
- "integrity": "sha512-DyQr5DhXXARKZoc4kwvCvD95kh69dUupfuKOmBUqZ4kBTmRaRZcU32lYu3cLd6nEGXhQ1l7LzZ3F/CjItaY6VQ==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz",
+ "integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
@@ -10185,9 +10179,9 @@
"dev": true
},
"picomatch": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
- "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+ "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
"dev": true,
"peer": true
},
@@ -10222,9 +10216,9 @@
}
},
"postcss": {
- "version": "8.2.9",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.9.tgz",
- "integrity": "sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q==",
+ "version": "8.2.10",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz",
+ "integrity": "sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==",
"dev": true,
"requires": {
"colorette": "^1.2.2",
@@ -10864,9 +10858,9 @@
}
},
"y18n": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
- "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
"dev": true
},
"yargs": {
@@ -11516,9 +11510,9 @@
}
},
"webpack": {
- "version": "5.30.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.30.0.tgz",
- "integrity": "sha512-Zr9NIri5yzpfmaMea2lSMV1UygbW0zQsSlGLMgKUm63ACXg6alhd1u4v5UBSBjzYKXJN6BNMGVM7w165e7NxYA==",
+ "version": "5.31.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.2.tgz",
+ "integrity": "sha512-0bCQe4ybo7T5Z0SC5axnIAH+1WuIdV4FwLYkaAlLtvfBhIx8bPS48WHTfiRZS1VM+pSiYt7e/rgLs3gLrH82lQ==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@@ -11744,9 +11738,9 @@
"dev": true
},
"y18n": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.6.tgz",
- "integrity": "sha512-PlVX4Y0lDTN6E2V4ES2tEdyvXkeKzxa8c/vo0pxPr/TqbztddTP0yn7zZylIyiAuxerqj0Q5GhpJ1YJCP8LaZQ==",
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
"yallist": {
diff --git a/src/js/controls/BoreholePopup.js b/src/js/controls/BoreholePopup.js
index 77c866a..9cf8f5a 100644
--- a/src/js/controls/BoreholePopup.js
+++ b/src/js/controls/BoreholePopup.js
@@ -2,6 +2,7 @@ import { Control } from "./Control";
import * as util from '../core/utilities';
import * as domEvent from '../core/domEvent';
import * as dom from '../core/domUtil';
+import { BarChart } from '../core/BarChart';
import './BoreholePopup.css';
@@ -117,14 +118,14 @@ export class BoreholePopup extends Control {
this._contentPane.innerHTML = "";
var valTextColor = "ffffff";
- // this.barChart = new BarChart("d17100",
- // 320, valTextColor, 'full',
- // 400);
- // this.barChart.draw(data);
- // this._contentPane.appendChild(this.barChart._container);
+ this.barChart = new BarChart("d17100",
+ 320, valTextColor, 'full',
+ 400);
+ this.barChart.draw(data);
+ this._contentPane.appendChild(this.barChart._container);
- // var table = this.barChart.getStatTable(data);
- // this._contentPane.appendChild(table);
+ var table = this.barChart.getStatTable(data);
+ this._contentPane.appendChild(table);
this._hasContent = true;
}
diff --git a/src/js/core/BarChart.js b/src/js/core/BarChart.js
new file mode 100644
index 0000000..e7aab43
--- /dev/null
+++ b/src/js/core/BarChart.js
@@ -0,0 +1,318 @@
+import * as dom from '../core/domUtil';
+
+export class BarChart {
+
+ /**
+ * constructor: BarChart
+ */
+ constructor(color, val, valcolor, render, valHeight) {
+
+ // The render type - can be light and full
+ this.renderType = render;
+ // the 3D object for the text label
+ this.labelobj = null;
+ // should we set the wireframe
+ this.hasWireframe = false;
+ this.val = val;
+ ////this.h = 0.5;
+
+ //// rows and column titles
+ //this.titles = titles;
+
+ // main cube colour
+ this.color = parseInt(color, 16);
+ this.htmlcolor = "#" + color;
+ //this.lumcolor = colorLuminance(color, 0.5);
+ //this.darklumcolor = colorLuminance(color, -0.3);
+ this.valcolor = parseInt(valcolor, 16);
+
+ this.alignRight = false;
+
+ //var container = this._container = dom.createDom("table", { "class": "chartTable" });
+ //var _tbody = dom.createDom("tbody", {}, this._container);
+
+ this.width = 300;
+ this.height = valHeight;// 400;
+ this.maxValue;
+ this.margin = 100;
+ this.colors = ["purple", "red", "green", "yellow"];
+ this.curArr = [];
+ this.backgroundColor = "#fff";
+ this.xAxisLabelArr = ["Bohrloch"];
+ this.yAxisLabelArr = ["34"];
+ //this.animationInterval = 100;
+ //this.animationSteps = 10;
+ this._container = dom.createDom("canvas", { "class": "chartCanvas" });
+
+ }
+
+ addBar(barHeight, color, name) {
+ barHeight = barHeight;//*1.5;
+ // Simple cube geometry for the bar
+ // Parameter 1 : width
+ // Parameter 2 : height
+ // Parameter 3 : depth
+ let barColor = "";
+ if (typeof color === "string") {
+ barColor = color;
+ }
+ else {
+ barColor = "#" + this._zfill(color.toString(16), 6); //webservicelayer.materialParameter[0].color;
+ }
+
+
+ let _tr = dom.createDom("tr", { style: "width:100px;" }, this._container);
+ let _profileColumn = dom.createDom("td", {}, _tr);
+ //var span = dom.createDom("span", { "class": "tooltip", title: "Beschreibung...", innerHTML: " info" }, _td);
+ dom.createDom("div", {
+ style: "width:25px;height:" + barHeight + "px;background-color:" + barColor + ";",
+ //innerHTML: name
+ }, _profileColumn);
+ //this._container.insertBefore(_tr, this._container.firstChild);
+
+
+ let _lableColumn = dom.createDom("td", {}, _tr);
+ let lable = dom.createDom("div", {
+ innerHTML: name,
+ style: "width:75px;height:" + barHeight + "px;"
+ }, _lableColumn);
+ }
+
+ draw(arr) {
+ //this._container.innerHTML = "";
+ let numOfBars = 1;// arr.length;
+ let barWidth;
+ let barHeight;
+ let border = 0;
+ let ratio;
+ let maxBarHeight;
+ let gradient;
+ let largestValue = 0;
+ let graphAreaX = 0;
+ let graphAreaY = 0;
+ let graphAreaWidth = this.width;
+ let graphAreaHeight = this.height;
+ let i;
+ let ctx = this._container.getContext("2d");
+
+ // Update the dimensions of the canvas only if they have changed
+ if (ctx.canvas.width !== this.width || ctx.canvas.height !== this.height) {
+ ctx.canvas.width = this.width;
+ ctx.canvas.height = this.height;
+ }
+ //// Draw the background color white
+ //ctx.fillStyle = this.backgroundColor;
+ //ctx.fillRect(0, 0, this.width, this.height);
+
+ // If x axis labels exist then make room
+ if (this.xAxisLabelArr.length) {
+ graphAreaHeight -= 40;
+ }
+
+ // Calculate dimensions of the bar
+ barWidth = 15;// graphAreaWidth / numOfBars - this.margin * 2;
+ maxBarHeight = graphAreaHeight - 25;//300
+
+ // Determine the largest value in the bar array
+ // let largestValue = 0;
+ for (i = 0; i < arr.length; i += 1) {
+ if (arr[i].dist > largestValue) {
+ largestValue = arr[i].dist;
+ }
+ }
+
+ //// Draw grey bar background
+ //ctx.fillStyle = "lightgray";
+ //ctx.fillRect(this.margin,
+ // graphAreaHeight - maxBarHeight,
+ // barWidth,
+ // maxBarHeight);
+
+ // For each bar
+ for (let i = 0; i < arr.length; i++) {
+
+ let color = arr[i].color;
+ let barColor = "";
+ if (typeof color === "string") {
+ barColor = "#" + color;
+ }
+ else {
+ barColor = "#" + this._zfill(color.toString(16), 6); //webservicelayer.materialParameter[0].color;
+ }
+
+ //// Set the ratio of current bar compared to the maximum
+ //if (this.maxValue) {
+ // ratio = arr[i].dist / this.maxValue;
+ //} else {
+ // ratio = arr[i].dist / largestValue;
+ //}
+
+ //barHeight = arr[i].dist;// ratio * maxBarHeight;
+ barHeight = parseInt((maxBarHeight / 6000) * arr[i].dist);
+ let x = this.margin;// this.margin + i * this.width / numOfBars
+ let y = graphAreaHeight - barHeight;
+ if (i == 0) {
+ this.startPointY = y + (barHeight);
+ }
+
+ // Draw bar color if it is large enough to be visible
+ if (barHeight > border * 2) {
+ ctx.fillStyle = barColor;// gradient;
+ // Fill rectangle with gradient
+ ctx.fillRect(x + border,
+ y + border,
+ barWidth - border * 2,
+ barHeight - border * 2);
+ }
+
+
+ // Write bar value
+ if (barHeight > border + 9) {
+ ctx.fillStyle = "#333";
+ ctx.font = "bold 9px sans-serif";
+ //ctx.textAlign = "center";
+ // Use try / catch to stop IE 8 from going to error town
+ try {
+ if (arr[i].name !== "Basement") {
+ ctx.fillText("Mächtigkeit " + arr[i].name + ": " + Math.round(arr[i].dist),//.toFixed(2),
+ //i * this.width / numOfBars + (this.width / numOfBars) / 2,
+ x + 30,
+ y + (barHeight / 2) + 4.5);
+ }
+ else {
+ ctx.fillText(arr[i].name,//.toFixed(2),
+ x + 30,
+ y + (barHeight / 2) + 4.5);
+ }
+ }
+ catch (ex) { }
+ }
+
+ graphAreaHeight = graphAreaHeight - (barHeight - (border / 2));
+ }//for-loop
+
+ if (this.startPointY) {
+ ctx.beginPath();
+ ctx.moveTo(20, this.startPointY);
+ ctx.lineTo(20, this.startPointY - maxBarHeight);
+ var startPoint = this.startPointY;
+ var iwas = [-5500, -5000, -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, 500];
+ iwas.forEach(function (item) {
+ var dist = (maxBarHeight / 6000) * 500;
+
+ ctx.moveTo(20, startPoint);
+ ctx.lineTo(40, startPoint);
+ ctx.font = "10px Arial";
+ ctx.strokeText(item, 55, startPoint + 2.5);
+ startPoint = startPoint - dist;
+
+ });
+ //ctx.lineTo(70, 100);
+ ctx.stroke();
+ }
+ }
+
+ getStatTable(arr) {
+ let statTable = dom.createDom("table", { "class": "chartTable" });
+ let _headerRow = dom.createDom("tr", { style: "width:100px;" }, statTable);
+ let _profileHeaderColumn = dom.createDom("th", {}, _headerRow);
+ let _lableHeaderColumn = dom.createDom("th", {}, _headerRow);
+ let _minHeaderColumn = dom.createDom("th", {}, _headerRow);
+ dom.createDom("div", {
+ innerHTML: "UNTERKANTE
(m Seehöhe)",
+ style: "width:75px;"
+ }, _minHeaderColumn);
+ let _maxHeaderColumn = dom.createDom("th", {}, _headerRow);
+ dom.createDom("div", {
+ innerHTML: "OBERKANTE
(m Seehöhe)",
+ style: "width:75px;"
+ }, _maxHeaderColumn);
+
+ // For each bar
+ //for (var i = 0; i < arr.length; i++) {
+ for (let i = arr.length - 1; i >= 0; i--) {
+
+ let color = arr[i].color;
+ let barColor = "";
+ if (typeof color === "string") {
+ barColor = color;
+ }
+ else {
+ barColor = "#" + this._zfill(color.toString(16), 6); //webservicelayer.materialParameter[0].color;
+ }
+ let _tr = dom.createDom("tr", { style: "width:100px;" }, statTable);
+
+ let _profileColumn = dom.createDom("td", {}, _tr);
+ let geometry = dom.createDom("div", {
+ style: "width:20px;height:20px;background-color:" + barColor + ";",
+ //innerHTML: name
+ }, _profileColumn);
+
+ let _lableColumn = dom.createDom("td", {}, _tr);
+ let lable = dom.createDom("div", {
+ innerHTML: arr[i].name,
+ style: "width:75px;"
+ }, _lableColumn);
+
+ let _minColumn = dom.createDom("td", {}, _tr);
+ //für den Layer Basement keine Unterkante
+ let minLable = "";
+ if (arr[i].name !== "Basement") {
+ minLable = dom.createDom("div", {
+ innerHTML: Math.round(arr[i].min),//.toFixed(2),
+ style: "width:75px;"
+ }, _minColumn);
+ }
+ else {
+ minLable = dom.createDom("div", {
+ innerHTML: "x",
+ style: "width:75px;"
+ }, _minColumn);
+ }
+
+ let _maxColumn = dom.createDom("td", {}, _tr);
+ let maxLable = dom.createDom("div", {
+ innerHTML: Math.round(arr[i].max),//.toFixed(2),
+ style: "width:75px;"
+ }, _maxColumn);
+
+ }
+ return statTable;
+ }
+
+ _zfill(num, len) {
+ return (Array(len).join("0") + num).slice(-len);
+ }
+
+ // function to show the label
+ showLabel(posx, posy) {
+ // Shows 3D label if set
+ if (this.hasLabel) {
+ this.labelobj.visible = true;
+ }
+
+ // Shows HTML Label if set - uses jquery for DOM manipulation
+ if (this.hasHTMLLabel) {
+ this.hasHTMLLabel.html(this.titles.row +
+ '' + this.titles.col + ': ' + val + '
');
+ this.hasHTMLLabel.show();
+ // Back transformation of the coordinates
+ posx = ((posx + 1) * window.innerWidth / 2);
+ posy = -((posy - 1) * window.innerHeight / 2);
+ this.hasHTMLLabel.offset({ left: posx, top: posy });
+ }
+ }
+
+ // function to hide the label
+ hideLabel() {
+ // Hides 3D label if set
+ if (this.hasLabel) {
+ this.labelobj.visible = false;
+ }
+ //// Hides HTML Label if set - uses jquery for DOM manipulation
+ //if ( this.hasHTMLLabel ) {
+ // this.hasHTMLLabel.hide();
+ //}
+ }
+
+}
\ No newline at end of file
diff --git a/src/js/core/BaseEditor.js b/src/js/core/BaseEditor.js
index 55defa2..e185c8a 100644
--- a/src/js/core/BaseEditor.js
+++ b/src/js/core/BaseEditor.js
@@ -116,17 +116,50 @@ export class BaseEditor {
}
handleQueryResults() {
- let results = arguments;
- //var content = [];
+ let results = arguments;
let features = results[0].features;
let aufschlag = results[0].aufschlag;
+ // set the borhole marker
if (!this.isConnected()) {
this.connect(aufschlag);
}
else {
this.marker.setLatLng(aufschlag);
}
- this.marker.setPopupChartData("test");
+
+ // calculate heights vor bar chart
+ let data = [];
+ for (let j = features.length - 1; j >= 0; j--) {
+ let feature = features[j];
+ let point = feature.point;
+ // // clicked coordinates: skalierung wieder wegrechnen:
+ // let pt = this.map.dataservice.toMapCoordinates(point.x, point.y, point.z);
+
+ let layerId = feature.layerId;
+ //var layer = this.map.dataservice.layers[layerId];
+ let layer = this.map._layers[layerId];
+ let nextPoint;
+ if (j !== features.length - 1) {
+ let previousPoint = { x: features[j + 1].point.x, y: features[j + 1].point.y, z: features[j + 1].point.z };
+ // let previousPt = this.map.dataservice.toMapCoordinates(previousPoint.x, previousPoint.y, previousPoint.z);
+
+ //var barHeight = point.z - previousPoint.z;
+
+ let realHeight = point.z - previousPoint.z;
+ //var dist = parseInt((300 / 6000) * realHeight);
+
+ data.push({
+ dist: realHeight,//dist,
+ max: point.z,
+ min: previousPoint.z,
+ color: layer.color,
+ name: layer.name
+ });
+ //app.barChart.addBar(dist, layer.materialParameter[0].color, layer.name);
+ }
+ }
+
+ this.marker.setPopupChartData(data);
this.marker.openPopup();
}
diff --git a/src/js/layer/DemBlock.js b/src/js/layer/DemBlock.js
index 23568c2..4b4de4c 100644
--- a/src/js/layer/DemBlock.js
+++ b/src/js/layer/DemBlock.js
@@ -110,7 +110,7 @@ export class DemBlock {
// mesh.position.z = -13616.3;
mesh.userData.layerId = layer.index;
this.obj = mesh;
- layer.addObject(mesh);
+ layer.addObject(mesh, false);
//layer.mainMesh = mesh;
}
diff --git a/src/js/tasks/BoreholeIdentify.js b/src/js/tasks/BoreholeIdentify.js
index 11a0f27..3d229e3 100644
--- a/src/js/tasks/BoreholeIdentify.js
+++ b/src/js/tasks/BoreholeIdentify.js
@@ -171,7 +171,7 @@ export class BoreholeIdentify {
let _queryableObjects = [];
// this.layers.forEach(function (layer) {
Object.values(this.layers).forEach(layer => {
- if (layer.visible && layer.queryableObjects.length) {
+ if (layer.visible && layer.queryableObjects.length && layer.name !== "DEM_EGDI") {
_queryableObjects = _queryableObjects.concat(layer.queryableObjects);
}
});
@@ -183,7 +183,7 @@ export class BoreholeIdentify {
// this.layers.forEach(function (layer) {
Object.values(this.layers).forEach(layer => {
//if (layer.visible && layer.queryableObjects.length) {
- if (layer.queryableObjects.length) {
+ if (layer.queryableObjects.length && layer.name !== "DEM_EGDI") {
_queryableObjects = _queryableObjects.concat(layer.queryableObjects);
}
});