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

Further stabilization of wikipedia box

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-03 01:38:57 +02:00
parent 393d5d8932
commit a89d303ecd
15 changed files with 169 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Logic/Web/Wikidata.ts
View file

@ -1,4 +1,5 @@
import {Utils} from "../../Utils";
import {UIEventSource} from "../UIEventSource";
export interface WikidataResponse {
@ -62,15 +63,23 @@ export default class Wikidata {
}
}
/**
* Loads a wikidata page
* @returns the entity of the given value
*/
public static async LoadWikidataEntry(value: string | number): Promise<WikidataResponse> {
const wikidataUrl = "https://www.wikidata.org/wiki/"
if (typeof value === "number") {
value = "Q" + value
private static readonly _cache = new Map<number, UIEventSource<{success: WikidataResponse} | {error: any}>>()
public static LoadWikidataEntry(value: string | number): UIEventSource<{success: WikidataResponse} | {error: any}> {
const key = this.ExtractKey(value)
const cached = Wikidata._cache.get(key)
if(cached !== undefined){
return cached
}
const src = UIEventSource.FromPromiseWithErr(Wikidata.LoadWikidataEntryAsync(key))
Wikidata._cache.set(key, src)
return src;
}
private static ExtractKey(value: string | number) : number{
if (typeof value === "number") {
return value
}
const wikidataUrl = "https://www.wikidata.org/wiki/"
if (value.startsWith(wikidataUrl)) {
value = value.substring(wikidataUrl.length)
}
@ -78,12 +87,30 @@ export default class Wikidata {
// Probably some random link in the image field - we skip it
return undefined
}
if (!value.startsWith("Q")) {
value = "Q" + value
if (value.startsWith("Q")) {
value = value.substring(1)
}
const url = "https://www.wikidata.org/wiki/Special:EntityData/" + value + ".json";
const n = Number(value)
if(isNaN(n)){
return undefined
}
return n;
}
/**
* Loads a wikidata page
* @returns the entity of the given value
*/
public static async LoadWikidataEntryAsync(value: string | number): Promise<WikidataResponse> {
const id = Wikidata.ExtractKey(value)
if(id === undefined){
console.warn("Could not extract a wikidata entry from", value)
return undefined;
}
console.log("Requesting wikidata with id", id)
const url = "https://www.wikidata.org/wiki/Special:EntityData/Q" + id + ".json";
const response = await Utils.downloadJson(url)
return Wikidata.ParseResponse(response.entities[value]);
return Wikidata.ParseResponse(response.entities["Q" + id])
}
}

1
Logic/Web/Wikipedia.ts
View file

@ -61,7 +61,6 @@ export default class Wikipedia {
const links = Array.from(content.getElementsByTagName("a"))
console.log("Links are", links)
// Rewrite relative links to absolute links + open them in a new tab
links.filter(link => link.getAttribute("href")?.startsWith("/") ?? false).
forEach(link => {