self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-04-21 12:16:59 +02:00
Code Issues Releases Activity

Fixing map's regexp matching issue: no need to use global as only one match is enough #647

Browse Source
This commit is contained in:
Patrik J. Braun 2023-03-21 09:09:13 +01:00
parent 68d09cec46
commit 04ce343d9f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ export class GalleryMapLightboxComponent implements OnChanges, OnDestroy {
private pathLayersConfigOrdered = [ private pathLayersConfigOrdered = [
{ {
name: $localize`Transportation`, name: $localize`Transportation`,
matchers: [/flight/gi, /flying/gi, /drive/gi, /driving/gi] as RegExp[], matchers: [/flight/i, /flying/i, /drive/i, /driving/i] as RegExp[],
layer: layerGroup([]), layer: layerGroup([]),
theme: {color: 'var(--bs-orange)', dashArray: '4 8'}, theme: {color: 'var(--bs-orange)', dashArray: '4 8'},
icon: null as DivIcon, icon: null as DivIcon,
@ -127,7 +127,7 @@ export class GalleryMapLightboxComponent implements OnChanges, OnDestroy {
}, },
{ {
name: $localize`Sport`, name: $localize`Sport`,
matchers: [/run/gi, /walk/gi, /hike/gi, /hiking/gi, /bike/gi, /biking/gi, /cycling/gi] as RegExp[], matchers: [/run/i, /walk/i, /hike/i, /hiking/i, /bike/i, /biking/i, /cycling/i] as RegExp[],
layer: layerGroup([]), layer: layerGroup([]),
theme: {color: 'var(--bs-primary)'}, theme: {color: 'var(--bs-primary)'},
svgIcon: { svgIcon: {
@ -520,11 +520,13 @@ export class GalleryMapLightboxComponent implements OnChanges, OnDestroy {
return; return;
} }
const pathLayer = this.pathLayersConfigOrdered.find((pl) => { const pathLayer = this.pathLayersConfigOrdered.find((pl) => {
console.log(pl.matchers,pl?.matchers?.findIndex(m => m.test(parsedGPX.name)) );
return pl.matchers === null || // null matchers match everything return pl.matchers === null || // null matchers match everything
(parsedGPX.name && (parsedGPX.name &&
pl.matchers.findIndex(m => m.test(parsedGPX.name)) !== -1); pl.matchers.findIndex(m => m.test(parsedGPX.name)) !== -1);
}) || this.pathLayersConfigOrdered[0]; }) || this.pathLayersConfigOrdered[0];
console.log(parsedGPX.name, pathLayer.theme.color);
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
const mkr = marker(parsedGPX.path[0]); const mkr = marker(parsedGPX.path[0]);