Feature: add link to the original provider, see #2387
Some checks failed
/ deploy_on_hosted (push) Has been cancelled
Some checks failed
/ deploy_on_hosted (push) Has been cancelled
This commit is contained in:
parent
991925ba35
commit
3e5b1444cc
10 changed files with 51 additions and 5 deletions
|
@ -561,6 +561,7 @@
|
|||
"seeNearby": "Browse nearby pictures",
|
||||
"title": "Nearby streetview imagery"
|
||||
},
|
||||
"openOnWebsite": "Open this image on {name}",
|
||||
"panoramax": {
|
||||
"deletionRequested": "The report has been sent. A moderator will look to it shortly",
|
||||
"freeform": "Is there other relevant information?",
|
||||
|
|
|
@ -33,6 +33,7 @@ export default class GenericImageProvider extends ImageProvider {
|
|||
url: value,
|
||||
provider: this,
|
||||
id: value,
|
||||
isSpherical: undefined
|
||||
},
|
||||
]
|
||||
}
|
||||
|
@ -45,7 +46,11 @@ export default class GenericImageProvider extends ImageProvider {
|
|||
return undefined
|
||||
}
|
||||
|
||||
getPanoramaInfo(image: { id: string }): undefined {
|
||||
getPanoramaInfo(): undefined {
|
||||
return undefined
|
||||
}
|
||||
|
||||
visitUrl(image: { url: string }): string | undefined {
|
||||
return image.url
|
||||
}
|
||||
}
|
||||
|
|
|
@ -125,6 +125,11 @@ export default abstract class ImageProvider {
|
|||
|
||||
public abstract apiUrls(): string[]
|
||||
|
||||
/**
|
||||
* URL to visit the image on the original website
|
||||
*/
|
||||
public abstract visitUrl(image: Partial<ProvidedImage>, location?: { lon: number, lat: number }): string | undefined
|
||||
|
||||
public abstract getPanoramaInfo(image: {
|
||||
id: string
|
||||
}): Promise<Feature<Point, PanoramaView>> | undefined
|
||||
|
|
|
@ -118,7 +118,11 @@ export class Imgur extends ImageProvider {
|
|||
return license
|
||||
}
|
||||
|
||||
getPanoramaInfo(image: { id: string }): undefined {
|
||||
getPanoramaInfo(): undefined {
|
||||
return undefined
|
||||
}
|
||||
|
||||
visitUrl(): string | undefined {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,6 +8,7 @@ import MapillaryIcon from "./MapillaryIcon.svelte"
|
|||
import { Feature, Point } from "geojson"
|
||||
|
||||
export class Mapillary extends ImageProvider {
|
||||
|
||||
public static readonly singleton = new Mapillary()
|
||||
public readonly name = "Mapillary"
|
||||
|
||||
|
@ -237,4 +238,11 @@ export class Mapillary extends ImageProvider {
|
|||
lon: geometry.coordinates[0],
|
||||
}
|
||||
}
|
||||
|
||||
public visitUrl(image: { id: string }, location?: { lon: number, lat: number }): (string | undefined) {
|
||||
if (!image.id) {
|
||||
return
|
||||
}
|
||||
return Mapillary.createLink(location, 17, image.id)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,6 +45,15 @@ export default class PanoramaxImageProvider extends ImageProvider {
|
|||
)
|
||||
}
|
||||
|
||||
visitUrl(img: { id: string, url: string }, location?: { lon: number, lat: number }): string | undefined {
|
||||
const host = "https://" + new URL(img.url).host
|
||||
const p = new Panoramax(host)
|
||||
return p.createViewLink({
|
||||
imageId: img?.id,
|
||||
location
|
||||
})
|
||||
}
|
||||
|
||||
public addKnownMeta(meta: ImageData, url?: string) {
|
||||
PanoramaxImageProvider.knownMeta[meta.id] = { data: Promise.resolve({ data: meta, url }), time: new Date() }
|
||||
}
|
||||
|
|
|
@ -71,4 +71,8 @@ export class WikidataImageProvider extends ImageProvider {
|
|||
public getPanoramaInfo(image: { id: string }): Promise<Feature<Point, PanoramaView>> {
|
||||
return undefined
|
||||
}
|
||||
|
||||
visitUrl(image: Partial<ProvidedImage>, location?: { lon: number; lat: number }): string | undefined {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
|
|
@ -193,7 +193,11 @@ export class WikimediaImageProvider extends ImageProvider {
|
|||
}
|
||||
}
|
||||
|
||||
getPanoramaInfo(image: { id: string }): Promise<Feature<Point, PanoramaView>> | undefined {
|
||||
getPanoramaInfo(): Promise<Feature<Point, PanoramaView>> | undefined {
|
||||
return undefined
|
||||
}
|
||||
|
||||
visitUrl(): string | undefined {
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ export class AvailableRasterLayers {
|
|||
)
|
||||
)
|
||||
return Stores.ListStabilized(
|
||||
availableLayersBboxes.map(
|
||||
availableLayersBboxes.mapD(
|
||||
(eliPolygons) => {
|
||||
const loc = location.data
|
||||
const lonlat: [number, number] = [loc?.lon ?? 0, loc?.lat ?? 0]
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
import { MenuState } from "../../Models/MenuState"
|
||||
import ThemeViewState from "../../Models/ThemeViewState"
|
||||
import Panorama360 from "../../assets/svg/Panorama360.svelte"
|
||||
import { ExternalLinkIcon } from "@rgossiaux/svelte-heroicons/solid"
|
||||
|
||||
export let image: Partial<ProvidedImage> & { id: string; url: string }
|
||||
let fallbackImage: string = undefined
|
||||
|
@ -40,6 +41,7 @@
|
|||
| Store<Feature<Geometry, HotspotProperties>[]> = []
|
||||
|
||||
let loaded = false
|
||||
let visitUrl = image.provider.visitUrl(image)
|
||||
let showBigPreview = new UIEventSource(false)
|
||||
onDestroy(
|
||||
showBigPreview.addCallbackAndRun((shown) => {
|
||||
|
@ -110,9 +112,13 @@
|
|||
on:mouseenter={() => highlight()}
|
||||
on:mouseleave={() => highlight(false)}
|
||||
>
|
||||
{#if $$slots["dot-menu-actions"]}
|
||||
{#if $$slots["dot-menu-actions"] || visitUrl !== undefined}
|
||||
<DotMenu dotsPosition="top-0 left-0 absolute" hideBackground>
|
||||
<slot name="dot-menu-actions" />
|
||||
<a href={visitUrl} target="_blank" rel="noopener">
|
||||
<ExternalLinkIcon class="w-6" />
|
||||
<Tr t={Translations.t.image.openOnWebsite.Subs(image.provider)} />
|
||||
</a>
|
||||
</DotMenu>
|
||||
{/if}
|
||||
{#if !loaded}
|
||||
|
|
Loading…
Add table
Reference in a new issue