midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Apply refactoring

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-20 15:38:45 +02:00
parent fb4b4e5702
commit 6d77ca23b2
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
UI/DashboardGui.ts
View file

@ -125,7 +125,7 @@ export default class DashboardGui {
if (!bbox.overlapsWith(BBox.get(element))) { if (!bbox.overlapsWith(BBox.get(element))) {
continue continue
} }
if (layer?.isShown?.GetRenderValue(element)?.Subs(element.properties)?.txt === "no") { if (layer?.isShown !== undefined && !layer.isShown.matchesProperties(element)) {
continue continue
} }
const activeFilters: FilterState[] = Array.from(filtered.appliedFilters.data.values()); const activeFilters: FilterState[] = Array.from(filtered.appliedFilters.data.values());
@ -255,11 +255,11 @@ export default class DashboardGui {
els.push(new Title(layer.name)) els.push(new Title(layer.name))
const layerStats = [] const layerStats = []
for (const tagRendering of layer.tagRenderings) { for (const tagRendering of (layer?.tagRenderings ?? [])) {
const chart = new TagRenderingChart(featuresForLayer, tagRendering, { const chart = new TagRenderingChart(featuresForLayer, tagRendering, {
chartclasses: "w-full", chartclasses: "w-full",
chartstyle: "height: 60rem", chartstyle: "height: 60rem",
includeTitle: true includeTitle: false
}) })
const full = new Lazy(() => const full = new Lazy(() =>
new TagRenderingChart(featuresForLayer, tagRendering, { new TagRenderingChart(featuresForLayer, tagRendering, {
@ -267,7 +267,8 @@ export default class DashboardGui {
groupToOtherCutoff: 0 groupToOtherCutoff: 0
}) })
) )
chart.onClick(() => { const title = new Title(tagRendering.question?.Clone() ?? tagRendering.id)
title.onClick(() => {
const current = self.currentView.data const current = self.currentView.data
full.onClick(() => { full.onClick(() => {
self.currentView.setData(current) self.currentView.setData(current)
@ -279,7 +280,9 @@ export default class DashboardGui {
}) })
} }
) )
layerStats.push(chart.SetClass("w-full lg:w-1/3")) if(!chart.HasClass("hidden")){
layerStats.push(new Combine([title, chart]).SetClass("flex flex-col w-full lg:w-1/3"))
}
} }
els.push(new Combine(layerStats).SetClass("flex flex-wrap")) els.push(new Combine(layerStats).SetClass("flex flex-wrap"))
} }