geolba/GeotiefExplore
2
1
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases Wiki Activity

- bug: correct borehole profiles

Browse Source 
- npm updates
- beginning with typescript: BoreholePopup.ts
This commit is contained in:
Arno Kaimbacher 2021-04-20 16:17:45 +02:00
parent 4f34cc6ab2
commit e007bcf9fa
9 changed files with 233 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
package-lock.json generated
View File

@ -1422,9 +1422,9 @@
} }
}, },
"node_modules/@types/estree": { "node_modules/@types/estree": {
"version": "0.0.46", "version": "0.0.47",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
"integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==", "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
"dev": true "dev": true
}, },
"node_modules/@types/glob": { "node_modules/@types/glob": {
@ -1452,9 +1452,9 @@
"peer": true "peer": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "14.14.39", "version": "14.14.41",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
"integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==", "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
"dev": true "dev": true
}, },
"node_modules/@types/normalize-package-data": { "node_modules/@types/normalize-package-data": {
@ -2063,9 +2063,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001208", "version": "1.0.30001214",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==", "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==",
"dev": true "dev": true
}, },
"node_modules/caseless": { "node_modules/caseless": {
@ -2368,12 +2368,12 @@
} }
}, },
"node_modules/core-js-compat": { "node_modules/core-js-compat": {
"version": "3.10.1", "version": "3.10.2",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.2.tgz",
"integrity": "sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==", "integrity": "sha512-IGHnpuaM1N++gLSPI1F1wu3WXICPxSyj/Q++clcwsIOnUVp5uKUIPl/+6h0TQ112KU3fMiSxqJuM+OrCyKj5+A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"browserslist": "^4.16.3", "browserslist": "^4.16.4",
"semver": "7.0.0" "semver": "7.0.0"
}, },
"funding": { "funding": {
@ -2423,23 +2423,22 @@
} }
}, },
"node_modules/css-loader": { "node_modules/css-loader": {
"version": "5.2.1", "version": "5.2.4",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.4.tgz",
"integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==", "integrity": "sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"camelcase": "^6.2.0", "camelcase": "^6.2.0",
"cssesc": "^3.0.0",
"icss-utils": "^5.1.0", "icss-utils": "^5.1.0",
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
"postcss": "^8.2.8", "postcss": "^8.2.10",
"postcss-modules-extract-imports": "^3.0.0", "postcss-modules-extract-imports": "^3.0.0",
"postcss-modules-local-by-default": "^4.0.0", "postcss-modules-local-by-default": "^4.0.0",
"postcss-modules-scope": "^3.0.0", "postcss-modules-scope": "^3.0.0",
"postcss-modules-values": "^4.0.0", "postcss-modules-values": "^4.0.0",
"postcss-value-parser": "^4.1.0", "postcss-value-parser": "^4.1.0",
"schema-utils": "^3.0.0", "schema-utils": "^3.0.0",
"semver": "^7.3.4" "semver": "^7.3.5"
}, },
"engines": { "engines": {
"node": ">= 10.13.0" "node": ">= 10.13.0"
@ -2555,9 +2554,9 @@
} }
}, },
"node_modules/date-fns": { "node_modules/date-fns": {
"version": "2.21.0", "version": "2.21.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz",
"integrity": "sha512-lbAFpaKz7QuVxm6m1rmioh4BB2gmLx1r1JMYXU2A/ufT5ly4zEG7HYH4fvS/QfbdyC5rkYyiS30mYz4Q7XCO+w==", "integrity": "sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=0.11" "node": ">=0.11"
@ -2683,9 +2682,9 @@
} }
}, },
"node_modules/enhanced-resolve": { "node_modules/enhanced-resolve": {
"version": "5.7.0", "version": "5.8.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
"integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==", "integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"graceful-fs": "^4.2.4", "graceful-fs": "^4.2.4",
@ -3468,12 +3467,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/indexes-of": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
"node_modules/inflight": { "node_modules/inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@ -4015,9 +4008,9 @@
} }
}, },
"node_modules/mini-css-extract-plugin": { "node_modules/mini-css-extract-plugin": {
"version": "1.4.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.5.0.tgz",
"integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==", "integrity": "sha512-SIbuLMv6jsk1FnLIU5OUG/+VMGUprEjM1+o2trOAx8i5KOKMrhyezb1dJ4Ugsykb8Jgq8/w5NEopy6escV9G7g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
@ -4660,14 +4653,12 @@
} }
}, },
"node_modules/postcss-selector-parser": { "node_modules/postcss-selector-parser": {
"version": "6.0.4", "version": "6.0.5",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
"integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"cssesc": "^3.0.0", "cssesc": "^3.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1",
"util-deprecate": "^1.0.2" "util-deprecate": "^1.0.2"
}, },
"engines": { "engines": {
@ -6122,12 +6113,6 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/uniq": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
"dev": true
},
"node_modules/uri-js": { "node_modules/uri-js": {
"version": "4.4.1", "version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@ -6262,20 +6247,20 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.33.2", "version": "5.34.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.34.0.tgz",
"integrity": "sha512-X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg==", "integrity": "sha512-+WiFMgaZqhu7zKN64LQ7z0Ml4WWI+9RwG6zmS0wJDQXiCeg3hpN8fYFNJ+6WlosDT55yVxTfK7XHUAOVR4rLyA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",
"@types/estree": "^0.0.46", "@types/estree": "^0.0.47",
"@webassemblyjs/ast": "1.11.0", "@webassemblyjs/ast": "1.11.0",
"@webassemblyjs/wasm-edit": "1.11.0", "@webassemblyjs/wasm-edit": "1.11.0",
"@webassemblyjs/wasm-parser": "1.11.0", "@webassemblyjs/wasm-parser": "1.11.0",
"acorn": "^8.0.4", "acorn": "^8.0.4",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.7.0", "enhanced-resolve": "^5.8.0",
"es-module-lexer": "^0.4.0", "es-module-lexer": "^0.4.0",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"events": "^3.2.0", "events": "^3.2.0",
@ -7812,9 +7797,9 @@
} }
}, },
"@types/estree": { "@types/estree": {
"version": "0.0.46", "version": "0.0.47",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
"integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==", "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
"dev": true "dev": true
}, },
"@types/glob": { "@types/glob": {
@ -7842,9 +7827,9 @@
"peer": true "peer": true
}, },
"@types/node": { "@types/node": {
"version": "14.14.39", "version": "14.14.41",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
"integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==", "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
"dev": true "dev": true
}, },
"@types/normalize-package-data": { "@types/normalize-package-data": {
@ -8346,9 +8331,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001208", "version": "1.0.30001214",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==", "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==",
"dev": true "dev": true
}, },
"caseless": { "caseless": {
@ -8594,12 +8579,12 @@
} }
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.10.1", "version": "3.10.2",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.2.tgz",
"integrity": "sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==", "integrity": "sha512-IGHnpuaM1N++gLSPI1F1wu3WXICPxSyj/Q++clcwsIOnUVp5uKUIPl/+6h0TQ112KU3fMiSxqJuM+OrCyKj5+A==",
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "^4.16.3", "browserslist": "^4.16.4",
"semver": "7.0.0" "semver": "7.0.0"
}, },
"dependencies": { "dependencies": {
@ -8649,23 +8634,22 @@
} }
}, },
"css-loader": { "css-loader": {
"version": "5.2.1", "version": "5.2.4",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.4.tgz",
"integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==", "integrity": "sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw==",
"dev": true, "dev": true,
"requires": { "requires": {
"camelcase": "^6.2.0", "camelcase": "^6.2.0",
"cssesc": "^3.0.0",
"icss-utils": "^5.1.0", "icss-utils": "^5.1.0",
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
"postcss": "^8.2.8", "postcss": "^8.2.10",
"postcss-modules-extract-imports": "^3.0.0", "postcss-modules-extract-imports": "^3.0.0",
"postcss-modules-local-by-default": "^4.0.0", "postcss-modules-local-by-default": "^4.0.0",
"postcss-modules-scope": "^3.0.0", "postcss-modules-scope": "^3.0.0",
"postcss-modules-values": "^4.0.0", "postcss-modules-values": "^4.0.0",
"postcss-value-parser": "^4.1.0", "postcss-value-parser": "^4.1.0",
"schema-utils": "^3.0.0", "schema-utils": "^3.0.0",
"semver": "^7.3.4" "semver": "^7.3.5"
}, },
"dependencies": { "dependencies": {
"loader-utils": { "loader-utils": {
@ -8736,9 +8720,9 @@
} }
}, },
"date-fns": { "date-fns": {
"version": "2.21.0", "version": "2.21.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz",
"integrity": "sha512-lbAFpaKz7QuVxm6m1rmioh4BB2gmLx1r1JMYXU2A/ufT5ly4zEG7HYH4fvS/QfbdyC5rkYyiS30mYz4Q7XCO+w==", "integrity": "sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==",
"dev": true "dev": true
}, },
"debug": { "debug": {
@ -8828,9 +8812,9 @@
"dev": true "dev": true
}, },
"enhanced-resolve": { "enhanced-resolve": {
"version": "5.7.0", "version": "5.8.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
"integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==", "integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.2.4", "graceful-fs": "^4.2.4",
@ -9433,12 +9417,6 @@
"repeating": "^2.0.0" "repeating": "^2.0.0"
} }
}, },
"indexes-of": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@ -9869,9 +9847,9 @@
"dev": true "dev": true
}, },
"mini-css-extract-plugin": { "mini-css-extract-plugin": {
"version": "1.4.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.5.0.tgz",
"integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==", "integrity": "sha512-SIbuLMv6jsk1FnLIU5OUG/+VMGUprEjM1+o2trOAx8i5KOKMrhyezb1dJ4Ugsykb8Jgq8/w5NEopy6escV9G7g==",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
@ -10344,14 +10322,12 @@
} }
}, },
"postcss-selector-parser": { "postcss-selector-parser": {
"version": "6.0.4", "version": "6.0.5",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
"integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
"dev": true, "dev": true,
"requires": { "requires": {
"cssesc": "^3.0.0", "cssesc": "^3.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1",
"util-deprecate": "^1.0.2" "util-deprecate": "^1.0.2"
} }
}, },
@ -11477,12 +11453,6 @@
"integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
"dev": true "dev": true
}, },
"uniq": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
"dev": true
},
"uri-js": { "uri-js": {
"version": "4.4.1", "version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@ -11583,20 +11553,20 @@
} }
}, },
"webpack": { "webpack": {
"version": "5.33.2", "version": "5.34.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.34.0.tgz",
"integrity": "sha512-X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg==", "integrity": "sha512-+WiFMgaZqhu7zKN64LQ7z0Ml4WWI+9RwG6zmS0wJDQXiCeg3hpN8fYFNJ+6WlosDT55yVxTfK7XHUAOVR4rLyA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",
"@types/estree": "^0.0.46", "@types/estree": "^0.0.47",
"@webassemblyjs/ast": "1.11.0", "@webassemblyjs/ast": "1.11.0",
"@webassemblyjs/wasm-edit": "1.11.0", "@webassemblyjs/wasm-edit": "1.11.0",
"@webassemblyjs/wasm-parser": "1.11.0", "@webassemblyjs/wasm-parser": "1.11.0",
"acorn": "^8.0.4", "acorn": "^8.0.4",
"browserslist": "^4.14.5", "browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2", "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^5.7.0", "enhanced-resolve": "^5.8.0",
"es-module-lexer": "^0.4.0", "es-module-lexer": "^0.4.0",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"events": "^3.2.0", "events": "^3.2.0",

8
src/js/controls/BoreholeControl.js
View File

@ -1,6 +1,5 @@
import { Control } from "./Control"; import { Control } from "./Control";
import * as dom from '../core/domUtil'; import * as dom from '../core/domUtil';
import * as util from '../core/utilities';
import * as domEvent from '../core/domEvent'; import * as domEvent from '../core/domEvent';
import { BoreholeTool } from '../tools/BoreholeTool'; import { BoreholeTool } from '../tools/BoreholeTool';
@ -11,7 +10,8 @@ export class BoreholeControl extends Control {
options = { options = {
position: 'topright', position: 'topright',
}; };
onAdd (map) {
onAdd(map) {
this.map = map; this.map = map;
// var b = this._nls = util.mixin({}, N.widgets.boreholetool); // var b = this._nls = util.mixin({}, N.widgets.boreholetool);
@ -24,8 +24,8 @@ export class BoreholeControl extends Control {
//this.addUnit(inputDiv, 'mi', 'mi', 'miles'); //this.addUnit(inputDiv, 'mi', 'mi', 'miles');
////this.addUnit(inputDiv, 'nm', 'NM', 'nautical miles'); ////this.addUnit(inputDiv, 'nm', 'NM', 'nautical miles');
let toggle = dom.createDom('a', { "class": "gba-maptool-toggle", href: "#", title: "b.title" }, this._container); let toggle = dom.createDom('a', { "class": "gba-maptool-toggle", href: "#", title: "b.title" }, this._container);
domEvent.disableClickPropagation(this._container); domEvent.disableClickPropagation(this._container);
domEvent domEvent
// .on(toggle, 'click', domEvent.stop) // .on(toggle, 'click', domEvent.stop)
// .on(toggle, 'click', domEvent.preventDefault) // .on(toggle, 'click', domEvent.preventDefault)

54
src/js/controls/BoreholePopup.css
View File

@ -1,10 +1,11 @@
.gba-borehole-popup { .gba-borehole-popup {
cursor: pointer; cursor: pointer;
color: green;
} }
/* .gba-borehole-popup .maximize.hidden { /* .gba-borehole-popup .maximize.hidden {
display: none; display: none;
} }*/
.gba-borehole-popup .maximize { .gba-borehole-popup .maximize {
color: rgb(220, 220, 220); color: rgb(220, 220, 220);
@ -18,28 +19,17 @@
text-align: center; text-align: center;
float: left; float: left;
cursor: pointer; cursor: pointer;
} */ }
/*side-menu zumachen*/ /*side-menu zumachen*/
.gba-borehole-menu .close { .gba-borehole-menu .gba-close-link {
color: rgb(220, 220, 220);
background: gray;
border: 1px solid #000000;
border-radius: 4px;
font-size: 16px;
font-weight: bold;
width: 20px; width: 20px;
height: 20px; height: 20px;
text-align: center; text-align: center;
float: right; float: right;
cursor: pointer; cursor: pointer;
} }
/* .gba-close-icon {
background-repeat: no-repeat;
background-position: -52px -9px;
display: inline;
padding: 0 10px;
} */
.toolbox { .toolbox {
list-style-image: none; list-style-image: none;
list-style-position: inside; list-style-position: inside;
@ -55,19 +45,19 @@
.gba-borehole-menu .body { .gba-borehole-menu .body {
clear: both; clear: both;
height: calc(100% - 46px); height: calc(100% - 46px);
border: 1px solid #777;
/* padding: 5px; */
}
.gba-borehole-menu .body .header {
text-align: center;
border-bottom: 1px solid #000000;
} }
.gba-borehole-menu { .gba-borehole-menu {
/* position: absolute;
top: 0;
left: 0;
padding: 0 20px 2px 20px;
border-right: 1px solid #ddd;
border-left: 1px solid #ddd; */
overflow-y: auto; overflow-y: auto;
z-index: 1000; z-index: 1000;
background-color: #fff; background-color: #fff;
opacity: 0.93; opacity: 0.93;
} }
.gba-borehole-menu::-webkit-scrollbar { .gba-borehole-menu::-webkit-scrollbar {
@ -81,6 +71,14 @@
background: #777; background: #777;
} }
/* .chartCanvas {
border-top: 1px solid #000000;
} */
.chartContainer {
border-top: 1px solid #000000;
}
.chartTable { .chartTable {
margin-left: 20px; margin-left: 20px;
border-width: 0; border-width: 0;
@ -97,8 +95,14 @@
.chartTable td { .chartTable td {
vertical-align: central; vertical-align: central;
text-align: center; text-align: center;
padding: 0; padding: 0;
overflow: visible; }
.layerNameColumn {
white-space: nowrap;
overflow: hidden;
text-overflow:ellipsis;
max-width: 85%;
} }
.chartTable td img { .chartTable td img {

87
src/js/controls/BoreholePopup.ts
View File

@ -7,7 +7,7 @@ import { BarChart } from '../core/BarChart';
import './BoreholePopup.css'; import './BoreholePopup.css';
interface BoreholePopupOptions { interface BoreholePopupOptions {
position?: string position: string
width?: string width?: string
height?: string height?: string
parentDiv?: string parentDiv?: string
@ -19,31 +19,25 @@ export class BoreholePopup extends Control {
options: BoreholePopupOptions = { options: BoreholePopupOptions = {
position: 'topleft', position: 'topleft',
width: '300px', width: '300px',
height: '100%', height: '100%',
parentDiv: null parentDiv: null
}; };
// private class fields: //#region private class fields:
private _innerHTML; private _innerHTML;
private _clearButton; private _clearButton;
private _body; private _body;
private _contentPane; private _contentPane;
private _contenLable; private _contentLabel;
_container;
private _mainMap;
private _scene;
private _hasContent;
private _menu; private _menu;
private _isShowing; private _isShowing;
barChart; private _barChart;
//#endregion
constructor(options) { constructor(options) {
super(); super();
this._innerHTML = "Es wurde noch keine Bohrloch ausgewählt!"; this._innerHTML = "Es wurde noch keine Bohrloch ausgewählt!";
util.setOptions(this, options); util.setOptions(this, options);
//this._startPosition = -(parseInt(this.options.width, 10));
//this._isLeftPosition = true;
this._hasContent = false;
} }
// happens after added to map // happens after added to map
@ -53,7 +47,6 @@ export class BoreholePopup extends Control {
//logger.warning('HomeButton::map required', true); //logger.warning('HomeButton::map required', true);
return; return;
} }
this._mainMap = map;
let container; let container;
// var b = this._nls = util.mixin({}, N.widgets.boreholepopup); // var b = this._nls = util.mixin({}, N.widgets.boreholepopup);
// let container = this._container = dom.createDom("div", { "class": "gba-borehole-popup" }); // let container = this._container = dom.createDom("div", { "class": "gba-borehole-popup" });
@ -66,30 +59,38 @@ export class BoreholePopup extends Control {
container = this._container = dom.createDom("div", { "class": "gba-borehole-popup" }, dom.byId("webgl")); container = this._container = dom.createDom("div", { "class": "gba-borehole-popup" }, dom.byId("webgl"));
} }
//button:
// this._maxButton = dom.createDom('div', {
// "class": "maximize", innerHTML: ">", title: "b.NLS_maximize"
// }, this._container);
let className = "gba-borehole-menu"; let className = "gba-borehole-menu";
this._menu = dom.createDom('div', { "class": className }, container); //dom.byId("webgl")); this._menu = dom.createDom('div', { "class": className }, container); //dom.byId("webgl"));
this._menu.style.width = this.options.width; // this._menu.style.width = this.options.width;
// this._menu.style.height = this.options.height; // this._menu.style.height = this.options.height;
this._menu.style.left = 0;// '-' + this.options.width; this._menu.style.left = 0;// '-' + this.options.width;
this._menu.style.top = 0; this._menu.style.top = 0;
this._body = dom.createDom('div', { "class": "body" }, this._menu); this._body = dom.createDom('div', { "class": "body" }, this._menu);
this._contenLable = dom.createDom('lable', { innerHTML: "Virtual borehole profile <br /> (Heights in m)" }, //button:
this._clearButton = dom.createDom('div', {
"class": "gba-close-link", innerHTML: "<i class='fas fa-window-close'></i>", title: "b.NLS_maximize"
}, this._body);
// dom.createDom('span', { title: "b.NLS_close", innerHTML: "Close" }, this._clearButton);
this._contentLabel = dom.createDom('div', { class: "header", innerHTML: "<label>VIRTUAL PROFILE <br /> (sealevel [m])</label>" },
this._body); this._body);
/* place holder for borehole profile after Identify */ /* place holder for borehole profile after Identify */
this._contentPane = dom.createDom('div', { "class": "gba-menu-contents" }, this._body); this._contentPane = dom.createDom('div', { "class": "gba-menu-contents" }, this._body);
this._contentPane.innerHTML = this._innerHTML; this._contentPane.innerHTML = this._innerHTML;
this._contentPane.style.clear = 'both'; this._contentPane.style.clear = 'both';
// close button // close button
let toolboxList = dom.createDom('ul', { "class": "toolbox" }, this._menu); // let toolboxList = dom.createDom('ul', { "class": "toolbox" }, this._menu);
this._clearButton = dom.createDom('button', { "class": "gba-close-link button is-dark" }, toolboxList); // this._clearButton = dom.createDom('button', { "class": "gba-close-link button is-dark" }, toolboxList);
// dom.createDom('i', { "class": "gba-close-icon" }, this._clearButton); // dom.createDom('span', { title: "b.NLS_close", innerHTML: "Close" }, this._clearButton);
dom.createDom('span', { title: "b.NLS_close", innerHTML: "Close" }, this._clearButton);
// events: // events:
// don't let double clicks and mousedown get to the map // don't let double clicks and mousedown get to the map
@ -123,7 +124,7 @@ export class BoreholePopup extends Control {
//} //}
} }
_setContent(innerHTML) { setContent(innerHTML) {
if (innerHTML instanceof HTMLElement) { if (innerHTML instanceof HTMLElement) {
this._contentPane.innerHTML = ""; this._contentPane.innerHTML = "";
this._contentPane.appendChild(innerHTML); this._contentPane.appendChild(innerHTML);
@ -132,39 +133,33 @@ export class BoreholePopup extends Control {
this._contentPane.innerHTML = innerHTML; this._contentPane.innerHTML = innerHTML;
} }
this._contentPane.style.display = "block"; this._contentPane.style.display = "block";
//this._contentPane.innerHTML = innerHTML;
//this._contentPane.style.display = "block";
} }
setChartContent(data) { setChartContent(data) {
this._contentPane.innerHTML = ""; this._contentPane.innerHTML = "";
let valTextColor = "ffffff"; let valTextColor = "ffffff";
this.barChart = new BarChart("d17100", this._barChart = new BarChart("d17100",
320, valTextColor, 'full', 320, valTextColor, 'full',
300); 300);
this.barChart.draw(data); this._barChart.draw(data);
this._contentPane.appendChild(this.barChart._container); this._contentPane.appendChild(this._barChart._container);
let table = this.barChart.getStatTable(data); let table = this._barChart.getStatTable(data);
this._contentPane.appendChild(table); this._contentPane.appendChild(table);
this._hasContent = true;
} }
_close(e) { private _close(e) {
this._clearContent(); this._clearContent();
this._toggleVisibility(false); this._toggleVisibility(false);
this.emit("closed"); this.emit("closed");
} }
_clearContent() { private _clearContent() {
// $(this._contentPane).html('');
this._contentPane.innerHTML = ''; this._contentPane.innerHTML = '';
this._hasContent = false;
} }
_toggleVisibility(visible) { private _toggleVisibility(visible) {
this._setVisibility(visible); this._setVisibility(visible);
this._isShowing = visible; this._isShowing = visible;
@ -184,20 +179,8 @@ export class BoreholePopup extends Control {
} }
} }
_setVisibility(addOrRemove) { private _setVisibility(addOrRemove) {
// $(this._menu).css("visibility", addOrRemove ? "visible" : "hidden");
this._menu.style.visibility = addOrRemove ? "visible" : "hidden"; this._menu.style.visibility = addOrRemove ? "visible" : "hidden";
// var maxButtonVisible = false;
// //if add, max Button not visible
// if (addOrRemove == true) {
// maxButtonVisible = !addOrRemove;
// }
// //if remove , then max Button only visible if popup has content
// else if (addOrRemove == false) {
// maxButtonVisible = this._hasContent;
// }
// // this._maxButton.style.visibility = maxButtonVisible ? "visible" : "hidden";
} }
onRemove() { onRemove() {
@ -209,11 +192,9 @@ export class BoreholePopup extends Control {
// f.remove(); // f.remove();
//} //}
domEvent.off(this._clearButton, 'click', this._close); domEvent.off(this._clearButton, 'click', this._close);
// domEvent.off(this._maxButton, 'click', this.show, this);
//this.map.off('mouse-pan', this.hide, this);
//C.destroy(this.domNode); //C.destroy(this.domNode);
//this.getContainer().parentNode.removeChild(this.getContainer()); //this.getContainer().parentNode.removeChild(this.getContainer());
this._innerHTML = this._hasContent = this._menu = this._body = this._contenLable = this._contentPane = this._clearButton = null; this._innerHTML = this._menu = this._body = this._contentLabel = this._contentPane = this._clearButton = null;
} }
} }

26
src/js/controls/Control.js → src/js/controls/Control.ts
View File

@ -1,26 +1,21 @@
// import { Class } from '../core/Class';
import * as util from '../core/utilities'; import * as util from '../core/utilities';
// import * as dom from '../core/domUtil';
import { EventEmitter } from '../core/EventEmitter'; import { EventEmitter } from '../core/EventEmitter';
abstract class Control extends EventEmitter {
// export var Control = Class.extend({
class Control extends EventEmitter {
// @section // @section
// @aka Control options // @aka Control options
options = { abstract options = {
// position: 'topright', position: 'topright',
}; };
_map; protected _map;
_container; protected _container;
constructor(defaults) { constructor(defaults?) {
super(); super();
if (!(this instanceof Control)) { if (!(this instanceof Control)) {
throw new TypeError("Control constructor cannot be called as a function."); throw new TypeError("Control constructor cannot be called as a function.");
} }
// this.options = defaults;
// properties // properties
util.setOptions(this, defaults); util.setOptions(this, defaults);
} }
@ -32,10 +27,10 @@ class Control extends EventEmitter {
getContainer() { getContainer() {
return this._container; return this._container;
} }
// abstract onRemove(map) : void;
// abstract onAdd(map) : HTMLElement; abstract onRemove(map): void;
abstract onAdd(map) : HTMLElement;
addTo(map) { addTo(map) {
this._map = map; this._map = map;
@ -57,7 +52,6 @@ class Control extends EventEmitter {
return this; return this;
} }
removeFrom(map) { removeFrom(map) {
var pos = this.getPosition(), var pos = this.getPosition(),

25
src/js/core/BarChart.js
View File

@ -127,7 +127,7 @@ export class BarChart {
let minValue = Math.min.apply(Math, arr.map(o => o.min)); let minValue = Math.min.apply(Math, arr.map(o => o.min));
this.minValue = Math.round(minValue); this.minValue = Math.round(minValue);
// let smallestValue = Math.min.apply(Math, arr.map(o => o.dist)); // let smallestValue = Math.min.apply(Math, arr.map(o => o.dist));
let totalHeight = this.totalHeight = this.maxValue - this.minValue; //6000; let totalHeight = this.totalHeight = this.maxValue - this.minValue; //6000;
//// Draw grey bar background //// Draw grey bar background
//ctx.fillStyle = "lightgray"; //ctx.fillStyle = "lightgray";
@ -184,7 +184,7 @@ export class BarChart {
// Use try / catch to stop IE 8 from going to error town // Use try / catch to stop IE 8 from going to error town
try { try {
if (arr[i].name !== "Basement") { if (arr[i].name !== "Basement") {
ctx.fillText("thickness " + arr[i].name + ": " + Math.round(arr[i].dist),//.toFixed(2), ctx.fillText(arr[i].name + ": " + Math.round(arr[i].dist) + " m", //.toFixed(2),
//i * this.width / numOfBars + (this.width / numOfBars) / 2, //i * this.width / numOfBars + (this.width / numOfBars) / 2,
x + 30, x + 30,
y + (barHeight / 2) + 4.5); y + (barHeight / 2) + 4.5);
@ -207,7 +207,7 @@ export class BarChart {
ctx.lineTo(20, this.startPointY - maxBarHeight); ctx.lineTo(20, this.startPointY - maxBarHeight);
let startPoint = this.startPointY; let startPoint = this.startPointY;
let stepSize = this.totalHeight/arr.length; let stepSize = this.totalHeight / 10; // arr.length;
let item = this.minValue; let item = this.minValue;
do { do {
let dist = (maxBarHeight / this.totalHeight) * stepSize; let dist = (maxBarHeight / this.totalHeight) * stepSize;
@ -218,7 +218,7 @@ export class BarChart {
startPoint = startPoint - dist; startPoint = startPoint - dist;
item += stepSize; item += stepSize;
// console.log(item); // console.log(item);
} while (item < this.maxValue + 1); } while (item < this.maxValue + 1);
//ctx.lineTo(70, 100); //ctx.lineTo(70, 100);
ctx.stroke(); ctx.stroke();
@ -226,7 +226,8 @@ export class BarChart {
} }
getStatTable(arr) { getStatTable(arr) {
let statTable = dom.createDom("table", { "class": "chartTable" }); let chartContainer = dom.createDom("div", { class: "chartContainer"});
let statTable = dom.createDom("table", { "class": "chartTable" }, chartContainer);
let _headerRow = dom.createDom("tr", { style: "width:100px;" }, statTable); let _headerRow = dom.createDom("tr", { style: "width:100px;" }, statTable);
let _profileHeaderColumn = dom.createDom("th", {}, _headerRow); let _profileHeaderColumn = dom.createDom("th", {}, _headerRow);
let _lableHeaderColumn = dom.createDom("th", {}, _headerRow); let _lableHeaderColumn = dom.createDom("th", {}, _headerRow);
@ -262,9 +263,11 @@ export class BarChart {
}, _profileColumn); }, _profileColumn);
let _lableColumn = dom.createDom("td", {}, _tr); let _lableColumn = dom.createDom("td", {}, _tr);
let lable = dom.createDom("div", { let lable = arr[i].name.replace("_"," ");
innerHTML: arr[i].name, dom.createDom("div", {
style: "width:75px;" innerHTML: lable,
// style: "width:75px;",
class: "layerNameColumn"
}, _lableColumn); }, _lableColumn);
let _minColumn = dom.createDom("td", {}, _tr); let _minColumn = dom.createDom("td", {}, _tr);
@ -290,7 +293,7 @@ export class BarChart {
}, _maxColumn); }, _maxColumn);
} }
return statTable; return chartContainer;
} }
_zfill(num, len) { _zfill(num, len) {
@ -322,10 +325,6 @@ export class BarChart {
if (this.hasLabel) { if (this.hasLabel) {
this.labelobj.visible = false; this.labelobj.visible = false;
} }
//// Hides HTML Label if set - uses jquery for DOM manipulation
//if ( this.hasHTMLLabel ) {
// this.hasHTMLLabel.hide();
//}
} }
} }

66
src/js/core/BaseEditor.js
View File

@ -101,14 +101,14 @@ export class BaseEditor {
if (e._cancelled) return; if (e._cancelled) return;
//if (!this.isConnected()) { //if (!this.isConnected()) {
// this.connect(e); // this.connect(e);
//} //}
let eventX = (e.clientX !== undefined) ? e.clientX : (e.touches && e.touches[0].clientX); let eventX = (e.clientX !== undefined) ? e.clientX : (e.touches && e.touches[0].clientX);
let eventY = (e.clientY !== undefined) ? e.clientY : (e.touches && e.touches[0].clientY); let eventY = (e.clientY !== undefined) ? e.clientY : (e.touches && e.touches[0].clientY);
let dxfIdentifyParams = {}; let dxfIdentifyParams = {};
dxfIdentifyParams.clientX = eventX; dxfIdentifyParams.clientX = eventX; //351
dxfIdentifyParams.clientY = eventY; dxfIdentifyParams.clientY = eventY; //554;
dxfIdentifyParams.width = this.map.container.clientWidth; dxfIdentifyParams.width = this.map.container.clientWidth; //712;
dxfIdentifyParams.height = this.map.container.clientHeight; dxfIdentifyParams.height = this.map.container.clientHeight; //715;
let deferred = this.mapTool.drillTask.execute(dxfIdentifyParams); let deferred = this.mapTool.drillTask.execute(dxfIdentifyParams);
deferred.then(this.handleQueryResults.bind(this)); deferred.then(this.handleQueryResults.bind(this));
@ -119,6 +119,39 @@ export class BaseEditor {
let results = arguments; let results = arguments;
let features = results[0].features; let features = results[0].features;
let aufschlag = results[0].aufschlag; let aufschlag = results[0].aufschlag;
// features.sort(function (point1, point2) {
// // Sort by votes
// // If the first item has a hwigher number, move it up
// // If the first item has a lower number, move it down
// if (point1.distance > point2.distance) return -1;
// if (point1.distance < point2.distance) return 1;
// });
// features.sort(function (point1, point2) {
// // Sort by votes
// // If the first item has a higher number, move it up
// // If the first item has a lower number, move it down
// if (point1.layerId > point2.layerId) return 1;
// if (point1.layerId < point2.layerId) return -1;
// });
// let newFeatures = [];
let featuresCopy = Array.from(features);
for (let i = 0; i < features.length; i ++) {
let p1 = features[i];
let p2;
if (features[i+2] != null){
if (util.round(features[i+1].distance, 4) == util.round(features[i+2].distance, 4)){
if (features[i+2].layerId == p1.layerId) {
p2 = features[i+2];
util.swap(features, i + 1, i +2);
}
}
}
// newFeatures.push(p1, p2);
}
// set the borhole marker // set the borhole marker
if (!this.isConnected()) { if (!this.isConnected()) {
this.connect(aufschlag); this.connect(aufschlag);
@ -129,7 +162,7 @@ export class BaseEditor {
// calculate heights vor bar chart // calculate heights vor bar chart
let data = []; let data = [];
for (let j = features.length - 1; j >= 0; j--) { for (let j = features.length - 2; j >= 0; j--) {
let feature = features[j]; let feature = features[j];
let point = feature.point; let point = feature.point;
// // clicked coordinates: skalierung wieder wegrechnen: // // clicked coordinates: skalierung wieder wegrechnen:
@ -140,6 +173,10 @@ export class BaseEditor {
let layer = this.map._layers[layerId]; let layer = this.map._layers[layerId];
let nextPoint; let nextPoint;
if (j !== features.length - 1) { if (j !== features.length - 1) {
let previousFeature = features[j + 1];
// if (feature.distance == previousFeature.distance) {
// continue;
// }
let previousPoint = { x: features[j + 1].point.x, y: features[j + 1].point.y, z: features[j + 1].point.z }; 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); // let previousPt = this.map.dataservice.toMapCoordinates(previousPoint.x, previousPoint.y, previousPoint.z);
@ -149,14 +186,14 @@ export class BaseEditor {
//var dist = parseInt((300 / 6000) * realHeight); //var dist = parseInt((300 / 6000) * realHeight);
if (Math.round(realHeight) > 0) { if (Math.round(realHeight) > 0) {
data.push({ data.push({
dist: realHeight,//dist, dist: realHeight,//dist,
max: point.z, max: point.z,
min: previousPoint.z, min: previousPoint.z,
color: layer.color, color: layer.color,
name: layer.name name: layer.name
}); });
//app.barChart.addBar(dist, layer.materialParameter[0].color, layer.name); //app.barChart.addBar(dist, layer.materialParameter[0].color, layer.name);
} }
} }
} }
@ -166,6 +203,7 @@ export class BaseEditor {
} }
connect(e) { connect(e) {
// On touch, the latlng has not been updated because there is // On touch, the latlng has not been updated because there is
// no mousemove. // no mousemove.

22
src/js/core/utilities.js
View File

@ -126,6 +126,28 @@ export async function getMetadata(serviceUrl) {
// return await response.json(); // return await response.json();
} }
export function swap(arr, i1, i2) {
// keep in a provisional the value of the first index
let aux = arr[i1];
// insert the value of the second index in the place of the first index
arr[i1] = arr[i2];
// By doing this I lose the original value but I have it stored in aux by
// so I just need to match the second index to aux to complete
arr[i2] = aux;
return arr;
}
export function round(wert, dez) {
wert = parseFloat(wert);
if (!wert) return 0;
dez = parseInt(dez);
if (!dez) dez = 0;
var umrechnungsfaktor = Math.pow(10, dez);
return Math.round(wert * umrechnungsfaktor) / umrechnungsfaktor;
}
// @function create(proto: Object, properties?: Object): Object // @function create(proto: Object, properties?: Object): Object
// Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create) // Compatibility polyfill for [Object.create](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/create)
export var create = Object.create || (function () { export var create = Object.create || (function () {

1
src/js/tools/BoreholeTool.js
View File

@ -1,6 +1,5 @@
import { EventEmitter } from '../core/EventEmitter'; import { EventEmitter } from '../core/EventEmitter';
import { MeshLambertMaterial } from 'three/src/materials/MeshLambertMaterial'; import { MeshLambertMaterial } from 'three/src/materials/MeshLambertMaterial';
import * as domEvent from '../core/domEvent';
import { MarkerLayer } from '../layer/MarkerLayer'; import { MarkerLayer } from '../layer/MarkerLayer';
import * as dom from '../core/domUtil'; import * as dom from '../core/domUtil';
import * as util from '../core/utilities'; import * as util from '../core/utilities';