Improvements to statistics
This commit is contained in:
parent
abdbf4b9e8
commit
ee7d05cbad
4 changed files with 88 additions and 7 deletions
|
@ -22,6 +22,7 @@ export class StackedRenderingChart extends ChartJs {
|
||||||
groupToOtherCutoff: options?.groupToOtherCutoff
|
groupToOtherCutoff: options?.groupToOtherCutoff
|
||||||
})
|
})
|
||||||
if (labels === undefined || data === undefined) {
|
if (labels === undefined || data === undefined) {
|
||||||
|
console.error("Could not extract data and labels for ", tr, " with features", features)
|
||||||
throw ("No labels or data given...")
|
throw ("No labels or data given...")
|
||||||
}
|
}
|
||||||
// labels: ["cyclofix", "buurtnatuur", ...]; data : [ ["cyclofix-changeset", "cyclofix-changeset", ...], ["buurtnatuur-cs", "buurtnatuur-cs"], ... ]
|
// labels: ["cyclofix", "buurtnatuur", ...]; data : [ ["cyclofix-changeset", "cyclofix-changeset", ...], ["buurtnatuur-cs", "buurtnatuur-cs"], ... ]
|
||||||
|
@ -38,8 +39,7 @@ export class StackedRenderingChart extends ChartJs {
|
||||||
|
|
||||||
const datasets: { label: string /*themename*/, data: number[]/*counts per day*/, backgroundColor: string }[] = []
|
const datasets: { label: string /*themename*/, data: number[]/*counts per day*/, backgroundColor: string }[] = []
|
||||||
const allDays = StackedRenderingChart.getAllDays(features)
|
const allDays = StackedRenderingChart.getAllDays(features)
|
||||||
let trimmedDays = allDays.map(d => d.substr(0, d.indexOf("T")))
|
let trimmedDays = allDays.map(d => d.substr(0, 10))
|
||||||
|
|
||||||
if (options?.period === "month") {
|
if (options?.period === "month") {
|
||||||
trimmedDays = trimmedDays.map(d => d.substr(0, 7))
|
trimmedDays = trimmedDays.map(d => d.substr(0, 7))
|
||||||
}
|
}
|
||||||
|
@ -54,9 +54,9 @@ export class StackedRenderingChart extends ChartJs {
|
||||||
const csDate = new Date(changeset.properties.date)
|
const csDate = new Date(changeset.properties.date)
|
||||||
Utils.SetMidnight(csDate)
|
Utils.SetMidnight(csDate)
|
||||||
let str = csDate.toISOString();
|
let str = csDate.toISOString();
|
||||||
|
str = str.substr(0, 10)
|
||||||
if (options?.period === "month") {
|
if (options?.period === "month") {
|
||||||
csDate.setUTCDate(1)
|
str = str.substr(0, 7);
|
||||||
str = csDate.toISOString().substr(0, 7);
|
|
||||||
}
|
}
|
||||||
if (perDay[str] === undefined) {
|
if (perDay[str] === undefined) {
|
||||||
perDay[str] = [changeset]
|
perDay[str] = [changeset]
|
||||||
|
|
|
@ -12,6 +12,7 @@ import {AllKnownLayouts} from "../Customizations/AllKnownLayouts";
|
||||||
import MapState from "../Logic/State/MapState";
|
import MapState from "../Logic/State/MapState";
|
||||||
import BaseUIElement from "./BaseUIElement";
|
import BaseUIElement from "./BaseUIElement";
|
||||||
import Title from "./Base/Title";
|
import Title from "./Base/Title";
|
||||||
|
import {FixedUiElement} from "./Base/FixedUiElement";
|
||||||
|
|
||||||
class StatisticsForOverviewFile extends Combine{
|
class StatisticsForOverviewFile extends Combine{
|
||||||
constructor(homeUrl: string, paths: string[]) {
|
constructor(homeUrl: string, paths: string[]) {
|
||||||
|
@ -55,10 +56,17 @@ class StatisticsForOverviewFile extends Combine{
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (downloaded.length === 0) {
|
if (overview._meta.length === 0) {
|
||||||
return "No data matched the filter"
|
return "No data matched the filter"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const dateStrings = Utils.NoNull(overview._meta.map(cs => cs.properties.date))
|
||||||
|
const dates : number[] = dateStrings.map(d => new Date(d).getTime())
|
||||||
|
const mindate= Math.min(...dates)
|
||||||
|
const maxdate = Math.max(...dates)
|
||||||
|
|
||||||
|
const diffInDays = (maxdate - mindate) / (1000 * 60 * 60 * 24);
|
||||||
|
console.log("Diff in days is ", diffInDays, "got", overview._meta.length)
|
||||||
const trs =layer.tagRenderings
|
const trs =layer.tagRenderings
|
||||||
.filter(tr => tr.mappings?.length > 0 || tr.freeform?.key !== undefined);
|
.filter(tr => tr.mappings?.length > 0 || tr.freeform?.key !== undefined);
|
||||||
const elements : BaseUIElement[] = []
|
const elements : BaseUIElement[] = []
|
||||||
|
@ -68,16 +76,21 @@ class StatisticsForOverviewFile extends Combine{
|
||||||
total = new Set( overview._meta.map(f => f.properties[tr.freeform.key])).size
|
total = new Set( overview._meta.map(f => f.properties[tr.freeform.key])).size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try{
|
||||||
|
|
||||||
elements.push(new Combine([
|
elements.push(new Combine([
|
||||||
new Title(tr.question ?? tr.id).SetClass("p-2") ,
|
new Title(tr.question ?? tr.id).SetClass("p-2") ,
|
||||||
total > 1 ? total + " unique value" : undefined,
|
total > 1 ? total + " unique value" : undefined,
|
||||||
new StackedRenderingChart(tr, <any>overview._meta, {
|
new StackedRenderingChart(tr, <any>overview._meta, {
|
||||||
period: "month",
|
period: diffInDays <= 367 ? "day" : "month",
|
||||||
groupToOtherCutoff: total > 50 ? 25 : (total > 10 ? 3 : 0)
|
groupToOtherCutoff: total > 50 ? 25 : (total > 10 ? 3 : 0)
|
||||||
|
|
||||||
}).SetStyle("width: 100%; height: 600px")
|
}).SetStyle("width: 100%; height: 600px")
|
||||||
]).SetClass("block border-2 border-subtle p-2 m-2 rounded-xl" ))
|
]).SetClass("block border-2 border-subtle p-2 m-2 rounded-xl" ))
|
||||||
|
}catch(e){
|
||||||
|
console.log("Could not generate a chart", e)
|
||||||
|
elements.push(new FixedUiElement("No relevant information for "+tr.question.txt))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Combine(elements)
|
return new Combine(elements)
|
||||||
|
|
|
@ -444,6 +444,40 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "made_before",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"osmTags": "date<{search}",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "search",
|
||||||
|
"type": "date"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"question": {
|
||||||
|
"en": "Made before {search}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "made_after",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"osmTags": "date>{search}",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "search",
|
||||||
|
"type": "date"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"question": {
|
||||||
|
"en": "Made after {search}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "locale-filter",
|
"id": "locale-filter",
|
||||||
"options": [
|
"options": [
|
||||||
|
|
|
@ -166,6 +166,40 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "made_before",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"osmTags": "date<{search}",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "search",
|
||||||
|
"type": "date"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"question": {
|
||||||
|
"en": "Made before {search}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "made_after",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"osmTags": "date>{search}",
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "search",
|
||||||
|
"type": "date"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"question": {
|
||||||
|
"en": "Made after {search}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "locale-filter",
|
"id": "locale-filter",
|
||||||
"options": [
|
"options": [
|
||||||
|
|
Loading…
Reference in a new issue