Merge pull request #2 from plepe/master

Sync
6 years ago · 24eef5aa76
32 changed files with 140 additions and 14 deletions
--- a/index.php
+++ b/index.php
@ -42,10 +42,12 @@ html_export_var(array(
  <link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css" />
  <link rel="stylesheet" href="node_modules/leaflet-geosearch/assets/css/leaflet.css" />
  <link rel="stylesheet" href="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.css" />
+  <link rel="stylesheet" href="node_modules/leaflet.polylinemeasure/Leaflet.PolylineMeasure.css" />
  <script src="node_modules/leaflet/dist/leaflet.js"></script>
  <script src="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
  <script src="node_modules/leaflet-textpath/leaflet.textpath.js"></script>
  <script src="node_modules/leaflet-polylineoffset/leaflet.polylineoffset.js"></script>
+  <script src="node_modules/leaflet.polylinemeasure/Leaflet.PolylineMeasure.js"></script>
  <?php print modulekit_to_javascript(); /* pass modulekit configuration to JavaScript */ ?>
  <?php print modulekit_include_js(); /* prints all js-includes */ ?>
  <?php print modulekit_include_css(); /* prints all css-includes */ ?>
--- a/lang/ast.json
+++ b/lang/ast.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/ca.json
+++ b/lang/ca.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/cs.json
+++ b/lang/cs.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/da.json
+++ b/lang/da.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/de.json
+++ b/lang/de.json
@ -3,6 +3,7 @@
    "category-info-tooltip": "Info & Legende",
    "closed": "geschlossen",
    "default": "Standard",
+    "download:geojson": "Als GeoJSON runterladen",
    "edit": "bearbeiten",
    "error": {
        "message": "Fehler",
@ -10,6 +11,7 @@
    },
    "facilities": "Einrichtungen",
    "header:attributes": "Attribute",
+    "header:export": "Export",
    "header:osm_meta": "OSM Meta",
    "images": "Bilder",
    "loading": "Laden ...",
--- a/lang/el.json
+++ b/lang/el.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/en.json
+++ b/lang/en.json
@ -3,6 +3,7 @@
    "category-info-tooltip": "Info & Map key",
    "closed": "closed",
    "default": "default",
+    "download:geojson": "Download as GeoJSON",
    "edit": "edit",
    "error": {
        "message": "Error",
@ -10,6 +11,7 @@
    },
    "facilities": "Facilities",
    "header:attributes": "Attributes",
+    "header:export": "Export",
    "header:osm_meta": "OSM Meta",
    "images": "Images",
    "loading": "Loading ...",
--- a/lang/es.json
+++ b/lang/es.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/et.json
+++ b/lang/et.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/fr.json
+++ b/lang/fr.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "Info & Légende",
    "closed": "Fermé",
    "default": "Par défaut",
+    "download:geojson": "Télécharger comme GeoJSON",
+    "edit": "éditer",
    "error": "Erreur",
    "facilities": "Aménagements",
    "header:attributes": "Attributs",
+    "header:export": "Export",
    "header:osm_meta": "Métadonnées OSM",
    "images": "Images",
    "loading": "Chargement...",
--- a/lang/hu.json
+++ b/lang/hu.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/it.json
+++ b/lang/it.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/ja.json
+++ b/lang/ja.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/nl.json
+++ b/lang/nl.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/pl.json
+++ b/lang/pl.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@ -3,15 +3,18 @@
    "category-info-tooltip": "Info & Legenda",
    "closed": "fechado",
    "default": "padrão",
+    "download:geojson": "",
+    "edit": "editar",
    "error": {
        "message": "Erro",
        "!=1": "Erros"
    },
    "facilities": "Instalações",
+    "header:attributes": "Atributos",
+    "header:export": "",
+    "header:osm_meta": "OSM Meta",
    "images": "Imagens",
-    "header:attributes": "",
-    "header:osm_meta": "",
-    "loading": "",
+    "loading": "Carregando...",
    "main:options": "Opções",
    "more": "mais",
    "more_categories": "Mais categorias",
@ -30,6 +33,6 @@
    "unknown": "desconhecido",
    "unnamed": "sem nome",
    "wikipedia:no-url-parse": "Não se pôde analisar URL da Wikipédia",
-    "zoom_in_appear": "",
-    "zoom_in_more": ""
+    "zoom_in_appear": "aproxime para elementos do mapa aparecer",
+    "zoom_in_more": "aproxime para mais elementos do mapa"
 }
--- a/lang/pt.json
+++ b/lang/pt.json
@ -3,14 +3,17 @@
    "category-info-tooltip": "Info & Legenda",
    "closed": "fechado",
    "default": "padrão",
+    "download:geojson": "",
+    "edit": "editar",
    "error": {
        "message": "Erro",
        "!=1": "Erros"
    },
    "facilities": "Instalações",
-    "images": "Imagens",
    "header:attributes": "Atributos",
-    "header:osm_meta": "",
+    "header:export": "",
+    "header:osm_meta": "OSM Meta",
+    "images": "Imagens",
    "loading": "A carregar...",
    "main:options": "Opções",
    "more": "mais",
--- a/lang/ro.json
+++ b/lang/ro.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/ru.json
+++ b/lang/ru.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/sr.json
+++ b/lang/sr.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/template.json
+++ b/lang/template.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lang/uk.json
+++ b/lang/uk.json
@ -3,9 +3,12 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
+    "download:geojson": "",
+    "edit": "",
    "error": "",
    "facilities": "",
    "header:attributes": "",
+    "header:export": "",
    "header:osm_meta": "",
    "images": "",
    "loading": "",
--- a/lib/modulekit/form
+++ b/lib/modulekit/form
@ -1 +1 @@
-Subproject commit c26a06bdac5ba37a1ef020dd62a53de7ccce61d1
+Subproject commit 464a0cbfab6acad402bc23e7f050bb01ca136b84
--- a/lib/modulekit/lang
+++ b/lib/modulekit/lang
@ -1 +1 @@
-Subproject commit 3688eae14c7cd2b7aa2f54ed23ffaa5e1c7b8338
+Subproject commit eb4addba3c06cd2ffbb973fb9c8193a1af655aec
--- a/package.json
+++ b/package.json
@ -20,13 +20,14 @@
    "leaflet-polylineoffset": "^1.1.0",
    "leaflet-textpath": "https://github.com/makinacorpus/Leaflet.TextPath#leaflet0.8-dev",
    "leaflet.locatecontrol": "^0.61.0",
+    "leaflet.polylinemeasure": "https://github.com/ppete2/Leaflet.PolylineMeasure.git",
    "modulekit-tabs": "^0.1.0",
    "moment": "^2.18.1",
    "opening_hours": "^3.5.0",
    "openstreetbrowser-categories-main": "https://github.com/plepe/openstreetbrowser-categories-main",
    "openstreetmap-date-parser": "^0.1.0",
    "openstreetmap-tag-translations": "https://github.com/plepe/openstreetmap-tag-translations",
-    "overpass-layer": "https://github.com/plepe/overpass-layer",
+    "overpass-layer": "^1.0.1",
    "query-string": "^5.0.0",
    "sheet-router": "^4.2.3",
    "weight-sort": "^1.3.0"
--- a/src/CategoryOverpass.js
+++ b/src/CategoryOverpass.js
@ -260,7 +260,8 @@ CategoryOverpass.prototype.open = function () {
  this.layer.addTo(this.map)

  if (!this.list) {
-    this.list = new OverpassLayerList(this.domContent, this.layer)
+    this.list = new OverpassLayerList(this.layer)
+    this.list.addTo(this.domContent)
    this.origGetMarker = this.list._getMarker
    this.list._getMarker = this._getMarker.bind(this)
  }
--- a/src/ImageLoader.js
+++ b/src/ImageLoader.js
@ -109,7 +109,7 @@ ImageLoader.prototype.loadWikimediaCommons = function (src, callback) {
          if (this.found.indexOf(d.id) === -1) {
            this.found.push(d.id)
            d.type = 'wikimedia'
-            this.data[id] = d
+            this.data[d.id] = d
          }
        }.bind(this))
      }
--- a/src/index.js
+++ b/src/index.js
@ -52,6 +52,12 @@ window.onload = function () {
 }

 function onload2 (initState) {
+  // Measurement plugin
+  if (L.control.polylineMeasure) {
+    L.control.polylineMeasure({
+    }).addTo(map);
+  }
+
  // Add Geo Search
  var provider = new LeafletGeoSearch.OpenStreetMapProvider()
  var searchControl = new LeafletGeoSearch.GeoSearchControl({
@ -231,7 +237,7 @@ function show (id, options, callback) {
 }

 window.showDetails = function (data, category) {
-  var div, h, dt, dd
+  var div, h, dt, dd, li, a
  var k
  var dom = document.getElementById('contentDetails')

@ -268,6 +274,22 @@ window.showDetails = function (data, category) {
    }
  )

+  h = document.createElement('h3')
+  h.innerHTML = lang('header:export')
+  dom.appendChild(h)
+
+  div = document.createElement('ul')
+  dom.appendChild(div)
+
+  li = document.createElement('li')
+  div.appendChild(li)
+
+  a = document.createElement('a')
+  a.download = data.id + '.json'
+  a.href = 'data:application/json;charset=UTF-8,' + encodeURIComponent(JSON.stringify(data.object.GeoJSON(), null, '    '))
+  a.innerHTML = lang('download:geojson')
+  li.appendChild(a)
+
  h = document.createElement('h3')
  h.innerHTML = lang('header:attributes')
  dom.appendChild(h)
--- a/src/language.php
+++ b/src/language.php
@ -4,3 +4,31 @@ register_hook('options_save', function ($options) {
    $_SESSION['ui_lang'] = $options['ui_lang'];
  }
 });
+
+register_hook('lang_report_non_translated', function ($strings, $ui_lang) {
+  if (!is_writeable('data')) {
+    return;
+  }
+
+  $db = new PDO('sqlite:data/lang.db');
+
+  $res = $db->query('select 1 from lang_non_translated');
+  if (!$res) {
+    $query = <<<EOT
+create table lang_non_translated (
+  str           varchar(255)    not null,
+  lang          varchar(32)     not null,
+  count         integer         not null default 0,
+  primary key(str, lang)
+);
+EOT;
+    $db->query($query);
+  }
+
+  foreach ($strings as $k => $count) {
+    if ($count > 0) {
+      $query = 'insert or replace into lang_non_translated values (' . $db->quote($k) . ', ' . $db->quote($ui_lang) . ', coalesce((select count + ' . $db->quote($count) . ' from lang_non_translated where str=' . $db->quote($k) . ' and lang=' . $db->quote($ui_lang) . '), ' . $db->quote($count) . '))';
+      $db->query($query);
+    }
+  }
+});
--- a/src/tagTranslations.js
+++ b/src/tagTranslations.js
@ -20,6 +20,13 @@ OverpassLayer.twig.extendFunction('localizedTag', function (tags, id) {
 OverpassLayer.twig.extendFunction('trans', function () {
  return lang.apply(this, arguments)
 })
+OverpassLayer.twig.extendFunction('isTranslated', function (str) {
+  return tagTranslationsIsTranslated(str)
+})
+
+function tagTranslationsIsTranslated (str) {
+  return !(str in lang_non_translated) && (str in lang_str)
+}

 function tagTranslationsTrans () {
  var tag = arguments[0]
@ -59,6 +66,7 @@ function tagTranslationsTransList (key, values) {

 module.exports = {
  trans: tagTranslationsTrans,
+  isTranslated: tagTranslationsIsTranslated,
  setTagLanguage: function (lang) {
    tagLang = lang
  }
--- a/src/wikipedia.js
+++ b/src/wikipedia.js
@ -168,7 +168,7 @@ register_hook('show-details', function (data, category, dom, callback) {
    found++
    foundPrefixes.push('')

-    wikidata.load(ob.tags[k], function (err, result) {
+    wikidata.load(ob.tags.wikidata, function (err, result) {
      var x

      if (err) {