improving map

frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.html

@@ -9,9 +9,7 @@
     <agm-map
       [style.width.px]="mapDimension.width"
       [style.height.px]="mapDimension.height"
-      [zoom]="5"
+      [fitBounds]="latlngBounds">
-      [latitude]="mapCenter.latitude"
-      [longitude]="mapCenter.longitude">
       <agm-marker
         *ngFor="let photo of mapPhotos"
         [latitude]="photo.latitude"
@@ -38,7 +36,7 @@
   </div>
 
 
-  <div id="controllers-container" *ngIf="visible">
+  <div id="controllers-container" *ngIf="controllersVisible">
     <div id="controls">
             <span>
                 <span class="oi  oi-fullscreen-exit highlight"

frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts

@@ -1,25 +1,27 @@
-import {Component, ElementRef, HostListener, Input, OnChanges, ViewChild} from '@angular/core';
+import {Component, ElementRef, HostListener, Input, OnChanges, ViewChild, AfterViewInit} from '@angular/core';
 import {PhotoDTO} from '../../../../../common/entities/PhotoDTO';
 import {Dimension} from '../../../model/IRenderable';
 import {FullScreenService} from '../../fullscreen.service';
-import {AgmMap} from '@agm/core';
+import {AgmMap, LatLngBounds, MapsAPILoader} from '@agm/core';
 import {IconThumbnail, Thumbnail, ThumbnailManagerService} from '../../thumnailManager.service';
 import {IconPhoto} from '../../IconPhoto';
 import {Photo} from '../../Photo';
 import {PageHelper} from '../../../model/page.helper';
 
+
 @Component({
   selector: 'app-gallery-map-lightbox',
   styleUrls: ['./lightbox.map.gallery.component.css'],
   templateUrl: './lightbox.map.gallery.component.html',
 })
-export class GalleryMapLightboxComponent implements OnChanges {
+export class GalleryMapLightboxComponent implements OnChanges, AfterViewInit {
 
   @Input() photos: Array<PhotoDTO>;
   private startPosition = null;
   public lightboxDimension: Dimension = <Dimension>{top: 0, left: 0, width: 0, height: 0};
   public mapDimension: Dimension = <Dimension>{top: 0, left: 0, width: 0, height: 0};
   public visible = false;
+  public controllersVisible = false;
   public opacity = 1.0;
   mapPhotos: MapPhoto[] = [];
   mapCenter = {latitude: 0, longitude: 0};
@@ -27,13 +29,14 @@ export class GalleryMapLightboxComponent implements OnChanges {
   @ViewChild('root') elementRef: ElementRef;
 
   @ViewChild(AgmMap) map: AgmMap;
+  public latlngBounds: LatLngBounds;
 
 
   constructor(public fullScreenService: FullScreenService,
-              private thumbnailService: ThumbnailManagerService) {
+              private thumbnailService: ThumbnailManagerService,
+              private mapsAPILoader: MapsAPILoader) {
   }
 
-  // TODO: fix zooming
   ngOnChanges() {
     if (this.visible === false) {
       return;
@@ -41,6 +44,10 @@ export class GalleryMapLightboxComponent implements OnChanges {
     this.showImages();
   }
 
+  ngAfterViewInit() {
+
+  }
+
   public show(position: Dimension) {
     this.hideImages();
     this.visible = true;
@@ -54,7 +61,9 @@ export class GalleryMapLightboxComponent implements OnChanges {
       width: this.getScreenWidth(),
       height: this.getScreenHeight()
     };
-    this.map.triggerResize();
+    this.map.triggerResize().then(() => {
+      this.controllersVisible = true;
+    });
 
     PageHelper.hideScrollY();
 
@@ -71,6 +80,7 @@ export class GalleryMapLightboxComponent implements OnChanges {
 
   public hide() {
     this.fullScreenService.exitFullScreen();
+    this.controllersVisible = false;
     const to = this.startPosition;
 
     // iff target image out of screen -> scroll to there
@@ -92,7 +102,9 @@ export class GalleryMapLightboxComponent implements OnChanges {
     this.hideImages();
 
     this.mapPhotos = this.photos.filter(p => {
-      return p.metadata && p.metadata.positionData && p.metadata.positionData.GPSData;
+      return p.metadata && p.metadata.positionData && p.metadata.positionData.GPSData
+        && p.metadata.positionData.GPSData.latitude
+        && p.metadata.positionData.GPSData.longitude;
     }).map(p => {
       let width = 500;
       let height = 500;
@@ -124,9 +136,25 @@ export class GalleryMapLightboxComponent implements OnChanges {
       return obj;
     });
 
-    if (this.mapPhotos.length > 0) {
+    this.findPhotosBounds().catch(console.error);
-      this.mapCenter = this.mapPhotos[0];
+  }
+
+
+  private async findPhotosBounds() {
+    await this.mapsAPILoader.load();
+    if (!window['google']) {
+      return;
     }
+    this.latlngBounds = new window['google'].maps.LatLngBounds();
+
+    for (const photo of this.mapPhotos) {
+      this.latlngBounds.extend(new window['google'].maps.LatLng(photo.latitude, photo.longitude));
+    }
+    const clat = this.latlngBounds.getCenter().lat();
+    const clng = this.latlngBounds.getCenter().lng();
+    this.latlngBounds.extend(new window['google'].maps.LatLng(clat + 0.5, clng + 0.5));
+    this.latlngBounds.extend(new window['google'].maps.LatLng(clat - 0.5, clng - 0.5));
+
   }
 
 

frontend/app/gallery/map/map.gallery.component.css

@@ -4,7 +4,14 @@
 }
 
 #map {
-
   width: 100%;
   height: 100%;
 }
+
+.overlay {
+  width: 100%;
+  height: 100%;
+  background-color: transparent;
+  opacity: 0.8;
+  cursor: pointer;
+}

frontend/app/gallery/map/map.gallery.component.html

@@ -2,20 +2,22 @@
   <app-gallery-map-lightbox [photos]="photos"></app-gallery-map-lightbox>
   <div id="map" #map>
     <agm-map
-      (click)="click()"
       [disableDefaultUI]="true"
       [zoomControl]="false"
       [streetViewControl]="false"
       [usePanning]="false"
       [draggable]="false"
       [zoom]="0"
-      [latitude]="mapCenter.latitude"
+      [fitBounds]="latlngBounds">
-      [longitude]="mapCenter.longitude">
       <agm-marker
         *ngFor="let photo of mapPhotos"
         [latitude]="photo.latitude"
         [longitude]="photo.longitude">
       </agm-marker>
     </agm-map>
+    <div class="overlay" (click)="click()"
+         [style.margin-top.px]="-height"
+         [style.height.px]="height">
+    </div>
   </div>
 </ng-template>

frontend/app/gallery/map/map.gallery.component.ts

@@ -1,23 +1,30 @@
-import {Component, ElementRef, Input, OnChanges, ViewChild} from '@angular/core';
+import {Component, ElementRef, Input, OnChanges, ViewChild, AfterViewInit} from '@angular/core';
 import {PhotoDTO} from '../../../../common/entities/PhotoDTO';
 import {Dimension, IRenderable} from '../../model/IRenderable';
 import {GalleryMapLightboxComponent} from './lightbox/lightbox.map.gallery.component';
+import {ThumbnailManagerService} from '../thumnailManager.service';
+import {FullScreenService} from '../fullscreen.service';
+import {LatLngBounds, MapsAPILoader} from '@agm/core';
 
 @Component({
   selector: 'app-gallery-map',
   templateUrl: './map.gallery.component.html',
   styleUrls: ['./map.gallery.component.css']
 })
-export class GalleryMapComponent implements OnChanges, IRenderable {
+export class GalleryMapComponent implements OnChanges, IRenderable, AfterViewInit {
 
   @Input() photos: Array<PhotoDTO>;
   @ViewChild(GalleryMapLightboxComponent) mapLightbox: GalleryMapLightboxComponent;
 
   mapPhotos: Array<{ latitude: number, longitude: number }> = [];
-  mapCenter = {latitude: 0, longitude: 0};
+  public latlngBounds: LatLngBounds;
   @ViewChild('map') map: ElementRef;
+  height = null;
+
+
+  constructor(private mapsAPILoader: MapsAPILoader) {
+  }
 
-  // TODO: fix zooming
   ngOnChanges() {
     this.mapPhotos = this.photos.filter(p => {
       return p.metadata && p.metadata.positionData && p.metadata.positionData.GPSData &&
@@ -29,9 +36,32 @@ export class GalleryMapComponent implements OnChanges, IRenderable {
       };
     });
 
-    if (this.mapPhotos.length > 0) {
+
-      this.mapCenter = this.mapPhotos[0];
+    this.findPhotosBounds().catch(console.error);
+
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.height = this.map.nativeElement.clientHeight;
+      console.log(this.height);
+    }, 0);
+  }
+
+  private async findPhotosBounds() {
+    await this.mapsAPILoader.load();
+    if (!window['google']) {
+      return;
     }
+    this.latlngBounds = new window['google'].maps.LatLngBounds();
+
+    for (const photo of this.mapPhotos) {
+      this.latlngBounds.extend(new window['google'].maps.LatLng(photo.latitude, photo.longitude));
+    }
+    const clat = this.latlngBounds.getCenter().lat();
+    const clng = this.latlngBounds.getCenter().lng();
+    this.latlngBounds.extend(new window['google'].maps.LatLng(clat + 0.5, clng + 0.5));
+    this.latlngBounds.extend(new window['google'].maps.LatLng(clat - 0.5, clng - 0.5));
 
   }