- npm updates (package-lock.json)
- correct NortArrow functionality
This commit is contained in:
parent
524b47344d
commit
cc0100fa44
|
@ -19,8 +19,8 @@
|
||||||
"url": "http://localhost:8080",
|
"url": "http://localhost:8080",
|
||||||
"webRoot": "${workspaceFolder}",
|
"webRoot": "${workspaceFolder}",
|
||||||
"breakOnLoad": true,
|
"breakOnLoad": true,
|
||||||
// "runtimeExecutable": "C:/ProgramData/scoop/apps/googlechrome/current/chrome.exe",
|
"runtimeExecutable": "C:/ProgramData/scoop/apps/googlechrome/current/chrome.exe",
|
||||||
"runtimeExecutable": "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe",
|
// "runtimeExecutable": "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe",
|
||||||
// "sourceMapPathOverrides": {
|
// "sourceMapPathOverrides": {
|
||||||
// "webpack:///./~/*": "${workspaceFolder}/node_modules/*",
|
// "webpack:///./~/*": "${workspaceFolder}/node_modules/*",
|
||||||
// "webpack:///./*": "${workspaceFolder}/*",
|
// "webpack:///./*": "${workspaceFolder}/*",
|
||||||
|
|
184
package-lock.json
generated
184
package-lock.json
generated
|
@ -80,9 +80,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/generator": {
|
"node_modules/@babel/generator": {
|
||||||
"version": "7.12.13",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
|
||||||
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==",
|
"integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/types": "^7.12.13",
|
"@babel/types": "^7.12.13",
|
||||||
|
@ -338,9 +338,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/parser": {
|
"node_modules/@babel/parser": {
|
||||||
"version": "7.12.14",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz",
|
||||||
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==",
|
"integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"parser": "bin/babel-parser.js"
|
"parser": "bin/babel-parser.js"
|
||||||
|
@ -991,9 +991,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/plugin-transform-runtime": {
|
"node_modules/@babel/plugin-transform-runtime": {
|
||||||
"version": "7.12.13",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.13.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz",
|
||||||
"integrity": "sha512-ho1CV2lm8qn2AxD3JdvPgtLVHCYLDaOszlf0gosdHcJAIfgNizag76WI+FoibrvfT+h117fgf8h+wgvo4O2qbA==",
|
"integrity": "sha512-OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/helper-module-imports": "^7.12.13",
|
"@babel/helper-module-imports": "^7.12.13",
|
||||||
|
@ -1329,9 +1329,9 @@
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "14.14.22",
|
"version": "14.14.25",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
|
||||||
"integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==",
|
"integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@webassemblyjs/ast": {
|
"node_modules/@webassemblyjs/ast": {
|
||||||
|
@ -1728,9 +1728,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/caniuse-lite": {
|
"node_modules/caniuse-lite": {
|
||||||
"version": "1.0.30001183",
|
"version": "1.0.30001185",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz",
|
||||||
"integrity": "sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw==",
|
"integrity": "sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/chalk": {
|
"node_modules/chalk": {
|
||||||
|
@ -1869,13 +1869,13 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/copy-anything": {
|
"node_modules/copy-anything": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
|
||||||
"integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==",
|
"integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"peer": true,
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"is-what": "^3.7.1"
|
"is-what": "^3.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/core-js-compat": {
|
"node_modules/core-js-compat": {
|
||||||
|
@ -1916,23 +1916,23 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/css-loader": {
|
"node_modules/css-loader": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.2.tgz",
|
||||||
"integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
|
"integrity": "sha512-gbkBigdcHbmNvZ1Cg6aV6qh6k9N6XOr8YWzISLQGrwk2mgOH8LLrizhkxbDhQtaLtktyKHD4970S0xwz5btfTA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"camelcase": "^6.2.0",
|
"camelcase": "^6.2.0",
|
||||||
"cssesc": "^3.0.0",
|
"cssesc": "^3.0.0",
|
||||||
"icss-utils": "^5.0.0",
|
"icss-utils": "^5.1.0",
|
||||||
"loader-utils": "^2.0.0",
|
"loader-utils": "^2.0.0",
|
||||||
"postcss": "^8.1.4",
|
"postcss": "^8.2.4",
|
||||||
"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.2"
|
"semver": "^7.3.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 10.13.0"
|
"node": ">= 10.13.0"
|
||||||
|
@ -2005,9 +2005,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/date-fns": {
|
"node_modules/date-fns": {
|
||||||
"version": "2.16.1",
|
"version": "2.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
|
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
|
||||||
"integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==",
|
"integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.11"
|
"node": ">=0.11"
|
||||||
|
@ -2078,9 +2078,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/electron-to-chromium": {
|
"node_modules/electron-to-chromium": {
|
||||||
"version": "1.3.652",
|
"version": "1.3.657",
|
||||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz",
|
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz",
|
||||||
"integrity": "sha512-85J5D0Ksxjq2MIHfgwOURRej72UMlexbaa7t+oKTJan3Pa/RBE8vJ4/JzwaQjLCElPvd0XeLWi7+xYTVrq96aA==",
|
"integrity": "sha512-/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/emoji-regex": {
|
"node_modules/emoji-regex": {
|
||||||
|
@ -2544,9 +2544,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/graceful-fs": {
|
"node_modules/graceful-fs": {
|
||||||
"version": "4.2.4",
|
"version": "4.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz",
|
||||||
"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
|
"integrity": "sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/has": {
|
"node_modules/has": {
|
||||||
|
@ -3232,9 +3232,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/mini-css-extract-plugin": {
|
"node_modules/mini-css-extract-plugin": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
|
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.6.tgz",
|
||||||
"integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
|
"integrity": "sha512-t86rLnySRQgN2+58gAIARTEtnClLNZoC99shNrvQ960V/wB9n50AUKJyqly76/s4fT0zwaLFIDFZAW7aK25pvg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"loader-utils": "^2.0.0",
|
"loader-utils": "^2.0.0",
|
||||||
|
@ -3595,9 +3595,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.2.4",
|
"version": "8.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.5.tgz",
|
||||||
"integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==",
|
"integrity": "sha512-wMcb7BpDcm3gxQOQx46NDNT36Kk0Ao6PJLLI2ed5vehbbbxCEuslSQzbQ2sfSKy+gkYxhWcGWSeaK+gwm4KIZg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"colorette": "^1.2.1",
|
"colorette": "^1.2.1",
|
||||||
|
@ -4506,9 +4506,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/watchpack": {
|
"node_modules/watchpack": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
|
||||||
"integrity": "sha512-UjgD1mqjkG99+3lgG36at4wPnUXNvis2v1utwTgQ43C22c4LD71LsYMExdWXh4HZ+RmW+B0t1Vrg2GpXAkTOQw==",
|
"integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"glob-to-regexp": "^0.4.1",
|
"glob-to-regexp": "^0.4.1",
|
||||||
|
@ -4519,9 +4519,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/webpack": {
|
"node_modules/webpack": {
|
||||||
"version": "5.20.1",
|
"version": "5.21.2",
|
||||||
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.20.1.tgz",
|
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.21.2.tgz",
|
||||||
"integrity": "sha512-cStILc8W14WZXsgfeJmNIQlmQU06F7THfCJ6id3pIB/EXuR6nquolJ2ZJoaLNb6zdec6O2jOAzVKtBYc7vGDjg==",
|
"integrity": "sha512-xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/eslint-scope": "^3.7.0",
|
"@types/eslint-scope": "^3.7.0",
|
||||||
|
@ -4894,9 +4894,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@babel/generator": {
|
"@babel/generator": {
|
||||||
"version": "7.12.13",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
|
||||||
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==",
|
"integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/types": "^7.12.13",
|
"@babel/types": "^7.12.13",
|
||||||
|
@ -5143,9 +5143,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@babel/parser": {
|
"@babel/parser": {
|
||||||
"version": "7.12.14",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz",
|
||||||
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==",
|
"integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@babel/plugin-proposal-async-generator-functions": {
|
"@babel/plugin-proposal-async-generator-functions": {
|
||||||
|
@ -5637,9 +5637,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@babel/plugin-transform-runtime": {
|
"@babel/plugin-transform-runtime": {
|
||||||
"version": "7.12.13",
|
"version": "7.12.15",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.13.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz",
|
||||||
"integrity": "sha512-ho1CV2lm8qn2AxD3JdvPgtLVHCYLDaOszlf0gosdHcJAIfgNizag76WI+FoibrvfT+h117fgf8h+wgvo4O2qbA==",
|
"integrity": "sha512-OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/helper-module-imports": "^7.12.13",
|
"@babel/helper-module-imports": "^7.12.13",
|
||||||
|
@ -5933,9 +5933,9 @@
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "14.14.22",
|
"version": "14.14.25",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
|
||||||
"integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==",
|
"integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@webassemblyjs/ast": {
|
"@webassemblyjs/ast": {
|
||||||
|
@ -6263,9 +6263,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"caniuse-lite": {
|
"caniuse-lite": {
|
||||||
"version": "1.0.30001183",
|
"version": "1.0.30001185",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz",
|
||||||
"integrity": "sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw==",
|
"integrity": "sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"chalk": {
|
"chalk": {
|
||||||
|
@ -6388,13 +6388,13 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"copy-anything": {
|
"copy-anything": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
|
||||||
"integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==",
|
"integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"peer": true,
|
"peer": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-what": "^3.7.1"
|
"is-what": "^3.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"core-js-compat": {
|
"core-js-compat": {
|
||||||
|
@ -6427,23 +6427,23 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"css-loader": {
|
"css-loader": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.2.tgz",
|
||||||
"integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
|
"integrity": "sha512-gbkBigdcHbmNvZ1Cg6aV6qh6k9N6XOr8YWzISLQGrwk2mgOH8LLrizhkxbDhQtaLtktyKHD4970S0xwz5btfTA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"camelcase": "^6.2.0",
|
"camelcase": "^6.2.0",
|
||||||
"cssesc": "^3.0.0",
|
"cssesc": "^3.0.0",
|
||||||
"icss-utils": "^5.0.0",
|
"icss-utils": "^5.1.0",
|
||||||
"loader-utils": "^2.0.0",
|
"loader-utils": "^2.0.0",
|
||||||
"postcss": "^8.1.4",
|
"postcss": "^8.2.4",
|
||||||
"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.2"
|
"semver": "^7.3.4"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"loader-utils": {
|
"loader-utils": {
|
||||||
|
@ -6486,9 +6486,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"date-fns": {
|
"date-fns": {
|
||||||
"version": "2.16.1",
|
"version": "2.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
|
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
|
||||||
"integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==",
|
"integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
|
@ -6532,9 +6532,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"electron-to-chromium": {
|
"electron-to-chromium": {
|
||||||
"version": "1.3.652",
|
"version": "1.3.657",
|
||||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz",
|
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz",
|
||||||
"integrity": "sha512-85J5D0Ksxjq2MIHfgwOURRej72UMlexbaa7t+oKTJan3Pa/RBE8vJ4/JzwaQjLCElPvd0XeLWi7+xYTVrq96aA==",
|
"integrity": "sha512-/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"emoji-regex": {
|
"emoji-regex": {
|
||||||
|
@ -6886,9 +6886,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"graceful-fs": {
|
"graceful-fs": {
|
||||||
"version": "4.2.4",
|
"version": "4.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz",
|
||||||
"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
|
"integrity": "sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"has": {
|
"has": {
|
||||||
|
@ -7393,9 +7393,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"mini-css-extract-plugin": {
|
"mini-css-extract-plugin": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
|
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.6.tgz",
|
||||||
"integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
|
"integrity": "sha512-t86rLnySRQgN2+58gAIARTEtnClLNZoC99shNrvQ960V/wB9n50AUKJyqly76/s4fT0zwaLFIDFZAW7aK25pvg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"loader-utils": "^2.0.0",
|
"loader-utils": "^2.0.0",
|
||||||
|
@ -7659,9 +7659,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"postcss": {
|
"postcss": {
|
||||||
"version": "8.2.4",
|
"version": "8.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.5.tgz",
|
||||||
"integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==",
|
"integrity": "sha512-wMcb7BpDcm3gxQOQx46NDNT36Kk0Ao6PJLLI2ed5vehbbbxCEuslSQzbQ2sfSKy+gkYxhWcGWSeaK+gwm4KIZg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"colorette": "^1.2.1",
|
"colorette": "^1.2.1",
|
||||||
|
@ -8346,9 +8346,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"watchpack": {
|
"watchpack": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
|
||||||
"integrity": "sha512-UjgD1mqjkG99+3lgG36at4wPnUXNvis2v1utwTgQ43C22c4LD71LsYMExdWXh4HZ+RmW+B0t1Vrg2GpXAkTOQw==",
|
"integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"glob-to-regexp": "^0.4.1",
|
"glob-to-regexp": "^0.4.1",
|
||||||
|
@ -8356,9 +8356,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"webpack": {
|
"webpack": {
|
||||||
"version": "5.20.1",
|
"version": "5.21.2",
|
||||||
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.20.1.tgz",
|
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.21.2.tgz",
|
||||||
"integrity": "sha512-cStILc8W14WZXsgfeJmNIQlmQU06F7THfCJ6id3pIB/EXuR6nquolJ2ZJoaLNb6zdec6O2jOAzVKtBYc7vGDjg==",
|
"integrity": "sha512-xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@types/eslint-scope": "^3.7.0",
|
"@types/eslint-scope": "^3.7.0",
|
||||||
|
|
|
@ -3,9 +3,10 @@
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
border: none;
|
border: none;
|
||||||
width: 120px;
|
width: 100px;
|
||||||
height: 120px;
|
height: 100px;
|
||||||
z-index: 9999999;
|
z-index: 9999999;
|
||||||
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* label */
|
/* label */
|
||||||
|
@ -40,8 +41,8 @@
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.blue-label {
|
.gray-label {
|
||||||
color: #00bfff;
|
color: #6b716f;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
text-shadow: -1px -1px #FFF, 0 -1px #FFF, 1px -1px #FFF, -1px 0 #FFF, 1px 0 #FFF, -1px 1px #FFF, 0 1px #FFF, 1px 1px #FFF;
|
text-shadow: -1px -1px #FFF, 0 -1px #FFF, 1px -1px #FFF, -1px 0 #FFF, 1px 0 #FFF, -1px 1px #FFF, 0 1px #FFF, 1px 1px #FFF;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
@ -8,13 +8,13 @@ import * as domEvent from '../core/domEvent';
|
||||||
import { WebGLRenderer } from 'three/src/renderers/WebGLRenderer';
|
import { WebGLRenderer } from 'three/src/renderers/WebGLRenderer';
|
||||||
import { Scene } from 'three/src/scenes/Scene';
|
import { Scene } from 'three/src/scenes/Scene';
|
||||||
import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera';
|
import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera';
|
||||||
import { BoxGeometry } from 'three/src/geometries/BoxGeometry';
|
// import { BoxGeometry } from 'three/src/geometries/BoxGeometry';
|
||||||
import { MeshBasicMaterial } from 'three/src/materials/MeshBasicMaterial';
|
// import { MeshBasicMaterial } from 'three/src/materials/MeshBasicMaterial';
|
||||||
import { Mesh } from 'three/src/objects/Mesh';
|
// import { Mesh } from 'three/src/objects/Mesh';
|
||||||
|
|
||||||
import './NorthArrow.css';
|
import './NorthArrow.css';
|
||||||
|
|
||||||
export class NortArrow extends Control {
|
export class NorthArrow extends Control {
|
||||||
|
|
||||||
renderer;
|
renderer;
|
||||||
_mainMap;
|
_mainMap;
|
||||||
|
@ -25,8 +25,8 @@ export class NortArrow extends Control {
|
||||||
labels = [];
|
labels = [];
|
||||||
options = {
|
options = {
|
||||||
position: 'bottomleft',
|
position: 'bottomleft',
|
||||||
width: 120,
|
width: 100,
|
||||||
height: 120,
|
height: 100,
|
||||||
headLength: 1,
|
headLength: 1,
|
||||||
headWidth: 1,
|
headWidth: 1,
|
||||||
};
|
};
|
||||||
|
@ -48,88 +48,48 @@ export class NortArrow extends Control {
|
||||||
domEvent.on(this._container, 'mousewheel', domEvent.stopPropagation);
|
domEvent.on(this._container, 'mousewheel', domEvent.stopPropagation);
|
||||||
|
|
||||||
let renderer = this.renderer = new WebGLRenderer({ alpha: true });
|
let renderer = this.renderer = new WebGLRenderer({ alpha: true });
|
||||||
renderer.setSize(120, 120);
|
renderer.setSize(this.options.width, this.options.height);
|
||||||
// renderer.setSize(container.innerWidth, container.innerHeight);
|
|
||||||
container.appendChild(renderer.domElement);
|
container.appendChild(renderer.domElement);
|
||||||
|
|
||||||
this._scene = new Scene();
|
this._scene = new Scene();
|
||||||
// this._camera = new PerspectiveCamera(60, 1, 0.1, 1000);
|
|
||||||
|
|
||||||
this._camera = new PerspectiveCamera(30, this.options.width / this.options.height, 0.1, 10000);
|
this._camera = new PerspectiveCamera(30, this.options.width / this.options.height, 0.1, 10000);
|
||||||
// this._camera.position.copy(map.camera.position);
|
|
||||||
// this._camera.up = map.camera.up;
|
|
||||||
this._camera.lookAt(map.center);
|
this._camera.lookAt(map.center);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const camDirection = new Vector3(-0.5, -Math.SQRT1_2, 0.5);
|
const camDirection = new Vector3(-0.5, -Math.SQRT1_2, 0.5);
|
||||||
// const camDirection = new Vector3(0, 0, 1);
|
// const camDirection = new Vector3(0, 0, 1);
|
||||||
const camOffset = camDirection.multiplyScalar(map.size * 2);
|
const camOffset = camDirection.multiplyScalar(map.size * 2);
|
||||||
this._camera.position.copy(map.center);
|
this._camera.position.copy(map.center);
|
||||||
this._camera.position.add(camOffset);
|
this._camera.position.add(camOffset);
|
||||||
|
|
||||||
this._camera.far = map.size * 25;
|
|
||||||
this._camera.near = map.size * 0.1;
|
|
||||||
// this._camera.far = 1000 * 25;
|
|
||||||
// this._camera.near = 10;
|
|
||||||
this._camera.lookAt(map.center);
|
this._camera.lookAt(map.center);
|
||||||
|
this._camera.up = this._map.camera.up;
|
||||||
this._camera.updateProjectionMatrix();
|
this._camera.updateProjectionMatrix();
|
||||||
|
|
||||||
|
|
||||||
var A = this._map.center;
|
|
||||||
var B = this._map.camera.position
|
|
||||||
var C = new Vector3();
|
|
||||||
this.oldLength = A.distanceTo(B);
|
|
||||||
|
|
||||||
this._createArrow(this._scene);
|
this._createArrow(this._scene);
|
||||||
// this._buildLabels();
|
this._buildLabels();
|
||||||
|
|
||||||
|
// this.geometry = new BoxGeometry(10000, 10000, 10000);
|
||||||
|
// this.material = new MeshBasicMaterial({
|
||||||
this.geometry = new BoxGeometry(10000, 10000, 10000);
|
// color: 800080
|
||||||
this.material = new MeshBasicMaterial({
|
// });
|
||||||
color: 800080
|
// this.materials = [];
|
||||||
});
|
// this.materials.push(this.material);
|
||||||
this.materials = [];
|
// this.mesh = new Mesh(this.geometry, this.material);
|
||||||
this.materials.push(this.material);
|
// this.mesh.position.set(map.center.x, map.center.y, map.center.z);
|
||||||
this.mesh = new Mesh(this.geometry, this.material);
|
// this._scene.add(this.mesh);
|
||||||
// this.mesh.position.x = 4282010;
|
|
||||||
// this.mesh.position.y = 2302070;
|
|
||||||
// this.mesh.position.z = -13616.3;
|
|
||||||
this.mesh.position.set(map.center.x, map.center.y, map.center.z);
|
|
||||||
this._scene.add(this.mesh);
|
|
||||||
|
|
||||||
return container;
|
return container;
|
||||||
}
|
}
|
||||||
|
|
||||||
animate() {
|
animate() {
|
||||||
|
|
||||||
// this._camera.position.copy(this._map.camera.position);
|
// this._camera.position.copy(this._map.camera.position);
|
||||||
// this._camera.up = this._map.camera.up;
|
// // this._camera.position.normalize().multiplyScalar(100);
|
||||||
// // // this._camera.lookAt(this._scene.position);
|
// // this._camera.position.setLength(this.oldLength);
|
||||||
|
// // this._camera.up = this._map.camera.up;
|
||||||
// this._camera.lookAt(this._map.center);
|
// this._camera.lookAt(this._map.center);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// var A = this._map.center;
|
|
||||||
// var B = this._map.camera.position
|
|
||||||
// var C = new Vector3();
|
|
||||||
// var oldLength = A.distanceTo(B);
|
|
||||||
// var newLength = 1000;// oldLength + 100;
|
|
||||||
// if(oldLength > 0)
|
|
||||||
// {
|
|
||||||
// C.x = A.x + (B.x - A.x) * newLength / oldLength;
|
|
||||||
// C.y = A.y + (B.y - A.y) * newLength / oldLength;
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this._camera.position.copy(this._map.camera.position);
|
this._camera.position.copy(this._map.camera.position);
|
||||||
// this._camera.position.normalize().multiplyScalar(100);
|
this._camera.position.sub(this._map.target);
|
||||||
// this._camera.position.setLength(this.oldLength);
|
this._camera.position.setLength(35);
|
||||||
this._camera.up = this._map.camera.up;
|
this._camera.lookAt(this._scene.position);
|
||||||
this._camera.lookAt(this._map.center);
|
|
||||||
// this._camera.lookAt(this._scene.position);
|
|
||||||
|
|
||||||
// this._camera.near =10;
|
// this._camera.near =10;
|
||||||
// this._camera.far = 1000 * 25;
|
// this._camera.far = 1000 * 25;
|
||||||
|
@ -137,35 +97,29 @@ export class NortArrow extends Control {
|
||||||
// this._camera.updateProjectionMatrix();
|
// this._camera.updateProjectionMatrix();
|
||||||
|
|
||||||
this.renderer.render(this._scene, this._camera);
|
this.renderer.render(this._scene, this._camera);
|
||||||
// this._updateInsetLabelPositions();
|
this._updateInsetLabelPositions();
|
||||||
}
|
}
|
||||||
|
|
||||||
_createArrow(app_scene) {
|
_createArrow(app_scene, size = 6) {
|
||||||
let from = this._map.center;//new Vector3(0, 0, 0);
|
let from = new Vector3(0, 0, 0);
|
||||||
let headLength = this.options.headLength;//1;
|
let headLength = this.options.headLength;//1;
|
||||||
let headWidth = 1;//this.options.headWidth;//1;
|
let headWidth = 1;//this.options.headWidth;//1;
|
||||||
|
|
||||||
let xTo = new Vector3(1, 0, 0);
|
let xTo = new Vector3(1, 0, 0);
|
||||||
// let xTo = new Vector3(from.x + 1, from.y, from.z);
|
// let xTo = new Vector3(from.x + 1, from.y, from.z);
|
||||||
// let xDirection = xTo.clone().sub(from);
|
// let xDirection = xTo.clone().sub(from);
|
||||||
this.objectGroup.add(new ArrowHelper(xTo, from, this._map.size* 0.5, 0xf00000, headLength, headWidth)); // Red = x
|
//(this.objectGroup.add(new ArrowHelper(xTo, from, this._map.size * 0.5, 0xf00000, headLength, headWidth)); // Red = x
|
||||||
|
this.objectGroup.add(new ArrowHelper(xTo, from, size, 0xff0000, headLength, headWidth)); // Red = x
|
||||||
|
|
||||||
let yTo = new Vector3(0, 1, 0);
|
let yTo = new Vector3(0, -1, 0);
|
||||||
// let yTo = new Vector3(from.x, from.y + 1, from.z);
|
// let yTo = new Vector3(from.x, from.y + 1, from.z);
|
||||||
// let yDirection = yTo.clone().sub(from);
|
// let yDirection = yTo.clone().sub(from);
|
||||||
this.objectGroup.add(new ArrowHelper(yTo, from, this._map.size * 0.5, 0x7cfc00, headLength, headWidth)); // Green = y
|
this.objectGroup.add(new ArrowHelper(yTo, from, size, 0x3ad29f, headLength, headWidth)); // Green = y
|
||||||
|
|
||||||
let zTo = new Vector3(0, 0, 1);//blue z
|
let zTo = new Vector3(0, 0, 1);//blue z
|
||||||
// let zTo = new Vector3(from.x, from.y, from.z + 1);
|
// let zTo = new Vector3(from.x, from.y, from.z + 1);
|
||||||
// let zDirection = zTo.clone().sub(from);
|
// let zDirection = zTo.clone().sub(from);
|
||||||
this.objectGroup.add(new ArrowHelper(zTo, from, this._map.size * 0.5, 0x00bfff, headLength, headWidth)); //8 is the length, Blue = z; 20 and 10 are head length and width
|
this.objectGroup.add(new ArrowHelper(zTo, from, size, 0x6b716f, headLength, headWidth)); //8 is the length, Gray = z; 20 and 10 are head length and width
|
||||||
|
|
||||||
// let opt = { r: 200, c: 0x38eeff, o: 0.8 };
|
|
||||||
// this._queryMarker = new Mesh(new SphereGeometry(opt.r),
|
|
||||||
// new MeshLambertMaterial({ color: opt.c, opacity: opt.o, transparent: false }));
|
|
||||||
// this._queryMarker.visible = true;
|
|
||||||
// this._queryMarker.position.set(0, 0, -1);
|
|
||||||
// this.objectGroup.position.set(this._map.center.x, this._map.center.y, this._map.center.z);
|
|
||||||
|
|
||||||
if (app_scene) {
|
if (app_scene) {
|
||||||
app_scene.add(this.objectGroup);
|
app_scene.add(this.objectGroup);
|
||||||
|
@ -175,44 +129,41 @@ export class NortArrow extends Control {
|
||||||
_buildLabels() {
|
_buildLabels() {
|
||||||
|
|
||||||
let f = [
|
let f = [
|
||||||
{ a: ["X"], cl: "red-label", centroid: [[7, 0, 0]] },
|
{ a: ["x"], cl: "red-label", centroid: [[8, 0, 0]] },
|
||||||
{ a: ["Y"], cl: "green-label", centroid: [[0, 7, 0]] },
|
{ a: ["y"], cl: "green-label", centroid: [[0, -8, 0]] },
|
||||||
{ a: ["Z"], cl: "blue-label", centroid: [[0, 0, 7]] }
|
{ a: ["z"], cl: "gray-label", centroid: [[0, 0, 8]] }
|
||||||
];
|
];
|
||||||
|
|
||||||
var zFunc, getPointsFunc = function (f) { return f.centroid; };
|
let getPointsFunc = function (f) { return f.centroid; };
|
||||||
|
|
||||||
|
|
||||||
// create parent element for labels
|
// create parent element for labels
|
||||||
var e = document.createElement("div");
|
var e = document.createElement("div");
|
||||||
this._container.appendChild(e);
|
this._container.appendChild(e);
|
||||||
e.style.display = (this.objectGroup.visible) ? "block" : "none";
|
e.style.display = (this.objectGroup.visible) ? "block" : "none";
|
||||||
let labelParentElement = e; //lable parent div for this layer
|
let labelParentElement = this.labelParentElement = e; //lable parent div for this layer
|
||||||
|
|
||||||
for (let i = 0, l = f.length; i < l; i++) {
|
for (let i = 0, l = f.length; i < l; i++) {
|
||||||
var labelInfo = f[i];
|
let labelInfo = f[i];
|
||||||
// labelInfo.aElems = [];
|
// labelInfo.aElems = [];
|
||||||
// labelInfo.aObjs = [];
|
// labelInfo.aObjs = [];
|
||||||
var text = labelInfo.a[0];
|
let text = labelInfo.a[0];
|
||||||
if (text === null || text === "") continue;
|
if (text === null || text === "") continue;
|
||||||
|
|
||||||
var classLabel = labelInfo.cl;
|
let classLabel = labelInfo.cl;
|
||||||
if (classLabel === undefined || classLabel === "") classLabel = "label";
|
if (classLabel === undefined || classLabel === "") classLabel = "label";
|
||||||
|
|
||||||
//var horizontalShiftLabel = f.hs;
|
|
||||||
//if (horizontalShiftLabel === undefined || horizontalShiftLabel === "") horizontalShiftLabel = 0;
|
|
||||||
|
|
||||||
let pts = getPointsFunc(labelInfo);
|
let pts = getPointsFunc(labelInfo);
|
||||||
for (let j = 0, m = pts.length; j < m; j++) {
|
for (let j = 0, m = pts.length; j < m; j++) {
|
||||||
let pt = pts[j];
|
let pt = pts[j];
|
||||||
|
|
||||||
// create div element for label
|
// create div element for label
|
||||||
var e = document.createElement("div");
|
let e = document.createElement("div");
|
||||||
e.appendChild(document.createTextNode(text));
|
e.appendChild(document.createTextNode(text));
|
||||||
e.className = classLabel;// "label";
|
e.className = classLabel;// "label";
|
||||||
labelParentElement.appendChild(e);
|
labelParentElement.appendChild(e);
|
||||||
|
|
||||||
var pt1 = new Vector3(pt[0], pt[1], pt[2]); // top
|
let pt1 = new Vector3(pt[0], pt[1], pt[2]); // top
|
||||||
|
|
||||||
this.labels.push({ labelDiv: e, pt: pt1 });
|
this.labels.push({ labelDiv: e, pt: pt1 });
|
||||||
}
|
}
|
||||||
|
@ -223,10 +174,10 @@ export class NortArrow extends Control {
|
||||||
}
|
}
|
||||||
|
|
||||||
_updateInsetLabelPositions() {
|
_updateInsetLabelPositions() {
|
||||||
var widthHalf = this.options.width / 2;
|
let widthHalf = this.options.width / 2;
|
||||||
var heightHalf = this.options.height / 2;
|
let heightHalf = this.options.height / 2;
|
||||||
// var autosize = appSettings.Options.label.autoSize;
|
// var autosize = appSettings.Options.label.autoSize;
|
||||||
// var camera = app.camera2;
|
|
||||||
let camera_pos = this._camera.position;
|
let camera_pos = this._camera.position;
|
||||||
let target = new Vector3(0, 0, 0);
|
let target = new Vector3(0, 0, 0);
|
||||||
let c2t = target.sub(camera_pos);
|
let c2t = target.sub(camera_pos);
|
||||||
|
@ -234,7 +185,7 @@ export class NortArrow extends Control {
|
||||||
let v = new Vector3();
|
let v = new Vector3();
|
||||||
|
|
||||||
// make a list of [label index, distance to camera]
|
// make a list of [label index, distance to camera]
|
||||||
var idx_dist = [];
|
let idx_dist = [];
|
||||||
for (let i = 0, l = this.labels.length; i < l; i++) {
|
for (let i = 0, l = this.labels.length; i < l; i++) {
|
||||||
idx_dist.push([i, camera_pos.distanceTo(this.labels[i].pt)]);
|
idx_dist.push([i, camera_pos.distanceTo(this.labels[i].pt)]);
|
||||||
}
|
}
|
||||||
|
@ -246,7 +197,7 @@ export class NortArrow extends Control {
|
||||||
return 0;
|
return 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
let label, labelDiv, x, y, dist, fontSize;
|
let label, labelDiv, x, y;
|
||||||
// var minFontSize = appSettings.Options.label.minFontSize;
|
// var minFontSize = appSettings.Options.label.minFontSize;
|
||||||
for (let i = 0, l = idx_dist.length; i < l; i++) {
|
for (let i = 0, l = idx_dist.length; i < l; i++) {
|
||||||
label = this.labels[idx_dist[i][0]];
|
label = this.labels[idx_dist[i][0]];
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { DemLayer } from './layer/DemLayer';
|
||||||
import { Map } from './core/Map';
|
import { Map } from './core/Map';
|
||||||
import * as domEvent from './core/domEvent';
|
import * as domEvent from './core/domEvent';
|
||||||
import { Coordinates } from './controls/Coordinates';
|
import { Coordinates } from './controls/Coordinates';
|
||||||
// import { NortArrow } from './controls/NorthArrow';
|
import { NorthArrow } from './controls/NorthArrow';
|
||||||
import { LayerControl } from './controls/LayerControl';
|
import { LayerControl } from './controls/LayerControl';
|
||||||
import { BasemapControl } from './controls/BasemapControl';
|
import { BasemapControl } from './controls/BasemapControl';
|
||||||
import { SliderControl } from './controls/SliderControl';
|
import { SliderControl } from './controls/SliderControl';
|
||||||
|
@ -183,7 +183,7 @@ class Application {
|
||||||
// this.animate();
|
// this.animate();
|
||||||
// }, this);
|
// }, this);
|
||||||
}
|
}
|
||||||
// this.northArrow = new NortArrow({ headLength: 1, headWidth: 1 }).addTo(this.map);
|
this.northArrow = new NorthArrow({ headLength: 1, headWidth: 1 }).addTo(this.map);
|
||||||
|
|
||||||
let demLayer = new DemLayer({
|
let demLayer = new DemLayer({
|
||||||
q: 0, shading: true, type: 'dem', name: 'DEM Layer', color: 16382457, "baseExtent": baseExtent,
|
q: 0, shading: true, type: 'dem', name: 'DEM Layer', color: 16382457, "baseExtent": baseExtent,
|
||||||
|
@ -313,7 +313,7 @@ class Application {
|
||||||
|
|
||||||
animate() {
|
animate() {
|
||||||
this.renderer.render(this.scene, this.camera);
|
this.renderer.render(this.scene, this.camera);
|
||||||
// this.northArrow.animate();
|
this.northArrow.animate();
|
||||||
this.gridlayer.animate();
|
this.gridlayer.animate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user