Merge branch 'master' into layouts

lang/hu.json

@@ -86,5 +86,6 @@
     "heading:SW": "DNY",
     "heading:W": "NY",
     "heading:NW": "ÉNY",
-    "options:chooseEditor": "Szerkesztő kiválasztása"
+    "options:chooseEditor": "Szerkesztő kiválasztása",
+    "empty value": "üres érték"
 }

lang/ro.json

@@ -23,7 +23,7 @@
     "images": "Imagini",
     "invalid value": "",
     "loading": "Se încarcă ...",
-    "main:options": "Optiuni",
+    "main:options": "Opțiuni",
     "main:permalink": "",
     "more": "Mai mult",
     "more_categories": "Mai multe categorii",
@@ -32,14 +32,14 @@
     "open": "deschide",
     "options:data_lang": "Limba date",
     "options:data_lang:desc": "",
-    "options:data_lang:local": "Limba locala",
+    "options:data_lang:local": "Limba locală",
     "options:overpassUrl": "",
     "options:preferredBaseMap": "",
     "options:ui_lang": "Limba interfata",
     "other": "",
     "repo-use-as-base": "",
     "repositories": "",
-    "save": "Salveaza",
+    "save": "Salvează",
     "show details": "arată detalii",
     "toggle_fullscreen": "",
     "unknown": "necunoscut",
@@ -49,5 +49,18 @@
     "zoom_in_more": "",
     "cancel": "Renunță",
     "main:about": "Despre",
-    "form_element:please_select": "-- te rog selectează --"
+    "form_element:please_select": "-- te rog selectează --",
+    "formatUnits:system": "Sistem de unitate",
+    "formatUnits:speed": "Unitate de viteză",
+    "formatUnits:speed:km/h": "km/h",
+    "formatUnits:speed:m/s": "m/s",
+    "geoinfo:location": "Locația curentă",
+    "heading:N": "N",
+    "heading:NE": "NE",
+    "heading:E": "E",
+    "heading:SE": "SE",
+    "heading:S": "S",
+    "heading:SW": "SV",
+    "heading:W": "V",
+    "heading:NW": "NV"
 }

lang/tr.json

@@ -86,5 +86,6 @@
     "heading:SW": "GB",
     "heading:W": "B",
     "heading:NW": "KB",
-    "options:chooseEditor": "Editör Seçiniz"
+    "options:chooseEditor": "Editör Seçiniz",
+    "empty value": "boş değer"
 }

package.json

@@ -7,15 +7,15 @@
   "author": "Stephan Bösch-Plepelits <skunk@xover.mud.at>",
   "license": "GPL-3.0",
   "dependencies": {
-    "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.12.10",
+    "@babel/cli": "^7.13.16",
+    "@babel/core": "^7.14.0",
     "@babel/plugin-transform-runtime": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@fortawesome/fontawesome-free": "^5.15.1",
+    "@babel/preset-env": "^7.14.1",
+    "@fortawesome/fontawesome-free": "^5.15.3",
     "@ideditor/temaki": "^4.4.0",
     "@mapbox/maki": "^6.2.0",
-    "@turf/area": "^6.0.1",
-    "@turf/length": "^6.0.2",
+    "@turf/area": "^6.3.0",
+    "@turf/length": "^6.3.0",
     "async": "^3.2.0",
     "async-foreach": "^0.1.3",
     "babelify": "^10.0.0",
@@ -30,15 +30,15 @@
     "leaflet-geosearch": "^3.1.0",
     "leaflet-polylineoffset": "^1.1.1",
     "leaflet-textpath": "git+https://github.com/makinacorpus/Leaflet.TextPath.git#leaflet0.8-dev",
-    "leaflet.locatecontrol": "^0.72.0",
+    "leaflet.locatecontrol": "^0.72.2",
     "leaflet.polylinemeasure": "git+https://github.com/ppete2/Leaflet.PolylineMeasure.git",
     "md5": "^2.3.0",
     "measure-ts": "^3.3.2",
-    "mini-svg-data-uri": "^1.2.3",
+    "mini-svg-data-uri": "^1.3.3",
     "modulekit-tabs": "^0.2.2",
     "moment": "^2.29.1",
     "natsort": "^2.0.2",
-    "opening_hours": "^3.5.0",
+    "opening_hours": "^3.6.0",
     "openstreetbrowser-categories-main": "git+https://github.com/plepe/openstreetbrowser-categories-main.git",
     "openstreetmap-date-format": "^0.3.1",
     "openstreetmap-date-parser": "^0.1.2",

src/CategoryOverpass.js

@@ -53,7 +53,11 @@ var defaultValues = {
     preferredZoom: 16
   },
   layouts: {
-    list: listTemplate.replace(/template/g, 'list')
+    list: listTemplate.replace(/template/g, 'list'),
+    popup:
+      '<h1>{{ object.popupTitle|default(object.title) }}</h1>' +
+      '{% if object.popupDescription or object.description %}<div class="description">{{ object.popupDescription|default(object.description) }}</div>{% endif %}' +
+      '{% if object.popupBody or object.body %}<div class="body">{{ object.popupBody|default(object.body) }}</div>{% endif %}'
   },
   queryOptions: {
   }

src/wikipedia.js

@@ -33,7 +33,7 @@ function prepare (div) {
   }
 
   var p = content.firstChild.firstChild
-  while (p && (p.tagName !== 'P' || p.className !== '' || p.textContent.match(/^\s*$/))) {
+  while (p && (p.tagName !== 'P' || p.className !== '' || p.textContent.match(/^\s*$/) || p.querySelector('span#coordinates'))) {
     p = p.nextSibling
   }