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

Add binoculars theme, auto reformat everything

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-09-09 00:05:51 +02:00
parent 38dea806c5
commit 78d6482c88
586 changed files with 115573 additions and 111842 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Logic/ImageProviders/AllImageProviders.ts
View file

@ -2,8 +2,8 @@ import {Mapillary} from "./Mapillary";
import {Wikimedia} from "./Wikimedia";
import {Imgur} from "./Imgur";
export default class AllImageProviders{
export default class AllImageProviders {
public static ImageAttributionSource = [Imgur.singleton, Mapillary.singleton, Wikimedia.singleton]
}

9
Logic/ImageProviders/ImageAttributionSource.ts
View file

@ -18,12 +18,13 @@ export default abstract class ImageAttributionSource {
}
public abstract SourceIcon(backlinkSource?: string) : BaseUIElement;
protected abstract DownloadAttribution(url: string): UIEventSource<LicenseInfo>;
public abstract SourceIcon(backlinkSource?: string): BaseUIElement;
/*Converts a value to a URL. Can return null if not applicable*/
public PrepareUrl(value: string): string{
public PrepareUrl(value: string): string {
return value;
}
protected abstract DownloadAttribution(url: string): UIEventSource<LicenseInfo>;
}

4
Logic/ImageProviders/Imgur.ts
View file

@ -6,8 +6,8 @@ import {UIEventSource} from "../UIEventSource";
import BaseUIElement from "../../UI/BaseUIElement";
export class Imgur extends ImageAttributionSource {
public static readonly singleton = new Imgur();
public static readonly singleton = new Imgur();
private constructor() {
super();

1
Logic/ImageProviders/Mapillary.ts
View file

@ -1,4 +1,3 @@
import $ from "jquery"
import {LicenseInfo} from "./Wikimedia";
import ImageAttributionSource from "./ImageAttributionSource";
import BaseUIElement from "../../UI/BaseUIElement";

10
Logic/ImageProviders/Wikimedia.ts
View file

@ -77,7 +77,7 @@ export class Wikimedia extends ImageAttributionSource {
static GetWikiData(id: number, handleWikidata: ((Wikidata) => void)) {
const url = "https://www.wikidata.org/wiki/Special:EntityData/Q" + id + ".json";
Utils.downloadJson(url).then (response => {
Utils.downloadJson(url).then(response => {
const entity = response.entities["Q" + id];
const commons = entity.sitelinks.commonswiki;
const wd = new Wikidata();
@ -139,10 +139,10 @@ export class Wikimedia extends ImageAttributionSource {
"titles=" + filename +
"&format=json&origin=*";
Utils.downloadJson(url).then(
data =>{
data => {
const licenseInfo = new LicenseInfo();
const license = (data.query.pages[-1].imageinfo ?? [])[0]?.extmetadata;
if(license === undefined){
if (license === undefined) {
console.error("This file has no usable metedata or license attached... Please fix the license info file yourself!")
source.setData(null)
return;
@ -156,10 +156,10 @@ export class Wikimedia extends ImageAttributionSource {
licenseInfo.licenseShortName = license.LicenseShortName?.value;
licenseInfo.credit = license.Credit?.value;
licenseInfo.description = license.ImageDescription?.value;
source.setData(licenseInfo);
source.setData(licenseInfo);
}
)
return source;
}