- npm updates

- Vienna Model Arae (other base extent and ima sizes)
This commit is contained in:
Arno Kaimbacher 2021-02-02 18:28:33 +01:00
parent f16a6cec49
commit cbe8a316eb
6 changed files with 95 additions and 92 deletions

View File

@ -5,7 +5,8 @@
} }
], ],
"settings": { "settings": {
"svg.preview.background": "custom" "svg.preview.background": "custom",
"json.maxItemsComputed": 4000
}, },
"launch": { "launch": {
"version": "0.2.0", "version": "0.2.0",

84
package-lock.json generated
View File

@ -1686,16 +1686,16 @@
} }
}, },
"node_modules/browserslist": { "node_modules/browserslist": {
"version": "4.16.1", "version": "4.16.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
"integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001173", "caniuse-lite": "^1.0.30001181",
"colorette": "^1.2.1", "colorette": "^1.2.1",
"electron-to-chromium": "^1.3.634", "electron-to-chromium": "^1.3.649",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^1.1.69" "node-releases": "^1.1.70"
}, },
"bin": { "bin": {
"browserslist": "cli.js" "browserslist": "cli.js"
@ -2090,9 +2090,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.3.648", "version": "1.3.649",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.648.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.649.tgz",
"integrity": "sha512-4POzwyQ80tkDiBwkxn7IpfzioimrjRSFX1sCQ3pLZsYJ5ERYmwzdq0hZZ3nFP7Z6GtmnSn3xwWDm8FPlMeOoEQ==", "integrity": "sha512-ojGDupQ3UMkvPWcTICe4JYe17+o9OLiFMPoduoR72Zp2ILt1mRVeqnxBEd6s/ptekrnsFU+0A4lStfBe/wyG/A==",
"dev": true "dev": true
}, },
"node_modules/emoji-regex": { "node_modules/emoji-regex": {
@ -2908,9 +2908,9 @@
"dev": true "dev": true
}, },
"node_modules/json5": { "node_modules/json5": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
@ -2951,9 +2951,9 @@
} }
}, },
"node_modules/less": { "node_modules/less": {
"version": "4.1.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/less/-/less-4.1.0.tgz", "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
"integrity": "sha512-w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==", "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"dependencies": { "dependencies": {
@ -3831,9 +3831,9 @@
"dev": true "dev": true
}, },
"node_modules/regjsparser": { "node_modules/regjsparser": {
"version": "0.6.6", "version": "0.6.7",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
"integrity": "sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==", "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"jsesc": "~0.5.0" "jsesc": "~0.5.0"
@ -4531,9 +4531,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.18.0", "version": "5.19.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.18.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.19.0.tgz",
"integrity": "sha512-RmiP/iy6ROvVe/S+u0TrvL/oOmvP+2+Bs8MWjvBwwY/j82Q51XJyDJ75m0QAGntL1Wx6B//Xc0+4VPP/hlNHmw==", "integrity": "sha512-egX19vAQ8fZ4cVYtA9Y941eqJtcZAK68mQq87MMv+GTXKZOc3TpKBBxdGX+HXUYlquPxiluNsJ1VHvwwklW7CQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",
@ -6326,16 +6326,16 @@
} }
}, },
"browserslist": { "browserslist": {
"version": "4.16.1", "version": "4.16.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
"integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001173", "caniuse-lite": "^1.0.30001181",
"colorette": "^1.2.1", "colorette": "^1.2.1",
"electron-to-chromium": "^1.3.634", "electron-to-chromium": "^1.3.649",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^1.1.69" "node-releases": "^1.1.70"
} }
}, },
"buffer-from": { "buffer-from": {
@ -6630,9 +6630,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.648", "version": "1.3.649",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.648.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.649.tgz",
"integrity": "sha512-4POzwyQ80tkDiBwkxn7IpfzioimrjRSFX1sCQ3pLZsYJ5ERYmwzdq0hZZ3nFP7Z6GtmnSn3xwWDm8FPlMeOoEQ==", "integrity": "sha512-ojGDupQ3UMkvPWcTICe4JYe17+o9OLiFMPoduoR72Zp2ILt1mRVeqnxBEd6s/ptekrnsFU+0A4lStfBe/wyG/A==",
"dev": true "dev": true
}, },
"emoji-regex": { "emoji-regex": {
@ -7252,9 +7252,9 @@
"dev": true "dev": true
}, },
"json5": { "json5": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"dev": true, "dev": true,
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
@ -7280,9 +7280,9 @@
"dev": true "dev": true
}, },
"less": { "less": {
"version": "4.1.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/less/-/less-4.1.0.tgz", "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
"integrity": "sha512-w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==", "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"requires": { "requires": {
@ -7932,9 +7932,9 @@
"dev": true "dev": true
}, },
"regjsparser": { "regjsparser": {
"version": "0.6.6", "version": "0.6.7",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
"integrity": "sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==", "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"jsesc": "~0.5.0" "jsesc": "~0.5.0"
@ -8454,9 +8454,9 @@
} }
}, },
"webpack": { "webpack": {
"version": "5.18.0", "version": "5.19.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.18.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.19.0.tgz",
"integrity": "sha512-RmiP/iy6ROvVe/S+u0TrvL/oOmvP+2+Bs8MWjvBwwY/j82Q51XJyDJ75m0QAGntL1Wx6B//Xc0+4VPP/hlNHmw==", "integrity": "sha512-egX19vAQ8fZ4cVYtA9Y941eqJtcZAK68mQq87MMv+GTXKZOc3TpKBBxdGX+HXUYlquPxiluNsJ1VHvwwklW7CQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/eslint-scope": "^3.7.0", "@types/eslint-scope": "^3.7.0",

View File

@ -12,24 +12,9 @@ export class BasemapControl extends Control {
constructor(title, options) { constructor(title, options) {
super(title, options); super(title, options);
util.setOptions(this, options); util.setOptions(this, options);
// for (var i in baseLayers) {
// this._addLayer(baseLayers[i], i);
// }
} }
// onAdd(map) {
// super.onAdd(map);
// let basemaps = this.basemaps = map.basemaps;
// this._initBasemapHtml(basemaps.services);
// }
// onAdd(map) { // onAdd(map) {
// this._mainMap = map; // this._mainMap = map;
// let basemaps = this.basemaps = map.basemaps; // let basemaps = this.basemaps = map.basemaps;

View File

@ -15,14 +15,14 @@ import { TextureLoader } from 'three/src/loaders/TextureLoader';
export class DemLayer extends Layer { export class DemLayer extends Layer {
images = [{ images = [{
"width": 904, "width": 407, //904,
"url": "https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/export", "url": "https://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/export",
"height": 509, "height": 549, //509
"bboxSR": 3034 "bboxSR": 3034
}, { }, {
"width": 904, "width": 407,
"url": "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/export", "url": "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/export",
"height": 509, "height": 549,
"bboxSR": 3034 "bboxSR": 3034
} }
]; ];

View File

@ -105,7 +105,7 @@ export class GridLayer extends Layer {
} }
buildY(size, divisions, constant) { buildY(size, divisions, constant) {
let step = size / divisions; let step = this._round(size / divisions, 4);
let vertices = []; let vertices = [];
for (let k = this._map.y.min; k <= this._map.y.max; k = k + step) { for (let k = this._map.y.min; k <= this._map.y.max; k = k + step) {
@ -186,7 +186,7 @@ export class GridLayer extends Layer {
} }
let ySize = this._map.width; let ySize = this._map.width;
let yStep = ySize / divisions; let yStep = this._round(ySize / divisions, 4);
for (let k = this._map.y.min; k <= this._map.y.max; k = k + yStep) { for (let k = this._map.y.min; k <= this._map.y.max; k = k + yStep) {
let yCoordinate = (k % 1 != 0) ? this._round(k, 2) : k; let yCoordinate = (k % 1 != 0) ? this._round(k, 2) : k;
let info = { a: yCoordinate, size: yStep, axis: "y", color: 0x3ad29f, cl: "green-label", h: 0.6, centroid: [[this._map.x.min, k, this.gridBottomZ]] }; let info = { a: yCoordinate, size: yStep, axis: "y", color: 0x3ad29f, cl: "green-label", h: 0.6, centroid: [[this._map.x.min, k, this.gridBottomZ]] };

File diff suppressed because one or more lines are too long