midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wikimedia images

Browse source
This commit is contained in:
pietervdvn 2021-03-26 03:33:42 +01:00
parent ad406b5550
commit ac9cca4c51
1 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Logic/Actors/ImageSearcher.ts
View file

@ -19,6 +19,7 @@ import {UIEventSource} from "../UIEventSource";
*/ */
export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]> { export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]> {
private static _cache = new Map<string, ImageSearcher>();
private readonly _wdItem = new UIEventSource<string>(""); private readonly _wdItem = new UIEventSource<string>("");
private readonly _commons = new UIEventSource<string>(""); private readonly _commons = new UIEventSource<string>("");
@ -48,23 +49,20 @@ export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]>
} }
} }
function addImage(image: string) {
AddImages([{url: image, key: undefined}]);
}
// By wrapping this in a UIEventSource, we prevent multiple queries of loadWikiData // By wrapping this in a UIEventSource, we prevent multiple queries of loadWikiData
this._wdItem.addCallback(wdItemContents => { this._wdItem.addCallback(wdItemContents => {
const images = ImageSearcher.loadWikidata(wdItemContents).map(url => { ImageSearcher.loadWikidata(wdItemContents, addImage);
return {url: url, key: undefined}
});
AddImages(images);
}); });
this._commons.addCallback(commonsData => { this._commons.addCallback(commonsData => {
const images = ImageSearcher.LoadCommons(commonsData).map(url => { ImageSearcher.LoadCommons(commonsData, addImage)
return {url: url, key: undefined}
});
AddImages(images);
}); });
tags.addCallbackAndRun(tags => { tags.addCallbackAndRun(tags => {
const images = ImageSearcher.LoadImages(tags, imagePrefix, loadSpecial); AddImages(ImageSearcher.LoadImages(tags, imagePrefix));
AddImages(images);
}); });
if (loadSpecial) { if (loadSpecial) {
@ -100,51 +98,58 @@ export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]>
} }
} }
private static loadWikidata(wikidataItem): string[] { public static construct(tags: UIEventSource<any>, imagePrefix = "image", loadSpecial = true): ImageSearcher {
const key = tags["id"] + " " + imagePrefix + loadSpecial;
if (ImageSearcher._cache.has(key)) {
return ImageSearcher._cache.get(key)
}
const searcher = new ImageSearcher(tags, imagePrefix, loadSpecial);
ImageSearcher._cache.set(key, searcher)
return searcher;
}
private static loadWikidata(wikidataItem, addImage: ((url: string) => void)): void {
// Load the wikidata item, then detect usage on 'commons' // Load the wikidata item, then detect usage on 'commons'
let allWikidataId = wikidataItem.split(";"); let allWikidataId = wikidataItem.split(";");
const imageURLS: string[] = [];
for (let wikidataId of allWikidataId) { for (let wikidataId of allWikidataId) {
// @ts-ignore // @ts-ignore
if (wikidataId.startsWith("Q")) { if (wikidataId.startsWith("Q")) {
wikidataId = wikidataId.substr(1); wikidataId = wikidataId.substr(1);
} }
Wikimedia.GetWikiData(parseInt(wikidataId), (wd: Wikidata) => { Wikimedia.GetWikiData(parseInt(wikidataId), (wd: Wikidata) => {
imageURLS.push(wd.image); addImage(wd.image);
Wikimedia.GetCategoryFiles(wd.commonsWiki, (images: ImagesInCategory) => { Wikimedia.GetCategoryFiles(wd.commonsWiki, (images: ImagesInCategory) => {
for (const image of images.images) { for (const image of images.images) {
if (image.startsWith("File:")) { if (image.startsWith("File:")) {
imageURLS.push(image); addImage(image);
} }
} }
}) })
}) })
} }
return imageURLS;
} }
private static LoadCommons(commonsData: string): string[] { private static LoadCommons(commonsData: string, addImage: ((url: string) => void)): void {
const imageUrls = [];
const allCommons: string[] = commonsData.split(";"); const allCommons: string[] = commonsData.split(";");
for (const commons of allCommons) { for (const commons of allCommons) {
if (commons.startsWith("Category:")) { if (commons.startsWith("Category:")) {
Wikimedia.GetCategoryFiles(commons, (images: ImagesInCategory) => { Wikimedia.GetCategoryFiles(commons, (images: ImagesInCategory) => {
for (const image of images.images) { for (const image of images.images) {
if (image.startsWith("File:")) { if (image.startsWith("File:")) {
imageUrls.push(image); addImage(image)
} }
} }
}) })
} else { } else {
if (commons.startsWith("File:")) { if (commons.startsWith("File:")) {
imageUrls.push(commons); addImage(commons)
} }
} }
} }
return imageUrls;
} }
private static LoadImages(tags: any, imagePrefix: string, loadAdditional: boolean): { key: string, url: string }[] { private static LoadImages(tags: any, imagePrefix: string): { key: string, url: string }[] {
const imageTag = tags[imagePrefix]; const imageTag = tags[imagePrefix];
const images: { key: string, url: string }[] = []; const images: { key: string, url: string }[] = [];
if (imageTag !== undefined) { if (imageTag !== undefined) {
@ -165,17 +170,4 @@ export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]>
return images; return images;
} }
private static _cache = new Map<string, ImageSearcher>();
public static construct(tags: UIEventSource<any>, imagePrefix = "image", loadSpecial = true): ImageSearcher {
const key = tags["id"] + " "+imagePrefix+loadSpecial;
if(ImageSearcher._cache.has(key)){
return ImageSearcher._cache.get(key)
}
const searcher = new ImageSearcher(tags, imagePrefix, loadSpecial);
ImageSearcher._cache.set(key, searcher)
return searcher;
}
} }