From 5c44cf210420f04a147f3800570c40f1d2397bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 2 Jan 2021 18:30:14 +0100 Subject: [PATCH] ObjectDisplay: switch which block should be shown on which display --- src/ObjectDisplay.js | 94 +++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/src/ObjectDisplay.js b/src/ObjectDisplay.js index dafdbeae..528f3c91 100644 --- a/src/ObjectDisplay.js +++ b/src/ObjectDisplay.js @@ -61,58 +61,64 @@ module.exports = class ObjectDisplay { }) }) - displayBlock({ - dom, - content: exportAll(feature), - title: lang('header:export'), - order: 5 - }) + if (['details'].includes(this.displayId)) { + displayBlock({ + dom, + content: exportAll(feature), + title: lang('header:export'), + order: 5 + }) + } - displayBlock({ - dom, - content: tagsDisplay(feature.object.tags), - title: lang('header:attributes'), - order: 10 - }) + if (['details'].includes(this.displayId)) { + displayBlock({ + dom, + content: tagsDisplay(feature.object.tags), + title: lang('header:attributes'), + order: 10 + }) - div = document.createElement('dl') - div.className = 'meta' - dt = document.createElement('dt') - dt.appendChild(document.createTextNode('id')) - div.appendChild(dt) - dd = document.createElement('dd') - a = document.createElement('a') - a.appendChild(document.createTextNode(feature.object.type + '/' + feature.object.osm_id)) - a.href = config.urlOpenStreetMap + '/' + feature.object.type + '/' + feature.object.osm_id - a.target = '_blank' - - dd.appendChild(a) - div.appendChild(dd) - for (k in feature.object.meta) { + div = document.createElement('dl') + div.className = 'meta' dt = document.createElement('dt') - dt.appendChild(document.createTextNode(k)) + dt.appendChild(document.createTextNode('id')) div.appendChild(dt) - dd = document.createElement('dd') - dd.appendChild(document.createTextNode(feature.object.meta[k])) + a = document.createElement('a') + a.appendChild(document.createTextNode(feature.object.type + '/' + feature.object.osm_id)) + a.href = config.urlOpenStreetMap + '/' + feature.object.type + '/' + feature.object.osm_id + a.target = '_blank' + + dd.appendChild(a) div.appendChild(dd) - } + for (k in feature.object.meta) { + dt = document.createElement('dt') + dt.appendChild(document.createTextNode(k)) + div.appendChild(dt) + + dd = document.createElement('dd') + dd.appendChild(document.createTextNode(feature.object.meta[k])) + div.appendChild(dd) + } - displayBlock({ - dom, - content: div, - title: lang('header:osm_meta'), - order: 11 - }) + displayBlock({ + dom, + content: div, + title: lang('header:osm_meta'), + order: 11 + }) + } - let id_with_sublayer = (feature.sublayer_id === 'main' ? '' : feature.sublayer_id + ':') + feature.id - let footerContent = '
  • ' + lang('show details') + '
  • ' - footerContent += '
  • ' + editLink(feature) + '
  • ' - displayBlock({ - dom, - content: '', - order: 1000 - }) + if (['popup'].includes(this.displayId)) { + let id_with_sublayer = (feature.sublayer_id === 'main' ? '' : feature.sublayer_id + ':') + feature.id + let footerContent = '
  • ' + lang('show details') + '
  • ' + footerContent += '
  • ' + editLink(feature) + '
  • ' + displayBlock({ + dom, + content: '', + order: 1000 + }) + } call_hooks_callback('show-' + this.displayId, feature, category, dom, err => { if (err.length) {