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

UX: don't show the gray 'image loading' for wikimedia; assume there is none

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-01-26 01:42:41 +01:00
parent 2f7e35a16e
commit 59dc9012c0
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ export default class AllImageProviders {
"Category:" "Category:"
]) ])
private static ImageAttributionSource: ImageProvider[] = [ private static imageAttributionSources: ImageProvider[] = [
Imgur.singleton, Imgur.singleton,
Mapillary.singleton, Mapillary.singleton,
WikidataImageProvider.singleton, WikidataImageProvider.singleton,
@ -34,10 +34,10 @@ export default class AllImageProviders {
AllImageProviders.genericImageProvider AllImageProviders.genericImageProvider
] ]
public static apiUrls: string[] = [].concat( public static apiUrls: string[] = [].concat(
...AllImageProviders.ImageAttributionSource.map((src) => src.apiUrls()) ...AllImageProviders.imageAttributionSources.map((src) => src.apiUrls())
) )
public static defaultKeys = [].concat( public static defaultKeys = [].concat(
AllImageProviders.ImageAttributionSource.map((provider) => provider.defaultKeyPrefixes) AllImageProviders.imageAttributionSources.map((provider) => provider.defaultKeyPrefixes)
) )
private static providersByName = { private static providersByName = {
imgur: Imgur.singleton, imgur: Imgur.singleton,
@ -52,7 +52,7 @@ export default class AllImageProviders {
} }
public static async selectBestProvider(key: string, value: string): Promise<ImageProvider> { public static async selectBestProvider(key: string, value: string): Promise<ImageProvider> {
for (const imageProvider of AllImageProviders.ImageAttributionSource) { for (const imageProvider of AllImageProviders.imageAttributionSources) {
try { try {
const extracted = await Promise.all(await imageProvider.ExtractUrls(key, value)) const extracted = await Promise.all(await imageProvider.ExtractUrls(key, value))
if (extracted?.length > 0) { if (extracted?.length > 0) {
@ -78,7 +78,13 @@ export default class AllImageProviders {
public static estimateNumberOfImages(tags: Record<string, string>, prefixes: string[] = undefined): number { public static estimateNumberOfImages(tags: Record<string, string>, prefixes: string[] = undefined): number {
let count = 0 let count = 0
const allPrefixes = Utils.Dedup(prefixes ?? [].concat(...AllImageProviders.ImageAttributionSource.map(s => s.defaultKeyPrefixes))) const sources = [Imgur.singleton,
Mapillary.singleton,
WikidataImageProvider.singleton,
WikimediaImageProvider.singleton,
Panoramax.singleton,
AllImageProviders.genericImageProvider]
const allPrefixes = Utils.Dedup(prefixes ?? [].concat(...sources.map(s => s.defaultKeyPrefixes)))
for (const prefix of allPrefixes) { for (const prefix of allPrefixes) {
for (const k in tags) { for (const k in tags) {
if (k === prefix || k.startsWith(prefix + ":")) { if (k === prefix || k.startsWith(prefix + ":")) {
@ -108,7 +114,7 @@ export default class AllImageProviders {
const source = new UIEventSource([]) const source = new UIEventSource([])
const allSources: Store<ProvidedImage[]>[] = [] const allSources: Store<ProvidedImage[]>[] = []
for (const imageProvider of AllImageProviders.ImageAttributionSource) { for (const imageProvider of AllImageProviders.imageAttributionSources) {
/* /*
By default, 'GetRelevantUrls' uses the defaultKeyPrefixes. By default, 'GetRelevantUrls' uses the defaultKeyPrefixes.
However, we override them if a custom image tag is set, e.g. 'image:menu' However, we override them if a custom image tag is set, e.g. 'image:menu'