midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Don't attempt to load 'Category:'-values as images directly

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-05-28 14:29:02 +02:00
parent c5b4498b2b
commit 3d4f18ca04
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Logic/ImageProviders/AllImageProviders.ts
View file

@ -17,13 +17,15 @@ export default class AllImageProviders {
Mapillary.singleton, Mapillary.singleton,
WikidataImageProvider.singleton, WikidataImageProvider.singleton,
WikimediaImageProvider.singleton, WikimediaImageProvider.singleton,
// The 'genericImageProvider' is a fallback that scans various other tags for tags, unless the URL starts with one of the given prefixes
new GenericImageProvider( new GenericImageProvider(
[].concat( [
...Imgur.defaultValuePrefix, ...Imgur.defaultValuePrefix,
...WikimediaImageProvider.commonsPrefixes, ...WikimediaImageProvider.commonsPrefixes,
...Mapillary.valuePrefixes, ...Mapillary.valuePrefixes,
...AllImageProviders.dontLoadFromPrefixes ...AllImageProviders.dontLoadFromPrefixes,
) "Category:"
]
), ),
] ]
public static apiUrls: string[] = [].concat( public static apiUrls: string[] = [].concat(

7
src/Logic/ImageProviders/ImageProvider.ts
View file

@ -18,7 +18,8 @@ export default abstract class ImageProvider {
public abstract SourceIcon(id?: string, location?: { lon: number; lat: number }): BaseUIElement public abstract SourceIcon(id?: string, location?: { lon: number; lat: number }): BaseUIElement
/** /**
* Given a properies object, maps it onto _all_ the available pictures for this imageProvider * Given a properties object, maps it onto _all_ the available pictures for this imageProvider.
* This iterates over _all_ tags and matches _anything_ that might be an image
*/ */
public GetRelevantUrls( public GetRelevantUrls(
allTags: Store<any>, allTags: Store<any>,
@ -71,7 +72,5 @@ export default abstract class ImageProvider {
public abstract apiUrls(): string[] public abstract apiUrls(): string[]
public backlink(): string | undefined {
return undefined
}
} }