diff --git a/frontend/app/gallery/map/map.gallery.component.ts b/frontend/app/gallery/map/map.gallery.component.ts
index 19eccaf..1c5b780 100644
--- a/frontend/app/gallery/map/map.gallery.component.ts
+++ b/frontend/app/gallery/map/map.gallery.component.ts
@@ -2,10 +2,9 @@ import {Component, ElementRef, Input, OnChanges, ViewChild, AfterViewInit} from
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, AgmMap} from '@agm/core';
import {FileDTO} from '../../../../common/entities/FileDTO';
+import {MapService} from './map.service';
+import {MapComponent} from '@yaga/leaflet-ng2';
@Component({
selector: 'app-gallery-map',
@@ -18,12 +17,13 @@ export class GalleryMapComponent implements OnChanges, IRenderable, AfterViewIni
@Input() metaFiles: FileDTO[];
@ViewChild(GalleryMapLightboxComponent) mapLightbox: GalleryMapLightboxComponent;
- mapPhotos: Array<{ latitude: number, longitude: number }> = [];
+ mapPhotos: Array<{ lat: number, lng: number }> = [];
@ViewChild('map') mapElement: ElementRef;
+ @ViewChild('yagaMap') yagaMap: MapComponent;
height: number = null;
- constructor(private mapsAPILoader: MapsAPILoader) {
+ constructor(public mapService: MapService) {
}
ngOnChanges() {
@@ -32,17 +32,25 @@ export class GalleryMapComponent implements OnChanges, IRenderable, AfterViewIni
p.metadata.positionData.GPSData.latitude && p.metadata.positionData.GPSData.longitude;
}).map(p => {
return {
- latitude: p.metadata.positionData.GPSData.latitude,
- longitude: p.metadata.positionData.GPSData.longitude
+ lat: p.metadata.positionData.GPSData.latitude,
+ lng: p.metadata.positionData.GPSData.longitude
};
});
+ if (this.yagaMap) {
+ this.yagaMap.setView(this.mapPhotos[0], 0);
+ this.yagaMap.fitBounds(
this.mapPhotos);
+ this.yagaMap.zoom = 0;
+ }
}
ngAfterViewInit() {
setTimeout(() => {
this.height = this.mapElement.nativeElement.clientHeight;
+ this.yagaMap.setView(this.mapPhotos[0], 0);
+ this.yagaMap.fitBounds(this.mapPhotos);
+ this.yagaMap.zoom = 0;
}, 0);
}
diff --git a/frontend/app/gallery/map/map.service.ts b/frontend/app/gallery/map/map.service.ts
index fada51d..789bad7 100644
--- a/frontend/app/gallery/map/map.service.ts
+++ b/frontend/app/gallery/map/map.service.ts
@@ -2,6 +2,9 @@ import {Injectable} from '@angular/core';
import {NetworkService} from '../../model/network/network.service';
import {FileDTO} from '../../../../common/entities/FileDTO';
import {Utils} from '../../../../common/Utils';
+import {OSM_TILE_LAYER_URL} from '@yaga/leaflet-ng2';
+import {Config} from '../../../../common/config/public/Config';
+import {ClientConfig} from '../../../../common/config/public/ConfigClass';
@Injectable()
export class MapService {
@@ -11,21 +14,6 @@ export class MapService {
}
- public calcDistance(loc: MapPath, loc2: MapPath): number {
- const radlat1 = Math.PI * loc.latitude / 180;
- const radlat2 = Math.PI * loc2.latitude / 180;
- const theta = loc.longitude - loc2.longitude;
- const radtheta = Math.PI * theta / 180;
- let dist = Math.sin(radlat1) * Math.sin(radlat2) + Math.cos(radlat1) * Math.cos(radlat2) * Math.cos(radtheta);
- if (dist > 1) {
- dist = 1;
- }
- dist = Math.acos(dist);
- dist = dist * 180 / Math.PI;
- dist = dist * 60 * 1.1515;
- return dist * 1.609344;
- }
-
public async getMapPath(file: FileDTO): Promise {
const filePath = Utils.concatUrls(file.directory.path, file.directory.name, file.name);
const gpx = await this.networkService.getXML('/gallery/content/' + filePath);
@@ -33,17 +21,29 @@ export class MapService {
const points: MapPath[] = [];
for (let i = 0; i < elements.length; i++) {
points.push({
- latitude: parseFloat(elements[i].getAttribute('lat')),
- longitude: parseFloat(elements[i].getAttribute('lon'))
+ lat: parseFloat(elements[i].getAttribute('lat')),
+ lng: parseFloat(elements[i].getAttribute('lon'))
});
}
return points;
}
+
+ public get Attributions(): string[] {
+ return ['© OpenStreetMap'];
+ }
+
+ public get MapLayer(): string {
+ if (Config.Client.Map.mapProvider === ClientConfig.MapProviders.Custom) {
+ return Config.Client.Map.tileUrl;
+ }
+ return OSM_TILE_LAYER_URL;
+ }
+
}
export interface MapPath {
- latitude: number;
- longitude: number;
+ lat: number;
+ lng: number;
}
diff --git a/frontend/app/settings/database/database.settings.component.ts b/frontend/app/settings/database/database.settings.component.ts
index 1341c8f..de03a22 100644
--- a/frontend/app/settings/database/database.settings.component.ts
+++ b/frontend/app/settings/database/database.settings.component.ts
@@ -17,7 +17,7 @@ import {I18n} from '@ngx-translate/i18n-polyfill';
})
export class DatabaseSettingsComponent extends SettingsComponent implements OnInit {
- public types: Array = [];
+ public types: { key: number, value: string }[] = [];
public DatabaseType: any;
constructor(_authService: AuthenticationService,
@@ -30,8 +30,7 @@ export class DatabaseSettingsComponent extends SettingsComponent
ngOnInit() {
super.ngOnInit();
- this.types = Utils
- .enumToArray(DatabaseType);
+ this.types = Utils.enumToArray(DatabaseType);
this.DatabaseType = DatabaseType;
}
diff --git a/frontend/app/settings/map/map.settings.component.html b/frontend/app/settings/map/map.settings.component.html
index 06f15bf..406bbe1 100644
--- a/frontend/app/settings/map/map.settings.component.html
+++ b/frontend/app/settings/map/map.settings.component.html
@@ -22,17 +22,25 @@
+
+
diff --git a/frontend/app/settings/map/map.settings.component.ts b/frontend/app/settings/map/map.settings.component.ts
index fd3cf03..8469b34 100644
--- a/frontend/app/settings/map/map.settings.component.ts
+++ b/frontend/app/settings/map/map.settings.component.ts
@@ -6,6 +6,7 @@ import {NavigationService} from '../../model/navigation.service';
import {NotificationService} from '../../model/notification.service';
import {ClientConfig} from '../../../../common/config/public/ConfigClass';
import {I18n} from '@ngx-translate/i18n-polyfill';
+import {Utils} from '../../../../common/Utils';
@Component({
@@ -17,12 +18,17 @@ import {I18n} from '@ngx-translate/i18n-polyfill';
})
export class MapSettingsComponent extends SettingsComponent {
+ public mapProviders: { key: number, value: string }[] = [];
+ public MapProviders = ClientConfig.MapProviders;
+
constructor(_authService: AuthenticationService,
_navigation: NavigationService,
_settingsService: MapSettingsService,
notification: NotificationService,
i18n: I18n) {
super(i18n('Map'), _authService, _navigation, _settingsService, notification, i18n, s => s.Client.Map);
+
+ this.mapProviders = Utils.enumToArray(ClientConfig.MapProviders);
}
diff --git a/frontend/app/settings/settings.service.ts b/frontend/app/settings/settings.service.ts
index a830518..0256f86 100644
--- a/frontend/app/settings/settings.service.ts
+++ b/frontend/app/settings/settings.service.ts
@@ -4,6 +4,7 @@ import {DatabaseType, IPrivateConfig, ReIndexingSensitivity, ThumbnailProcessing
import {NetworkService} from '../model/network/network.service';
import {SortingMethods} from '../../../common/entities/SortingMethods';
import {UserRoles} from '../../../common/entities/UserDTO';
+import {ClientConfig} from '../../../common/config/public/ConfigClass';
@Injectable()
export class SettingsService {
@@ -32,7 +33,8 @@ export class SettingsService {
},
Map: {
enabled: true,
- googleApiKey: ''
+ mapProvider: ClientConfig.MapProviders.OpenStreetMap,
+ tileUrl: ''
},
RandomPhoto: {
enabled: true
diff --git a/frontend/index.html b/frontend/index.html
index decf219..153f902 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -18,18 +18,15 @@
-
-
-
-
Loading...
-
Loading...
+