self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-02-01 13:17:55 +02:00
Code Issues Releases Activity

Fixing leaflet map removal error

Browse Source
This commit is contained in:
Patrik J. Braun 2023-09-20 22:07:04 +02:00
parent f4cdb5a83a
commit 6bfccc3311
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/frontend/app/ui/gallery/map/map.gallery.component.ts
View File

@ -53,9 +53,9 @@ export class GalleryMapComponent implements OnChanges, IRenderable {
attribution: this.mapService.ShortAttributions,
}),
'dark':
tileLayer(this.mapService.DarkMapLayer.url, {
attribution: this.mapService.ShortAttributions,
})
tileLayer(this.mapService.DarkMapLayer.url, {
attribution: this.mapService.ShortAttributions,
})
};
if (this.themeService.darkMode.value) {
this.options.layers = [this.layers.dark];
@ -86,13 +86,16 @@ export class GalleryMapComponent implements OnChanges, IRenderable {
onMapReady(map: Map): void {
this.leafletMap = map;
if (!this.leafletMap) {
return;
}
if (this.markerLayer.length > 0) {
this.leafletMap.setView(this.markerLayer[0].getLatLng(), 99);
this.leafletMap.fitBounds(
this.markerLayer.map(
(mp): [number, number] =>
[mp.getLatLng().lat, mp.getLatLng().lng] as [number, number]
)
this.markerLayer.map(
(mp): [number, number] =>
[mp.getLatLng().lat, mp.getLatLng().lng] as [number, number]
)
);
}
this.leafletMap.setZoom(0);
@ -100,31 +103,31 @@ export class GalleryMapComponent implements OnChanges, IRenderable {
ngOnChanges(): void {
this.markerLayer = this.photos
.filter((p): number => {
return (
p.metadata &&
p.metadata.positionData &&
p.metadata.positionData.GPSData &&
p.metadata.positionData.GPSData.latitude &&
p.metadata.positionData.GPSData.longitude
);
})
.slice(0, Config.Map.maxPreviewMarkers)
.map((p): Marker => {
return marker({
lat: p.metadata.positionData.GPSData.latitude,
lng: p.metadata.positionData.GPSData.longitude,
} as LatLngLiteral).setIcon(MarkerFactory.defIconSmall);
});
.filter((p): number => {
return (
p.metadata &&
p.metadata.positionData &&
p.metadata.positionData.GPSData &&
p.metadata.positionData.GPSData.latitude &&
p.metadata.positionData.GPSData.longitude
);
})
.slice(0, Config.Map.maxPreviewMarkers)
.map((p): Marker => {
return marker({
lat: p.metadata.positionData.GPSData.latitude,
lng: p.metadata.positionData.GPSData.longitude,
} as LatLngLiteral).setIcon(MarkerFactory.defIconSmall);
});
if (this.leafletMap && this.markerLayer.length > 0) {
this.options.center = this.markerLayer[0].getLatLng();
this.leafletMap.setView(this.markerLayer[0].getLatLng(), 99);
this.leafletMap.fitBounds(
this.markerLayer.map(
(mp): [number, number] =>
[mp.getLatLng().lat, mp.getLatLng().lng] as [number, number]
)
this.markerLayer.map(
(mp): [number, number] =>
[mp.getLatLng().lat, mp.getLatLng().lng] as [number, number]
)
);
this.leafletMap.setZoom(0);
}