FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix AW-2361
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2021-05-25 22:12:32 +02:00
parent fbe0413c6a
commit 6f77df0f61
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
projects/common-map/src/fm-map/components/map/map.component.html
View File

@ -52,29 +52,31 @@
<div *ngIf="noContent"> <div *ngIf="noContent">
<fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period"></fm-map-map-search> <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period"></fm-map-map-search>
</div> </div>
<fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false"> <div class="side-panel-container">
<div class="panel-wrapper" *ngIf="noContent"> <fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)"> <div class="panel-wrapper" *ngIf="noContent">
</div> <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
<div class="panel-bottom">
<div *ngIf="!(state.selectedItem)">
<fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container>
</div> </div>
<div class="panel-bottom">
<div *ngIf="state.selectedItem;let item">
<fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container> <div *ngIf="!(state.selectedItem)">
<fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container>
</div>
<div *ngIf="state.selectedItem;let item">
<fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container>
</div>
<div *ngIf="state.features.length == 0" class="no-results m-2">
<div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div>
<div *ngIf="state.queryState?.tags">Cannot find tag <span>{{state.queryState?.tags}}</span></div>
</div>
</div> </div>
<div *ngIf="state.features.length == 0" class="no-results m-2"> </div>
<div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div> </fm-side-panel>
<div *ngIf="state.queryState?.tags">Cannot find tag <span>{{state.queryState?.tags}}</span></div> <fm-side-panel [resizeable]="true" [visible]="!noContent">
</div> <router-outlet></router-outlet>
</div> </fm-side-panel>
</div> </div>
</fm-side-panel>
<fm-side-panel [resizeable]="true" [visible]="!noContent">
<router-outlet></router-outlet>
</fm-side-panel>
</aol-map> </aol-map>
</ng-container> </ng-container>

21
projects/common-map/src/fm-map/components/map/map.component.scss
View File

@ -1,6 +1,6 @@
@import "~bootstrap/scss/bootstrap.scss"; @import "~bootstrap/scss/bootstrap.scss";
aol-map { width:100%;} aol-map { position:absolute;width:100%;height:calc(100vh + 4rem);}
.arrow { .arrow {
top: 3rem; top: 3rem;
@ -49,11 +49,22 @@ aol-map { width:100%;}
.control-container { .control-container {
position: absolute; position: absolute;
right: 1em; right: 1em;
bottom: 1em; bottom: 8.1em;
} }
.fullscreen .control-container { .fullscreen .control-container {
bottom: 1em; bottom: 5em;
}
.side-panel-container {
position: absolute;
top:0em;
bottom: 7.1em;
width: 100%;
}
.fullscreen .side-panel-container {
bottom: 4em;
} }
switch2d3d { switch2d3d {
@ -125,6 +136,10 @@ timespan.menuVisible {
.panel-top { .panel-top {
height: 8.1rem; height: 8.1rem;
} }
.side-panel-container {
width: auto;
}
} }
.map { .map {