Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix #1863

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-04-01 02:00:48 +02:00
parent a79675c879
commit 940f187041
8 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/generateImageAnalysis.ts
View file

@ -95,7 +95,7 @@ export default class GenerateImageAnalysis extends Script {
if (fs.existsSync(targetPath)) {
return false
}
const attribution = await Imgur.singleton.DownloadAttribution(image)
const attribution = await Imgur.singleton.DownloadAttribution({ url: image, })
if ((attribution.artist ?? "") === "") {
// This is an invalid attribution. We save the raw response as well
@ -215,7 +215,7 @@ export default class GenerateImageAnalysis extends Script {
skipped++
} else {
try {
attribution = await Imgur.singleton.DownloadAttribution(image)
attribution = await Imgur.singleton.DownloadAttribution({ url: image })
await ScriptUtils.sleep(500)
writeFileSync(cachedView, JSON.stringify(attribution))
dloaded++

2
src/Logic/ImageProviders/GenericImageProvider.ts
View file

@ -40,7 +40,7 @@ export default class GenericImageProvider extends ImageProvider {
return undefined
}
public DownloadAttribution(url: string) {
public DownloadAttribution(_) {
return undefined
}
}

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

@ -67,7 +67,7 @@ export default abstract class ImageProvider {
public abstract ExtractUrls(key: string, value: string): Promise<Promise<ProvidedImage>[]>
public abstract DownloadAttribution(url: string): Promise<LicenseInfo>
public abstract DownloadAttribution(providedImage: ProvidedImage): Promise<LicenseInfo>
public abstract apiUrls(): string[]

5
src/Logic/ImageProviders/Imgur.ts
View file

@ -92,8 +92,9 @@ export class Imgur extends ImageProvider implements ImageUploader {
*
*
*/
public async DownloadAttribution(url: string): Promise<LicenseInfo> {
const hash = url.substr("https://i.imgur.com/".length).split(/\.jpe?g/i)[0]
public async DownloadAttribution(providedImage: {url: string}): Promise<LicenseInfo> {
const url = providedImage.url
const hash = url.substr("https://i.imgur.com/".length).split(/\.jpe?g/i)[0]
const apiUrl = "https://api.imgur.com/3/image/" + hash
const response = await Utils.downloadJsonCached(apiUrl, 365 * 24 * 60 * 60, {

20
src/Logic/ImageProviders/Mapillary.ts
View file

@ -133,12 +133,21 @@ export class Mapillary extends ImageProvider {
return [this.PrepareUrlAsync(key, value)]
}
public async DownloadAttribution(_: string): Promise<LicenseInfo> {
public async DownloadAttribution(providedImage: ProvidedImage): Promise<LicenseInfo> {
const mapillaryId = providedImage.id
const metadataUrl =
"https://graph.mapillary.com/" +
mapillaryId +
"?fields=thumb_1024_url,thumb_original_url,captured_at,creator&access_token=" +
Constants.mapillary_client_token_v4
const response = await Utils.downloadJsonCached(metadataUrl, 60 * 60)
const license = new LicenseInfo()
license.artist = undefined
license.artist = response["creator"]["username"]
license.license = "CC BY-SA 4.0"
// license.license = "Creative Commons Attribution-ShareAlike 4.0 International License";
license.attributionRequired = true
license.date = new Date(response["captured_at"])
return license
}
@ -151,16 +160,19 @@ export class Mapillary extends ImageProvider {
const metadataUrl =
"https://graph.mapillary.com/" +
mapillaryId +
"?fields=thumb_1024_url,thumb_original_url&access_token=" +
"?fields=thumb_1024_url,thumb_original_url,captured_at,creator&access_token=" +
Constants.mapillary_client_token_v4
const response = await Utils.downloadJsonCached(metadataUrl, 60 * 60)
const url = <string>response["thumb_1024_url"]
const url_hd = <string>response["thumb_original_url"]
return {
const date = new Date()
date.setTime(response["captured_at"])
return <ProvidedImage> {
id: "" + mapillaryId,
url,
url_hd,
provider: this,
date,
key,
}
}

2
src/Logic/ImageProviders/WikidataImageProvider.ts
View file

@ -53,7 +53,7 @@ export class WikidataImageProvider extends ImageProvider {
return allImages
}
public DownloadAttribution(_: string): Promise<any> {
public DownloadAttribution(_): Promise<any> {
throw new Error("Method not implemented; shouldn't be needed!")
}
}

4
src/Logic/ImageProviders/WikimediaImageProvider.ts
View file

@ -114,8 +114,8 @@ export class WikimediaImageProvider extends ImageProvider {
return [Promise.resolve(this.UrlForImage("File:" + value))]
}
public async DownloadAttribution(filename: string): Promise<LicenseInfo> {
filename = WikimediaImageProvider.ExtractFileName(filename)
public async DownloadAttribution(img: ProvidedImage): Promise<LicenseInfo> {
const filename = WikimediaImageProvider.ExtractFileName(img.url)
if (filename === "") {
return undefined

20
src/UI/Image/ImageAttribution.svelte
View file

@ -10,7 +10,7 @@
*/
export let image: ProvidedImage
let license: Store<LicenseInfo> = UIEventSource.FromPromise(
image.provider?.DownloadAttribution(image.url)
image.provider?.DownloadAttribution(image)
)
let icon = image.provider?.SourceIcon(image.id)?.SetClass("block h-8 w-8 pr-2")
</script>
@ -38,26 +38,28 @@
</div>
{/if}
<div class="flex justify-between">
<div class="flex justify-between w-full gap-x-1">
{#if $license.license !== undefined || $license.licenseShortName !== undefined}
<div>
{$license?.license ?? $license?.licenseShortName}
</div>
{/if}
{#if $license.date}
<div>
{$license.date.toLocaleDateString()}
{#if $license.views}
<div class="flex justify-around self-center">
<EyeIcon class="h-4 w-4 pr-1" />
{$license.views}
</div>
{/if}
</div>
{#if $license.views}
<div class="flex justify-around self-center">
<EyeIcon class="h-4 w-4 pr-1" />
{$license.views}
{#if $license.date}
<div>
{$license.date.toLocaleDateString()}
</div>
{/if}
</div>
</div>
{/if}