Merge pull request #1 from plepe/master

Sync

bin/categories-to-lang

@@ -103,7 +103,7 @@ function writeTranslationFiles () {
 
     let data = {}
     allIds.forEach(function (id) {
-      data[id] = null
+      data[id] = ''
     })
 
     let keys = Object.keys(all[lang])

conf.php-dist

@@ -82,13 +82,13 @@ $config['baseMaps'] = array(
 
 // List of available user interface languages
 $languages = array(
+  "en", // English
   "ast", // Asturian
   "ca", // Catalan
   "cs", // Czech
   "da", // Danish
   "de", // German
   "el", // Greek
-  "en", // English
   "es", // Spanish
   "et", // Estonian
   "fr", // French
@@ -97,6 +97,7 @@ $languages = array(
   "ja", // Japanese
   "nl", // Dutch
   "pl", // Polish
+  "pt", // Portugese
   "pt-br", // Portugese (Brazil)
   "ro", // Romanian
   "ru", // Russian

httpGet.php

@@ -0,0 +1,2 @@
+<?php
+readfile($_REQUEST['url']);

index.php

@@ -17,6 +17,10 @@ elseif (isset($config['categoriesDir'])) {
   }
 }
 
+if (isset($_GET['lang'])) {
+  $_SESSION['ui_lang'] = $_GET['lang'];
+}
+
 if (sizeof($_GET)) {
   Header('Location: .#' . http_build_query($_GET));
   exit(0);

lang/ast.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opciones",
     "more": "más",
     "more_categories": "Más categoríes",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "ensin nome",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/ca.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opcions",
     "more": "més",
     "more_categories": "Més categories",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/cs.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Nastavení",
     "more": "více",
     "more_categories": "Více kategorií",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "nepojmenováno",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/da.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Indstillinger",
     "more": "mere",
     "more_categories": "Flere kategorier",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "unavngivet",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/de.json

@@ -3,12 +3,16 @@
     "category-info-tooltip": "Info & Legende",
     "closed": "geschlossen",
     "default": "Standard",
+    "edit": "bearbeiten",
     "error": {
         "message": "Fehler",
         "!=1": "Fehler"
     },
     "facilities": "Einrichtungen",
+    "header:attributes": "Attribute",
+    "header:osm_meta": "OSM Meta",
     "images": "Bilder",
+    "loading": "Laden ...",
     "main:options": "Optionen",
     "more": "mehr",
     "more_categories": "Mehr Kategorien",
@@ -26,5 +30,7 @@
     "toggle_fullscreen": "(De-)aktiviere Vollbildmodus",
     "unknown": "unbekannt",
     "unnamed": "Namenlos",
-    "wikipedia:no-url-parse": "Konnte Wikipedia Adresse nicht erkennen"
+    "wikipedia:no-url-parse": "Konnte Wikipedia Adresse nicht erkennen",
+    "zoom_in_appear": "Zoome hinein um Kartenobjekte zu sehen",
+    "zoom_in_more": "Zoome hinein für weitere Kartenobjekte"
 }

lang/el.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Επιλογές",
     "more": "περισσότερα",
     "more_categories": "Περισσότερες κατηγορίες",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "ανώνυμο",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/en.json

@@ -3,12 +3,16 @@
     "category-info-tooltip": "Info & Map key",
     "closed": "closed",
     "default": "default",
+    "edit": "edit",
     "error": {
         "message": "Error",
         "!=1": "Errors"
     },
     "facilities": "Facilities",
+    "header:attributes": "Attributes",
+    "header:osm_meta": "OSM Meta",
     "images": "Images",
+    "loading": "Loading ...",
     "main:options": "Options",
     "more": "more",
     "more_categories": "More categories",
@@ -26,5 +30,7 @@
     "toggle_fullscreen": "Toggle full screen mode",
     "unknown": "unknown",
     "unnamed": "unnamed",
-    "wikipedia:no-url-parse": "Could not parse Wikipedia URL"
+    "wikipedia:no-url-parse": "Could not parse Wikipedia URL",
+    "zoom_in_appear": "zoom in for map features to appear",
+    "zoom_in_more": "zoom in for more map features"
 }

lang/es.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opciones",
     "more": "más",
     "more_categories": "Más categorías",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/et.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Valikud",
     "more": "lisaks",
     "more_categories": "Rohkem kategooriaid",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "nimeta",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/fr.json

@@ -1,27 +1,32 @@
 {
-    "back": "",
-    "category-info-tooltip": "",
-    "closed": "",
-    "default": "",
-    "error": "",
-    "facilities": "",
-    "images": "",
+    "back": "Retour",
+    "category-info-tooltip": "Info & Légende",
+    "closed": "Fermé",
+    "default": "Par défaut",
+    "error": "Erreur",
+    "facilities": "Aménagements",
+    "header:attributes": "Attributs",
+    "header:osm_meta": "Métadonnées OSM",
+    "images": "Images",
+    "loading": "Chargement...",
     "main:options": "Options",
     "more": "plus",
     "more_categories": "Plus de catégories",
-    "more_categories_gitea": "",
-    "open": "",
+    "more_categories_gitea": "Créez et améliorez vous-mêmes les catégories!",
+    "open": "ouvrir",
     "options:data_lang": "Langue des données",
-    "options:data_lang:desc": "",
+    "options:data_lang:desc": "Beaucoup d'éléments de la carte ont leur nom (et d'autres tags) traduits en différentes langues (exemple avec 'name:en', 'name:de'). Spécifiez quelle langue devrait être utilisée pour l'affichage, ou 'Langue locale' pour que la valeur non traduite (ex 'name') soit toujours utilisée.",
     "options:data_lang:local": "Langue locale",
-    "options:overpassUrl": "",
-    "options:preferredBaseMap": "",
+    "options:overpassUrl": "URL OverpassAPI",
+    "options:preferredBaseMap": "Carte de base préférée",
     "options:ui_lang": "Langue de l'interface",
     "other": "Autres",
     "save": "Sauvegarder",
-    "show details": "",
-    "toggle_fullscreen": "",
-    "unknown": "Inconnue",
+    "show details": "montrer les détails",
+    "toggle_fullscreen": "Basculer en plein écran",
+    "unknown": "inconnu.e",
     "unnamed": "sans nom",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "Impossible de parser l'URL de Wikipédia",
+    "zoom_in_appear": "zoomez pour que les éléments de la carte apparaissent",
+    "zoom_in_more": "zoomez pour afficher plus d'éléments de la carte"
 }

lang/hu.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Beállítások",
     "more": "több",
     "more_categories": "Több kategória",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/it.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opzioni",
     "more": "altri",
     "more_categories": "Altre categorie",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "privo di nome",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/ja.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "オプション設定",
     "more": "もっと",
     "more_categories": "カテゴリを一覧から追加",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "nameなし",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/nl.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opties",
     "more": "meer",
     "more_categories": "Meer categorieën",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "naamloos",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/pl.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Opcje",
     "more": "więcej",
     "more_categories": "Więcej kategorii",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "nienazwane",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/pt-br.json

@@ -1,27 +1,35 @@
 {
-    "back": "",
-    "category-info-tooltip": "",
-    "closed": "",
-    "default": "",
-    "error": "",
-    "facilities": "",
-    "images": "",
-    "main:options": "",
+    "back": "voltar",
+    "category-info-tooltip": "Info & Legenda",
+    "closed": "fechado",
+    "default": "padrão",
+    "error": {
+        "message": "Erro",
+        "!=1": "Erros"
+    },
+    "facilities": "Instalações",
+    "images": "Imagens",
+    "header:attributes": "",
+    "header:osm_meta": "",
+    "loading": "",
+    "main:options": "Opções",
     "more": "mais",
-    "more_categories": "",
-    "more_categories_gitea": "",
-    "open": "",
-    "options:data_lang": "",
-    "options:data_lang:desc": "",
-    "options:data_lang:local": "",
-    "options:overpassUrl": "",
-    "options:preferredBaseMap": "",
-    "options:ui_lang": "",
-    "other": "",
+    "more_categories": "Mais categorias",
+    "more_categories_gitea": "Criar & melhorar categorias você mesmo!",
+    "open": "abrir",
+    "options:data_lang": "Língua dos dados",
+    "options:data_lang:desc": "Muitos elementos do mapa possuem seus nomes (e outras etiquetas) traduzidas para línguas diferentes (p.ex. com 'name:en', 'name:de'). Especificar qual língua deve ser usada para exibição, ou 'Língua local' de forma que sempre os valores não tranduzidos (p.ex. 'name') sejam usados.",
+    "options:data_lang:local": "Língua local",
+    "options:overpassUrl": "URL do OverpassAPI",
+    "options:preferredBaseMap": "Mapa-base preferido",
+    "options:ui_lang": "Língua da interface",
+    "other": "Outro",
     "save": "Salvar",
-    "show details": "",
-    "toggle_fullscreen": "",
-    "unknown": "",
+    "show details": "mostrar detalhes",
+    "toggle_fullscreen": "Alternar modo tela cheia",
+    "unknown": "desconhecido",
     "unnamed": "sem nome",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "Não se pôde analisar URL da Wikipédia",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/pt.json

@@ -0,0 +1,35 @@
+{
+    "back": "voltar",
+    "category-info-tooltip": "Info & Legenda",
+    "closed": "fechado",
+    "default": "padrão",
+    "error": {
+        "message": "Erro",
+        "!=1": "Erros"
+    },
+    "facilities": "Instalações",
+    "images": "Imagens",
+    "header:attributes": "Atributos",
+    "header:osm_meta": "",
+    "loading": "A carregar...",
+    "main:options": "Opções",
+    "more": "mais",
+    "more_categories": "Mais categorias",
+    "more_categories_gitea": "Criar & melhorar categorias você mesmo!",
+    "open": "abrir",
+    "options:data_lang": "Língua dos dados",
+    "options:data_lang:desc": "Muitos elementos do mapa possuem seus nomes (e outras etiquetas) traduzidas para línguas diferentes (p.ex. com 'name:en', 'name:de'). Especificar qual língua deve ser usada para exibição, ou 'Língua local' de forma que sempre os valores não tranduzidos (p.ex. 'name') sejam usados.",
+    "options:data_lang:local": "Língua local",
+    "options:overpassUrl": "URL do OverpassAPI",
+    "options:preferredBaseMap": "Mapa-base preferido",
+    "options:ui_lang": "Língua da interface",
+    "other": "Outro",
+    "save": "Guardar",
+    "show details": "mostrar detalhes",
+    "toggle_fullscreen": "Alternar modo ecrã inteiro",
+    "unknown": "desconhecido",
+    "unnamed": "sem nome",
+    "wikipedia:no-url-parse": "Não foi possível analisar URL da Wikipédia",
+    "zoom_in_appear": "Faça zoom in para detalhes do mapa aparecerem",
+    "zoom_in_more": "Faça zoom in para mostrar mais detalhes no mapa"
+}

lang/ro.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Optiuni",
     "more": "Mai mult",
     "more_categories": "Mai multe categorii",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "anonim",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/ru.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Настройки",
     "more": "Ещё",
     "more_categories": "Больше категорий",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "безымянный",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/sr.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Опције",
     "more": "још",
     "more_categories": "Више категорија",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "без имена",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/template.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "",
     "more": "",
     "more_categories": "",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lang/uk.json

@@ -5,7 +5,10 @@
     "default": "",
     "error": "",
     "facilities": "",
+    "header:attributes": "",
+    "header:osm_meta": "",
     "images": "",
+    "loading": "",
     "main:options": "Налаштування",
     "more": "Ще",
     "more_categories": "Більше категорій",
@@ -23,5 +26,7 @@
     "toggle_fullscreen": "",
     "unknown": "",
     "unnamed": "безіменний",
-    "wikipedia:no-url-parse": ""
+    "wikipedia:no-url-parse": "",
+    "zoom_in_appear": "",
+    "zoom_in_more": ""
 }

lib/modulekit/base

@@ -1 +1 @@
-Subproject commit 279863bd46c9ee04b34c4a97cdfaee74f92172d5
+Subproject commit 8adaf00d0ec3472784802522f90c875ef2ce04ba

lib/modulekit/form

@@ -1 +1 @@
-Subproject commit 4a94f64c11d3f16b01a5aec6afd5cfb4b7257572
+Subproject commit c26a06bdac5ba37a1ef020dd62a53de7ccce61d1

lib/modulekit/lang

@@ -1 +1 @@
-Subproject commit 80118dbcaafa9ab95298be95548126071efc069f
+Subproject commit 3688eae14c7cd2b7aa2f54ed23ffaa5e1c7b8338

src/CategoryOverpass.js

@@ -128,7 +128,7 @@ function CategoryOverpass (options, data) {
 
   p = document.createElement('div')
   p.className = 'loadingIndicator'
-  p.innerHTML = '<i class="fa fa-spinner fa-pulse fa-fw"></i><span class="sr-only">Loading...</span>'
+  p.innerHTML = '<i class="fa fa-spinner fa-pulse fa-fw"></i><span class="sr-only">' + lang('loading') + '</span>'
   this.dom.appendChild(p)
 
   p = document.createElement('div')
@@ -223,12 +223,12 @@ CategoryOverpass.prototype.updateStatus = function () {
   if (typeof this.data.query === 'object') {
     var highestZoom = Object.keys(this.data.query).reverse()[0]
     if (this.map.getZoom() < highestZoom) {
-      this.domStatus.innerHTML = 'zoom in for more map features'
+      this.domStatus.innerHTML = lang('zoom_in_more')
     }
   }
 
   if ('minZoom' in this.data && this.map.getZoom() < this.data.minZoom) {
-    this.domStatus.innerHTML = 'zoom in for map features to appear'
+    this.domStatus.innerHTML = lang('zoom_in_appear')
   }
 }
 
@@ -391,9 +391,10 @@ CategoryOverpass.prototype.updatePopupContent = function (object, popup) {
     popupBody.innerHTML = this.popupBodyTemplate.render(data)
   }
 
-  var footer = document.createElement('div')
-  footer.className = 'footer'
-  var footerContent = '<a class="showDetails" href="#' + this.id + '/' + object.id + '/details">' + lang('show details') + '</a>'
+  var footer = document.createElement('ul')
+  footer.className = 'popup-footer'
+  var footerContent = '<li><a class="showDetails" href="#' + this.id + '/' + object.id + '/details">' + lang('show details') + '</a></li>'
+  footerContent += '<li><a target="_blank" class="editLink" href="https://www.openstreetmap.org/edit?editor=id&' + object.object.type + '=' + object.object.osm_id + '">' + lang('edit') + '</a></li>'
   footer.innerHTML = footerContent
   popup._contentNode.appendChild(footer)
 

src/httpGet.js

@@ -1,9 +1,14 @@
-function httpGet (url, callback) {
-  var xhr = new XMLHttpRequest()
-  xhr.open('get', url, true)
-  xhr.responseType = 'text'
-  xhr.onreadystatechange = function () {
+function httpGet (url, options, callback) {
+  let corsRetry = true
+  var xhr
+
+  function readyStateChange () {
     if (xhr.readyState === 4) {
+      if (corsRetry && xhr.status === 0) {
+        corsRetry = false
+        return viaServer()
+      }
+
       if (xhr.status === 200) {
         callback(null, { body: xhr.responseText })
       } else {
@@ -11,7 +16,28 @@ function httpGet (url, callback) {
       }
     }
   }
-  xhr.send()
+
+  function direct () {
+    xhr = new XMLHttpRequest()
+    xhr.open('get', url, true)
+    xhr.responseType = 'text'
+    xhr.onreadystatechange = readyStateChange
+    xhr.send()
+  }
+
+  function viaServer () {
+    xhr = new XMLHttpRequest()
+    xhr.open('get', 'httpGet.php?url=' + encodeURIComponent(url), true)
+    xhr.responseType = 'text'
+    xhr.onreadystatechange = readyStateChange
+    xhr.send()
+  }
+
+  if (options.forceServerLoad) {
+    viaServer()
+  } else {
+    direct()
+  }
 }
 
 module.exports = httpGet

src/image.js

@@ -1,3 +1,4 @@
+var httpGet = require('./httpGet')
 var ImageLoader = require('./ImageLoader')
 var showTimer
 
@@ -9,17 +10,25 @@ function showImage (image, dom) {
 }
 
 function showWikimediaImage (image, dom) {
-  var size = 400
-  if ('width' in image && image.width < size) {
-    size = image.width
-  }
+  httpGet(
+    'https://commons.wikimedia.org/wiki/File:' + encodeURIComponent(image.id),
+    {
+      forceServerLoad: true
+    },
+    function (err, result) {
+      if (!result) {
+        return
+      }
 
-  var url = 'https://commons.wikimedia.org/w/thumb.php?f=' + encodeURIComponent(image.id) + '&w=' + size
+      let m = result.body.match('img .* src="([^"]+)" .* data-file-width="([0-9]+)" data-file-height="([0-9]+)"')
+      let src = m[1]
 
-  var div = document.createElement('div')
-  div.innerHTML = '<a target="_blank" href="https://commons.wikimedia.org/wiki/File:' + encodeURIComponent(image.id) + '"><img src="' + url + '"/></a>'
+      var div = document.createElement('div')
+      div.innerHTML = '<a target="_blank" href="https://commons.wikimedia.org/wiki/File:' + encodeURIComponent(image.id) + '"><img src="' + src + '"/></a>'
 
-  dom.appendChild(div)
+      dom.appendChild(div)
+    }
+  )
 }
 
 // feature: { id: 'File:xxx.jpg', type: 'wikimedia|url', url: 'https://...' }

src/index.js

@@ -186,7 +186,7 @@ function show (id, options, callback) {
   if (options.showDetails) {
     call_hooks('hide-' + document.getElementById('content').className)
     document.getElementById('content').className = 'details'
-    document.getElementById('contentDetails').innerHTML = 'Loading ...'
+    document.getElementById('contentDetails').innerHTML = lang('loading')
   }
 
   var m = id.match(/^(.*)\/([nwr]\d+)(\/details)?$/)
@@ -269,7 +269,7 @@ window.showDetails = function (data, category) {
   )
 
   h = document.createElement('h3')
-  h.innerHTML = 'Attributes'
+  h.innerHTML = lang('header:attributes')
   dom.appendChild(h)
 
   div = document.createElement('dl')
@@ -286,7 +286,7 @@ window.showDetails = function (data, category) {
   dom.appendChild(div)
 
   h = document.createElement('h3')
-  h.innerHTML = 'OSM Meta'
+  h.innerHTML = lang('header:osm_meta')
   dom.appendChild(h)
 
   div = document.createElement('dl')

src/wikidata.js

@@ -13,7 +13,7 @@ function wikidataLoad (id, callback) {
   }
   loadClash[id] = []
 
-  httpGet('https://www.wikidata.org/wiki/Special:EntityData/' + id + '.json', function (err, result) {
+  httpGet('https://www.wikidata.org/wiki/Special:EntityData/' + id + '.json', {}, function (err, result) {
     if (err) {
       return callback(err, null)
     }

style.css

@@ -109,11 +109,13 @@ a:active {
   margin-left: 0;
 }
 
-#content a.showDetails {
-  display: none;
+.leaflet-popup-content ul.popup-footer {
+  padding: 0;
 }
-a.showDetails {
-  display: block;
+.leaflet-popup-content ul.popup-footer li {
+  display: inline-block;
+  list-style: none;
+  padding-right: 1em;
 }
 
 /* Footer */