diff --git a/Docs/Tools/Changesets per theme in 2020.png b/Docs/Tools/Changesets per theme in 2020.png index 94f7354ce6..376ac98ee4 100644 Binary files a/Docs/Tools/Changesets per theme in 2020.png and b/Docs/Tools/Changesets per theme in 2020.png differ diff --git a/Docs/Tools/Changesets per theme in 2021.png b/Docs/Tools/Changesets per theme in 2021.png index 88c5274a08..49b7096da5 100644 Binary files a/Docs/Tools/Changesets per theme in 2021.png and b/Docs/Tools/Changesets per theme in 2021.png differ diff --git a/Docs/Tools/Changesets per theme.png b/Docs/Tools/Changesets per theme.png index acfaad8557..e9a5dfe098 100644 Binary files a/Docs/Tools/Changesets per theme.png and b/Docs/Tools/Changesets per theme.png differ diff --git a/Docs/Tools/Changesets per version number in 2020.png b/Docs/Tools/Changesets per version number in 2020.png index dc52aac884..8c7f21196d 100644 Binary files a/Docs/Tools/Changesets per version number in 2020.png and b/Docs/Tools/Changesets per version number in 2020.png differ diff --git a/Docs/Tools/Changesets per version number in 2021.png b/Docs/Tools/Changesets per version number in 2021.png index dab06e5d5e..4921f2d011 100644 Binary files a/Docs/Tools/Changesets per version number in 2021.png and b/Docs/Tools/Changesets per version number in 2021.png differ diff --git a/Docs/Tools/Contributors in 2020.png b/Docs/Tools/Contributors in 2020.png index 519adee14b..699c3a39f4 100644 Binary files a/Docs/Tools/Contributors in 2020.png and b/Docs/Tools/Contributors in 2020.png differ diff --git a/Docs/Tools/Contributors in 2021.png b/Docs/Tools/Contributors in 2021.png index 58144082c4..6a01d284e8 100644 Binary files a/Docs/Tools/Contributors in 2021.png and b/Docs/Tools/Contributors in 2021.png differ diff --git a/Docs/Tools/Contributors.png b/Docs/Tools/Contributors.png index 1cd8b7c2ca..b576a7f3d3 100644 Binary files a/Docs/Tools/Contributors.png and b/Docs/Tools/Contributors.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor in 2020.png b/Docs/Tools/Cumulative changesets per contributor in 2020.png index e7492e111e..23c3b23da4 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor in 2020.png and b/Docs/Tools/Cumulative changesets per contributor in 2020.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor in 2021.png b/Docs/Tools/Cumulative changesets per contributor in 2021.png index cd0705dacd..5b4891466c 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor in 2021.png and b/Docs/Tools/Cumulative changesets per contributor in 2021.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor.png b/Docs/Tools/Cumulative changesets per contributor.png index ab13736392..b8e7324ae9 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor.png and b/Docs/Tools/Cumulative changesets per contributor.png differ diff --git a/Docs/Tools/Cumulative changesets per host in 2020.png b/Docs/Tools/Cumulative changesets per host in 2020.png index 901e64413e..5ae1b681c5 100644 Binary files a/Docs/Tools/Cumulative changesets per host in 2020.png and b/Docs/Tools/Cumulative changesets per host in 2020.png differ diff --git a/Docs/Tools/Cumulative changesets per host in 2021.png b/Docs/Tools/Cumulative changesets per host in 2021.png index 3309f42392..dd6e0bd4f8 100644 Binary files a/Docs/Tools/Cumulative changesets per host in 2021.png and b/Docs/Tools/Cumulative changesets per host in 2021.png differ diff --git a/Docs/Tools/Cumulative changesets per host.png b/Docs/Tools/Cumulative changesets per host.png index c3cfca80e3..4f3bfe1cab 100644 Binary files a/Docs/Tools/Cumulative changesets per host.png and b/Docs/Tools/Cumulative changesets per host.png differ diff --git a/Docs/Tools/Cumulative changesets per language in 2020.png b/Docs/Tools/Cumulative changesets per language in 2020.png index a6f9d1e15e..6f5b50ca05 100644 Binary files a/Docs/Tools/Cumulative changesets per language in 2020.png and b/Docs/Tools/Cumulative changesets per language in 2020.png differ diff --git a/Docs/Tools/Cumulative changesets per language in 2021.png b/Docs/Tools/Cumulative changesets per language in 2021.png index 279e512842..3fcd2f35c3 100644 Binary files a/Docs/Tools/Cumulative changesets per language in 2021.png and b/Docs/Tools/Cumulative changesets per language in 2021.png differ diff --git a/Docs/Tools/Cumulative changesets per language.png b/Docs/Tools/Cumulative changesets per language.png index 82f5f8b61c..1192301704 100644 Binary files a/Docs/Tools/Cumulative changesets per language.png and b/Docs/Tools/Cumulative changesets per language.png differ diff --git a/Docs/Tools/Cumulative changesets per theme in 2020.png b/Docs/Tools/Cumulative changesets per theme in 2020.png index 011094e011..808d95b1f4 100644 Binary files a/Docs/Tools/Cumulative changesets per theme in 2020.png and b/Docs/Tools/Cumulative changesets per theme in 2020.png differ diff --git a/Docs/Tools/Cumulative changesets per theme in 2021.png b/Docs/Tools/Cumulative changesets per theme in 2021.png index a5835c95c5..14265aa519 100644 Binary files a/Docs/Tools/Cumulative changesets per theme in 2021.png and b/Docs/Tools/Cumulative changesets per theme in 2021.png differ diff --git a/Docs/Tools/Cumulative changesets per theme.png b/Docs/Tools/Cumulative changesets per theme.png index 679d85b073..960758d662 100644 Binary files a/Docs/Tools/Cumulative changesets per theme.png and b/Docs/Tools/Cumulative changesets per theme.png differ diff --git a/Docs/Tools/Cumulative changesets per version number in 2020.png b/Docs/Tools/Cumulative changesets per version number in 2020.png index e053e67cb1..427034822b 100644 Binary files a/Docs/Tools/Cumulative changesets per version number in 2020.png and b/Docs/Tools/Cumulative changesets per version number in 2020.png differ diff --git a/Docs/Tools/Cumulative changesets per version number in 2021.png b/Docs/Tools/Cumulative changesets per version number in 2021.png index 8df25e141f..28d77181e6 100644 Binary files a/Docs/Tools/Cumulative changesets per version number in 2021.png and b/Docs/Tools/Cumulative changesets per version number in 2021.png differ diff --git a/Docs/Tools/Cumulative changesets per version number.png b/Docs/Tools/Cumulative changesets per version number.png index bb78f81c95..a963dcbabc 100644 Binary files a/Docs/Tools/Cumulative changesets per version number.png and b/Docs/Tools/Cumulative changesets per version number.png differ diff --git a/Docs/Tools/CumulativeContributors in 2020.png b/Docs/Tools/CumulativeContributors in 2020.png index 8d8a10d2bc..84d3157bf3 100644 Binary files a/Docs/Tools/CumulativeContributors in 2020.png and b/Docs/Tools/CumulativeContributors in 2020.png differ diff --git a/Docs/Tools/CumulativeContributors in 2021.png b/Docs/Tools/CumulativeContributors in 2021.png index 28f01f616a..dd99faebef 100644 Binary files a/Docs/Tools/CumulativeContributors in 2021.png and b/Docs/Tools/CumulativeContributors in 2021.png differ diff --git a/Docs/Tools/CumulativeContributors.png b/Docs/Tools/CumulativeContributors.png index 7a4026efdc..c7c9384494 100644 Binary files a/Docs/Tools/CumulativeContributors.png and b/Docs/Tools/CumulativeContributors.png differ diff --git a/Docs/Tools/Theme distribution in 2020.png b/Docs/Tools/Theme distribution in 2020.png index aa46fadd93..dc9f548ed8 100644 Binary files a/Docs/Tools/Theme distribution in 2020.png and b/Docs/Tools/Theme distribution in 2020.png differ diff --git a/Docs/Tools/Theme distribution in 2021.png b/Docs/Tools/Theme distribution in 2021.png index 36c2fef1bf..aec16b7fce 100644 Binary files a/Docs/Tools/Theme distribution in 2021.png and b/Docs/Tools/Theme distribution in 2021.png differ diff --git a/Docs/Tools/Theme distribution.png b/Docs/Tools/Theme distribution.png index 02b58f0172..0726df8447 100644 Binary files a/Docs/Tools/Theme distribution.png and b/Docs/Tools/Theme distribution.png differ diff --git a/Docs/Tools/csvGrapher.py b/Docs/Tools/csvGrapher.py index d852ad4369..7a25f8c1e4 100644 --- a/Docs/Tools/csvGrapher.py +++ b/Docs/Tools/csvGrapher.py @@ -167,7 +167,7 @@ def create_theme_breakdown(stats, fileExtra="", cutoff=5): return themes -def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5, cumulative=True): +def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5, cumulative=True, sort=True): print("Creating graph about " + subject + filenameextra) themes = Hist("date") dates_per_theme = Hist("theme") @@ -179,7 +179,10 @@ def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5, dates_per_theme.add(th, row[0]) per_theme_count = list(zip(dates_per_theme.keys(), dates_per_theme.map(len))) # PerThemeCount gives the most popular theme first - per_theme_count.sort(key=lambda kv: kv[1], reverse=False) + if sort == True: + per_theme_count.sort(key=lambda kv: kv[1], reverse=False) + elif sort is not None: + per_theme_count.sort(key=sort) values_to_show = [] # (theme name, value to fill between - this is stacked, with the first layer to print last) running_totals = None other_total = 0 @@ -228,7 +231,6 @@ def cumulative_changes_per(contents, index, subject, filenameextra="", cutoff=5, if cumulative: pyplot.fill_between(keys, kv[1], label=msg) else: - print("Keys:"+str(keys)+" "+str(kv[1])) pyplot.plot(keys, kv[1], label=msg) if cumulative: @@ -253,7 +255,7 @@ def create_graphs(contents): cumulative_changes_per(contents, 3, "theme", cutoff=10, cumulative=False) cumulative_changes_per(contents, 1, "contributor", cutoff=15) cumulative_changes_per(contents, 2, "language", cutoff=1) - cumulative_changes_per(contents, 4, "version number", cutoff=1) + cumulative_changes_per(contents, 4, "version number", cutoff=1, sort=lambda kv : kv[0]) cumulative_changes_per(contents, 8, "host", cutoff=1) currentYear = datetime.now().year @@ -266,7 +268,8 @@ def create_graphs(contents): cumulative_changes_per(contents_filtered, 3, "theme", extratext, cutoff=5, cumulative=False) cumulative_changes_per(contents_filtered, 1, "contributor", extratext, cutoff=10) cumulative_changes_per(contents_filtered, 2, "language", extratext, cutoff=1) - cumulative_changes_per(contents_filtered, 4, "version number", extratext, cutoff=1, cumulative=False) + cumulative_changes_per(contents_filtered, 4, "version number", extratext, cutoff=1, cumulative=False, sort=lambda kv : kv[0]) + cumulative_changes_per(contents_filtered, 4, "version number", extratext, cutoff=1, sort=lambda kv : kv[0]) cumulative_changes_per(contents_filtered, 8, "host", extratext, cutoff=1) diff --git a/Docs/Tools/stats.csv b/Docs/Tools/stats.csv index 56c0ee71eb..64fff9c496 100644 --- a/Docs/Tools/stats.csv +++ b/Docs/Tools/stats.csv @@ -2869,3 +2869,12 @@ "2021-03-12", "velosophe", "en", "bookcases", "MapComplete 0.5.9", 1, 4, "Adding data with #MapComplete for theme #bookcases", "mapcomplete.osm.be" "2021-03-12", "velosophe", "en", "shops", "MapComplete 0.5.9", 0, 1, "Adding data with #MapComplete for theme #shops", "mapcomplete.osm.be" "2021-03-13", "joost schouppe", "nl", "cyclofix", "MapComplete 0.5.9", 0, 2, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-03-13", "Pieter Vander Vennet", "en", "cyclofix", "MapComplete 0.5.9", 0, 1, "Adding data with #MapComplete for theme #cyclofix", "127.0.0.1:1234" +"2021-03-14", "joost schouppe", "en", "cyclofix", "MapComplete 0.5.9", 0, 1, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-03-14", "Koen Rijnsent", "en", "artworks", "MapComplete 0.5.9", 2, 4, "Adding data with #MapComplete for theme #artworks", "mapcomplete.osm.be" +"2021-03-14", "Pieter Vander Vennet", "nl", "speelplekken", "MapComplete 0.5.10", 0, 1, "Adding data with #MapComplete for theme #speelplekken", "127.0.0.1:1234" +"2021-03-14", "Pieter Vander Vennet", "nl", "speelplekken", "MapComplete 0.5.10", 0, 1, "Adding data with #MapComplete for theme #speelplekken", "pietervdvn.github.io" +"2021-03-14", "whturner", "en", "benches", "MapComplete 0.5.9", 4, 8, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" +"2021-03-14", "WinstonSmith", "en", "drinking_water", "MapComplete 0.5.9", 0, 1, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" +"2021-03-15", "Pieter Nuytinck", "en", "bookcases", "MapComplete 0.5.10", 2, 4, "Adding data with #MapComplete for theme #bookcases", "pietervdvn.github.io" +"2021-03-15", "Technopolice_newBiE", "en", "surveillance", "MapComplete 0.5.5-unlocked", 68, 36, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io"