From 66d2aee14d01d6020eb3b4b272a69dded0b7b8eb Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 11 Feb 2025 12:10:43 +0100 Subject: [PATCH] wip: add cog visualiser --- .../arlas-map/arlas-map.component.html | 6 ++++- .../arlas-map/arlas-map.component.scss | 23 +++++++++++++------ .../arlas-wui-root.component.scss | 6 +++-- .../arlas-wui-root.component.ts | 3 ++- src/app/services/map.service.ts | 4 +++- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/app/components/arlas-map/arlas-map.component.html b/src/app/components/arlas-map/arlas-map.component.html index 03dd4a6c..037be7f4 100644 --- a/src/app/components/arlas-map/arlas-map.component.html +++ b/src/app/components/arlas-map/arlas-map.component.html @@ -48,7 +48,11 @@ -
+
diff --git a/src/app/components/arlas-map/arlas-map.component.scss b/src/app/components/arlas-map/arlas-map.component.scss index 03f64c8e..f230a282 100644 --- a/src/app/components/arlas-map/arlas-map.component.scss +++ b/src/app/components/arlas-map/arlas-map.component.scss @@ -86,6 +86,22 @@ ); right: $sm-spacing; z-index: 2; + + &--tight { + bottom: calc( + $sm-spacing + $map-scale-height + $map-scale-height + )!important; + } + &--timeline-open { + bottom: calc( + $sm-spacing + $map-scale-height + $sm-spacing + $timeline-height + )!important; + } + &--full { + bottom: calc( + $sm-spacing + $map-scale-height + $map-scale-height + $sm-spacing + $timeline-height + )!important; + } } .arlas-map-action-container { @@ -129,10 +145,3 @@ } } -@media (max-width: 838px) { - .arlas-cog-visualisation-manager { - bottom: calc( - $sm-spacing + $map-scale-height + $map-scale-height - )!important; - } -} diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.scss b/src/app/components/arlas-wui-root/arlas-wui-root.component.scss index 03960533..5a240f4c 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.scss +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.scss @@ -235,7 +235,8 @@ .arlas-map { ::ng-deep.arlas-map-action, ::ng-deep.arlas-map-settings, - ::ng-deep.arlas-rasters-manager { + ::ng-deep.arlas-rasters-manager, + ::ng-deep .arlas-cog-visualisation-manager { right: calc($result-list-width + $sm-spacing) !important; } ::ng-deep.aoi-dimensions { @@ -264,7 +265,8 @@ .arlas-map { ::ng-deep.arlas-map-action, ::ng-deep.arlas-map-settings, - ::ng-deep.arlas-rasters-manager { + ::ng-deep.arlas-rasters-manager, + ::ng-deep .arlas-cog-visualisation-manager{ right: calc($preview-result-list-width + $sm-spacing) !important; } ::ng-deep.aoi-dimensions { diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts index 3ce872e2..e04356ca 100644 --- a/src/app/components/arlas-wui-root/arlas-wui-root.component.ts +++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.ts @@ -180,7 +180,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, On /** init from url */ this.showTimeline = getParamValue('to') === 'true'; - + this.mapService.timeLineIsOpen = this.showTimeline; let wasTabSelected = getParamValue('at') !== null; this.analyticsService.tabChange.subscribe(tab => { // If there is a change in the state of the analytics (open/close), resize @@ -311,6 +311,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, On public toggleTimeline() { this.showTimeline = !this.showTimeline; + this.mapService.timeLineIsOpen = this.showTimeline; const queryParams = { ...this.activatedRoute.snapshot.queryParams}; queryParams['to'] = this.showTimeline + ''; this.router.navigate([], { replaceUrl: true, queryParams: queryParams }); diff --git a/src/app/services/map.service.ts b/src/app/services/map.service.ts index a22f7bdf..02db0ca6 100644 --- a/src/app/services/map.service.ts +++ b/src/app/services/map.service.ts @@ -19,7 +19,8 @@ import { Injectable } from '@angular/core'; import { ElementIdentifier, FeatureRenderMode, MapContributor } from 'arlas-web-contributors'; -import { ArlasMapComponent, AbstractArlasMapService, ArlasMapFrameworkService } from 'arlas-map'; +import { AbstractArlasMapService, ArlasMapComponent, ArlasMapFrameworkService } from 'arlas-map'; + export interface FeatureHover { isleaving: boolean; elementidentifier: ElementIdentifier; @@ -42,6 +43,7 @@ export class ArlasWuiMapService { public featuresToSelect: Array = []; public coordinatesHaveSpace: boolean; + public timeLineIsOpen: boolean; public constructor(public mapService: ArlasMapFrameworkService, public mapLogicService: AbstractArlasMapService) { }