Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop

This commit is contained in:
pietervdvn 2021-09-08 17:33:04 +02:00
commit 38dea806c5
20 changed files with 8115 additions and 8 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

View file

@ -506,13 +506,6 @@ function stackHists<K, V>(hists: [V, Histogram<K>][]): [V, Histogram<K>][] {
function createGraphs(allFeatures: ChangeSetData[], appliedFilterDescription: string) { function createGraphs(allFeatures: ChangeSetData[], appliedFilterDescription: string) {
const hist = new Histogram<string>(allFeatures.map(f => f.properties.metadata.theme)) const hist = new Histogram<string>(allFeatures.map(f => f.properties.metadata.theme))
hist
.addCountToName()
.createOthersCategory("other", 40)
.asPie({
name: "Changesets per theme" + appliedFilterDescription
}).render()
hist hist
.createOthersCategory("other", 20) .createOthersCategory("other", 20)
.addCountToName() .addCountToName()
@ -532,7 +525,13 @@ function createGraphs(allFeatures: ChangeSetData[], appliedFilterDescription: st
.asPie({ .asPie({
name: "Changesets per host" + appliedFilterDescription name: "Changesets per host" + appliedFilterDescription
}).render() }).render()
new Histogram<string>(allFeatures.map(f => f.properties.metadata.theme))
.createOthersCategory("< 25 changesets", 25)
.addCountToName()
.asPie({
name: "Changesets per theme (pie)" + appliedFilterDescription
}).render()
Group.createStackedBarChartPerDay( Group.createStackedBarChartPerDay(
"Changesets per theme" + appliedFilterDescription, "Changesets per theme" + appliedFilterDescription,

View file

@ -50816,6 +50816,916 @@
] ]
} }
}, },
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-58.7597403,
-34.6588894
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-73.2506443,
-39.8106972
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.64607215,
51.1142841
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.5104322,
43.8947941
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.2243449,
51.2102969
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.70479125,
51.04415735
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.3430155,
50.865627599999996
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.70473285,
51.046819
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7041942,
51.04957605
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7004068,
51.050445350000004
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.696893150000001,
51.05259205
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.42825925,
50.926792750000004
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7411394500000004,
51.038006249999995
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-71.3707589,
-34.6402759
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.4443896,
51.1126056
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.69580345,
51.0544985
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
11.32306545,
44.8543254
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
2.2274185500000003,
41.439082049999996
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.572461499999999,
53.0218033
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7412927,
51.0361053
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.2120516,
51.191464
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.73638155,
51.036820250000005
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.2927924,
50.8617505
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.2081858,
51.1869804
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.5685417,
53.010605
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.5721604,
53.0264806
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.5571519,
53.0002444
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.7796401,
51.2028367
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7264895,
51.02642025
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.57686335,
51.0315187
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-1.5346039,
52.29394635
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.72945485,
51.03407025
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
12.5188726,
52.1400304
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7613027,
51.0490919
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7846677,
51.0498743
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.80907285,
51.052902200000005
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7007618,
51.0268819
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7948526,
51.06367425
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-73.56078350000001,
45.47967425
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.56660235,
53.01175765
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.560969500000001,
53.0193444
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.90264495,
51.096994300000006
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.701775699999999,
51.04657295
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.70305715,
51.0450472
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.70720805,
51.042709
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.713532050000001,
51.03857605
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.719508000000001,
51.0342785
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7194516,
51.0330962
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
11.2545995,
43.7735024
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.720374450000001,
51.0308423
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.4033423,
51.21519065
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-58.68874925,
-34.6555771
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.7255606,
51.02716415
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.71291975,
51.038539
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.707423949999999,
51.041862699999996
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
11.016779249999999,
49.44191805
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
10.95762445,
49.44181465
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
10.9615713,
49.4172352
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.6840133,
51.058046649999994
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.68242145,
51.053932450000005
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.685504,
51.05625085
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7245505,
51.0572368
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.70643085,
51.05848425
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7457967,
51.0333371
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.74598115,
51.03209115
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.74534815,
51.03399159999999
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7460294000000003,
51.03570985
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7377907,
51.0501288
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
12.8507381,
52.1688877
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7447902500000003,
51.0381812
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.3803906,
50.8044363
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.3807313,
50.8044092
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.8683133,
51.14763175
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
6.0870298,
47.2684337
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.867534299999999,
51.1477238
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
37.9934373,
48.629113
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-4.8171257,
41.5804011
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
5.5551392,
50.7873265
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-4.5170975,
41.6336276
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
5.5583292,
50.7859898
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.97977185,
50.82081355
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.883519,
51.0706245
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
-70.6036698,
-33.42347555
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.9975276,
51.1568565
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.872297150000001,
51.1480966
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
5.0020165,
51.1579367
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.8668005,
51.147540899999996
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.8645727,
51.1466209
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
4.986849250000001,
51.1640455
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
13.86232935,
51.1453744
]
}
},
{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [
3.7321484,
51.0568936
]
}
},
{ {
"type": "Feature", "type": "Feature",
"geometry": { "geometry": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 KiB

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 KiB

After

Width:  |  Height:  |  Size: 507 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 KiB

After

Width:  |  Height:  |  Size: 531 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 623 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 KiB

After

Width:  |  Height:  |  Size: 394 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 KiB

After

Width:  |  Height:  |  Size: 449 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 KiB

After

Width:  |  Height:  |  Size: 370 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 KiB

After

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 133 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

File diff suppressed because it is too large Load diff