diff --git a/src/Logic/ImageProviders/AllImageProviders.ts b/src/Logic/ImageProviders/AllImageProviders.ts index 8db2a8d014..aaac514a4b 100644 --- a/src/Logic/ImageProviders/AllImageProviders.ts +++ b/src/Logic/ImageProviders/AllImageProviders.ts @@ -70,7 +70,7 @@ export default class AllImageProviders { /** * Tries to extract all image data for this image. Cached on tags?.data?.id */ - public static LoadImagesFor( + public static loadImagesFor( tags: Store>, tagKey?: string[] ): Store { @@ -113,6 +113,6 @@ export default class AllImageProviders { for (let i = 0; i < urls.length; i++) { tags["image:" + i] = urls[i] } - return this.LoadImagesFor(new ImmutableStore(tags)) + return this.loadImagesFor(new ImmutableStore(tags)) } } diff --git a/src/UI/Image/NearbyImages.svelte b/src/UI/Image/NearbyImages.svelte index 9650e2fcb6..c4892a543f 100644 --- a/src/UI/Image/NearbyImages.svelte +++ b/src/UI/Image/NearbyImages.svelte @@ -36,7 +36,7 @@ let imagesProvider = state.nearbyImageSearcher - let loadedImages = AllImageProviders.LoadImagesFor(tags).mapD( + let loadedImages = AllImageProviders.loadImagesFor(tags).mapD( (loaded) => new Set(loaded.map((img) => img.url)) ) let imageState = imagesProvider.getImagesAround(lon, lat) diff --git a/src/UI/Popup/PlantNetDetectionViz.ts b/src/UI/Popup/PlantNetDetectionViz.ts index 595a8262ec..5d7d0c2d8c 100644 --- a/src/UI/Popup/PlantNetDetectionViz.ts +++ b/src/UI/Popup/PlantNetDetectionViz.ts @@ -9,6 +9,7 @@ import { SpecialVisualization, SpecialVisualizationState } from "../SpecialVisua import SvelteUIElement from "../Base/SvelteUIElement" import PlantNet from "../PlantNet/PlantNet.svelte" import { default as PlantNetCode } from "../../Logic/Web/PlantNet" + export class PlantNetDetectionViz implements SpecialVisualization { funcName = "plantnet_detection" needsUrls = [PlantNetCode.baseUrl] @@ -33,7 +34,7 @@ export class PlantNetDetectionViz implements SpecialVisualization { imagePrefixes = [].concat(...args.map((a) => a.split(","))) } - const allProvidedImages: Store = AllImageProviders.LoadImagesFor( + const allProvidedImages: Store = AllImageProviders.loadImagesFor( tags, imagePrefixes ) diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts index b8be328351..ad9f864c4b 100644 --- a/src/UI/SpecialVisualizations.ts +++ b/src/UI/SpecialVisualizations.ts @@ -3,11 +3,7 @@ import { FixedUiElement } from "./Base/FixedUiElement" import BaseUIElement from "./BaseUIElement" import Title from "./Base/Title" import { default as FeatureTitle } from "./Popup/Title.svelte" -import { - RenderingSpecification, - SpecialVisualization, - SpecialVisualizationState, -} from "./SpecialVisualization" +import { RenderingSpecification, SpecialVisualization, SpecialVisualizationState } from "./SpecialVisualization" import { HistogramViz } from "./Popup/HistogramViz" import MinimapViz from "./Popup/MinimapViz.svelte" import { ShareLinkViz } from "./Popup/ShareLinkViz" @@ -720,7 +716,7 @@ export default class SpecialVisualizations { if (args.length > 0) { imagePrefixes = [].concat(...args.map((a) => a.split(","))) } - const images = AllImageProviders.LoadImagesFor(tags, imagePrefixes) + const images = AllImageProviders.loadImagesFor(tags, imagePrefixes) return new SvelteUIElement(ImageCarousel, { state, tags, images }) }, }, diff --git a/test/Logic/ImageProviders/ImageProviders.spec.ts b/test/Logic/ImageProviders/ImageProviders.spec.ts index 218af01688..ff42f46ff1 100644 --- a/test/Logic/ImageProviders/ImageProviders.spec.ts +++ b/test/Logic/ImageProviders/ImageProviders.spec.ts @@ -79,7 +79,7 @@ describe("ImageProviders", () => { if (!Array.isArray(urls)) { urls = [urls] } - const images = await AllImageProviders.LoadImagesFor( + const images = await AllImageProviders.loadImagesFor( new ImmutableStore(tags) ).AsPromise((imgs) => imgs !== undefined && imgs.length > 0) console.log("ImageProvider test", tags.id, "for", tags)