diff --git a/README.md b/README.md index e66839cd..80831543 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ * πŸ—ΊοΈ View map layers from a specific [`mapget`](https://github.com/klebert-engineering/mapget) server. * 🎨 Define visual styles for map layers through style-sheets, translating specific features into visual elements in both 2D and 3D. * πŸ”οΈ Experience 3D features and terrains with a flexible 3D camera powered by [CesiumJS](https://github.com/CesiumGS/cesium/). -* ✍️ Edit map layer style sheets in real-time directly from the front-end **(Planned)**. +* ✍️ Edit map layer style sheets in real-time directly from the front-end. * πŸ” Select multiple features at once using filter or lasso selection tools **(Planned)**. * πŸ–ΌοΈ Utilize split-screen panes for optional overlay or synchronized navigation with an adjustable splitter **(Planned)**. * πŸ”Ž View multiple map layer tile zoom levels all at once **(Planned)**. diff --git a/docs/erdblick.png b/docs/erdblick.png index 6f1a7994..bc7bc53c 100644 Binary files a/docs/erdblick.png and b/docs/erdblick.png differ diff --git a/erdblick_app/app/map.panel.component.ts b/erdblick_app/app/map.panel.component.ts index d93f20b9..e2cf853c 100644 --- a/erdblick_app/app/map.panel.component.ts +++ b/erdblick_app/app/map.panel.component.ts @@ -1,6 +1,6 @@ import {Component, ViewChild} from "@angular/core"; import {InfoMessageService} from "./info.service"; -import {MapInfoItem, MapService} from "./map.service"; +import {CoverageRectItem, MapInfoItem, MapService} from "./map.service"; import {ErdblickStyle, StyleService} from "./style.service"; import {ParametersService} from "./parameters.service"; import {FileUpload} from "primeng/fileupload"; @@ -60,7 +60,7 @@ import {Menu} from "primeng/menu"; {{ mapLayer.value.tileBorders ? 'select_all' : 'deselect' }} - @@ -353,10 +353,10 @@ export class MapPanelComponent { } } - focus(coverage: bigint|{min: bigint, max: bigint}, event?: any) { + focus(coverage: number|CoverageRectItem, event?: any) { event?.stopPropagation(); if (coverage.hasOwnProperty("min") && coverage.hasOwnProperty("max")) { - let coverageStruct = coverage as {min: bigint, max: bigint}; + let coverageStruct = coverage as CoverageRectItem; let minPos = coreLib.getTilePosition(BigInt(coverageStruct.min)); let maxPos = coreLib.getTilePosition(BigInt(coverageStruct.max)); this.mapService.moveToWgs84PositionTopic.next( @@ -364,9 +364,8 @@ export class MapPanelComponent { ); } else { - let coverageTileId = BigInt(coverage as bigint); this.mapService.moveToWgs84PositionTopic.next( - coreLib.getTilePosition(BigInt(coverageTileId)) + coreLib.getTilePosition(BigInt(coverage as number)) ); } } diff --git a/erdblick_app/app/map.service.ts b/erdblick_app/app/map.service.ts index 075c2be3..bd50e506 100644 --- a/erdblick_app/app/map.service.ts +++ b/erdblick_app/app/map.service.ts @@ -8,12 +8,17 @@ import {ErdblickStyle, StyleService} from "./style.service"; import {FeatureLayerStyle, TileLayerParser, Feature} from '../../build/libs/core/erdblick-core'; import {ParametersService} from "./parameters.service"; import {SidePanelService, SidePanelState} from "./sidepanel.service"; -import {InfoMessageService} from "./info.service"; +import {InfoMessageService} from "./info.service" + +export interface CoverageRectItem extends Object { + min: number, + max: number +} export interface LayerInfoItem extends Object { canRead: boolean; canWrite: boolean; - coverage: Array; + coverage: Array; featureTypes: Array<{name: string, uniqueIdCompositions: Array}>; layerId: string; type: string; @@ -257,11 +262,7 @@ export class MapService { let mapLayerLevels = new Array<[string, number, boolean, boolean]>(); let maps = new Map(result.filter(m => !m.addOn).map(mapInfo => { let layers = new Map(); - let defCoverage = [0n]; for (let [layerId, layerInfo] of Object.entries(mapInfo.layers)) { - if (layerInfo.coverage.length == 0) { - layerInfo.coverage = defCoverage; - } [layerInfo.visible, layerInfo.level, layerInfo.tileBorders] = this.parameterService.mapLayerConfig(mapInfo.mapId, layerId, 13); mapLayerLevels.push([ mapInfo.mapId + '/' + layerId, diff --git a/package-lock.json b/package-lock.json index 8aa2f037..3a4fe7c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "erdblick", - "version": "2024.3", + "version": "2024.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "erdblick", - "version": "2024.3", + "version": "2024.3.1", "dependencies": { "@angular/animations": "^17.3.10", "@angular/common": "^17.3.10",