CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

retry wikidata api without lng's region subtag if an error is returned

Browse Source 
closes #9638
This commit is contained in:
Martin Raifer
2023-05-23 16:04:33 +02:00
parent 559a4ba728
commit 862ca6522a
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/wikidata.js
+10 -3
View File
@@ -17,13 +17,13 @@ export default {
// Search for Wikidata items matching the query
itemsForSearchQuery: function(query, callback) {
itemsForSearchQuery: function _itemsForSearchQuery(query, callback, language) {
if (!query) {
if (callback) callback('No query', {});
return;
}
var lang = this.languagesToQuery()[0];
var lang = language || this.languagesToQuery()[0];
var url = apibase + utilQsString({
action: 'wbsearchentities',
@@ -42,7 +42,14 @@ export default {
d3_json(url)
.then(function(result) {
if (result && result.error) {
throw new Error(result.error);
if (result.error.code === 'badvalue' &&
result.error.info.includes(lang) &&
!language && lang.includes('-')) {
// retry without "country suffix" region subtag
_itemsForSearchQuery(query, callback, lang.split('-')[0]);
} else {
throw new Error(result.error);
}
}
if (callback) callback(null, result.search || {});
})