xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

refactoring map service: Using leaflet's LatLngLiteral interface

Browse Source
This commit is contained in:
Patrik J. Braun 2022-03-12 00:00:49 +01:00
parent 57cf18ec07
commit 346590f651
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import {
Control, Control,
divIcon, divIcon,
icon, icon,
LatLng,
latLng, latLng,
latLngBounds, latLngBounds,
layerGroup, layerGroup,
@ -392,11 +391,11 @@ export class GalleryMapLightboxComponent implements OnChanges {
} }
if (parsedGPX.path.length !== 0) { if (parsedGPX.path.length !== 0) {
// render the beginning of the path with a marker // render the beginning of the path with a marker
this.mapLayersControlOption.overlays.Paths.addLayer(marker(parsedGPX.path[0] as LatLng)); this.mapLayersControlOption.overlays.Paths.addLayer(marker(parsedGPX.path[0]));
this.mapLayersControlOption.overlays.Paths.addLayer(polyline(parsedGPX.path as LatLng[])); this.mapLayersControlOption.overlays.Paths.addLayer(polyline(parsedGPX.path));
} }
parsedGPX.markers.forEach(mc => { parsedGPX.markers.forEach(mc => {
this.mapLayersControlOption.overlays.Paths.addLayer(marker(mc as LatLng)); this.mapLayersControlOption.overlays.Paths.addLayer(marker(mc));
}); });
} }
} }

13
src/frontend/app/ui/gallery/map/map.service.ts
View File

@ -4,6 +4,7 @@ import {FileDTO} from '../../../../../common/entities/FileDTO';
import {Utils} from '../../../../../common/Utils'; import {Utils} from '../../../../../common/Utils';
import {Config} from '../../../../../common/config/public/Config'; import {Config} from '../../../../../common/config/public/Config';
import {MapLayers, MapProviders} from '../../../../../common/config/public/ClientConfig'; import {MapLayers, MapProviders} from '../../../../../common/config/public/ClientConfig';
import {LatLngLiteral} from 'leaflet';
@Injectable() @Injectable()
@ -70,12 +71,12 @@ export class MapService {
} }
public async getMapCoordinates(file: FileDTO): Promise<{ path: MapCoordinates[], markers: MapCoordinates[] }> { public async getMapCoordinates(file: FileDTO): Promise<{ path: LatLngLiteral[], markers: LatLngLiteral[] }> {
const filePath = Utils.concatUrls(file.directory.path, file.directory.name, file.name); const filePath = Utils.concatUrls(file.directory.path, file.directory.name, file.name);
const gpx = await this.networkService.getXML('/gallery/content/' + filePath); const gpx = await this.networkService.getXML('/gallery/content/' + filePath);
const getCoordinates = (tagName: string): MapCoordinates[] => { const getCoordinates = (tagName: string): LatLngLiteral[] => {
const elements = gpx.getElementsByTagName(tagName); const elements = gpx.getElementsByTagName(tagName);
const ret: MapCoordinates[] = []; const ret: LatLngLiteral[] = [];
// tslint:disable-next-line:prefer-for-of // tslint:disable-next-line:prefer-for-of
for (let i = 0; i < elements.length; i++) { for (let i = 0; i < elements.length; i++) {
ret.push({ ret.push({
@ -92,9 +93,3 @@ export class MapService {
}; };
} }
} }
export interface MapCoordinates {
lat: number;
lng: number;
}