diff --git a/Docs/Tools/Changesets per theme in 2021.png b/Docs/Tools/Changesets per theme in 2021.png index d9cc02041e..868f20cbcd 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 2bf6c7a54c..ca51e78383 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 2021.png b/Docs/Tools/Changesets per version number in 2021.png index b48243fb43..5b9d795774 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 2021.png b/Docs/Tools/Contributors in 2021.png index 396f043527..7c60b29b99 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 d6a8efcae3..f96f17a533 100644 Binary files a/Docs/Tools/Contributors.png and b/Docs/Tools/Contributors.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme aed.png b/Docs/Tools/Cumulative changesets per contributor for theme aed.png index 88c62a17de..97735cb0f0 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme aed.png and b/Docs/Tools/Cumulative changesets per contributor for theme aed.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme benches.png b/Docs/Tools/Cumulative changesets per contributor for theme benches.png index 7e91363217..d1e351550d 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme benches.png and b/Docs/Tools/Cumulative changesets per contributor for theme benches.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme bookcases.png b/Docs/Tools/Cumulative changesets per contributor for theme bookcases.png index 264ec153b0..aa4045f3cb 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme bookcases.png and b/Docs/Tools/Cumulative changesets per contributor for theme bookcases.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme cyclofix.png b/Docs/Tools/Cumulative changesets per contributor for theme cyclofix.png index feb1c44d34..fa02aac815 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme cyclofix.png and b/Docs/Tools/Cumulative changesets per contributor for theme cyclofix.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme drinking_water.png b/Docs/Tools/Cumulative changesets per contributor for theme drinking_water.png index 81e263eb84..e465cfd7cb 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme drinking_water.png and b/Docs/Tools/Cumulative changesets per contributor for theme drinking_water.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme fietsstraten.png b/Docs/Tools/Cumulative changesets per contributor for theme fietsstraten.png index 99093fc471..cff118444c 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme fietsstraten.png and b/Docs/Tools/Cumulative changesets per contributor for theme fietsstraten.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme personal.png b/Docs/Tools/Cumulative changesets per contributor for theme personal.png index 8f2d376252..6e985e5ad5 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme personal.png and b/Docs/Tools/Cumulative changesets per contributor for theme personal.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme surveillance.png b/Docs/Tools/Cumulative changesets per contributor for theme surveillance.png index 6b54edf6b7..b4513e20f2 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme surveillance.png and b/Docs/Tools/Cumulative changesets per contributor for theme surveillance.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme trees.png b/Docs/Tools/Cumulative changesets per contributor for theme trees.png index c9f96baf1d..650e619987 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme trees.png and b/Docs/Tools/Cumulative changesets per contributor for theme trees.png differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme wandelknooppunten.png b/Docs/Tools/Cumulative changesets per contributor for theme wandelknooppunten.png index 986d02a12d..826e174d01 100644 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme wandelknooppunten.png and b/Docs/Tools/Cumulative changesets per contributor for theme wandelknooppunten.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 c5c347305d..c584631a60 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 08c2f0a7b6..a514619eac 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 created element.png b/Docs/Tools/Cumulative changesets per created element.png index 13c6858602..bf986ac6ac 100644 Binary files a/Docs/Tools/Cumulative changesets per created element.png and b/Docs/Tools/Cumulative changesets per created element.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 faab500466..4f252e2ffd 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 008f904591..6a90c143ca 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 2021.png b/Docs/Tools/Cumulative changesets per language in 2021.png index 7d3b8ffb53..d68d0c1d18 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 3810575224..59fedf8265 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 2021.png b/Docs/Tools/Cumulative changesets per theme in 2021.png index cd42a2305e..485d6cd1b4 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 559b1e166b..b49f6a002b 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 2021.png b/Docs/Tools/Cumulative changesets per version number in 2021.png index 6d4d4ba5b4..db395de895 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 ffc97e0e19..b169767b76 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 2021.png b/Docs/Tools/CumulativeContributors in 2021.png index e7636f2f5a..08cd2f898f 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 fae1827795..f95f8ccd65 100644 Binary files a/Docs/Tools/CumulativeContributors.png and b/Docs/Tools/CumulativeContributors.png differ diff --git a/Docs/Tools/New and changed nodes per day .png b/Docs/Tools/New and changed nodes per day .png index 9d036a0004..cc3cd35df7 100644 Binary files a/Docs/Tools/New and changed nodes per day .png and b/Docs/Tools/New and changed nodes per day .png differ diff --git a/Docs/Tools/New and changed nodes per day for theme aed.png b/Docs/Tools/New and changed nodes per day for theme aed.png index 82720cb53d..c3988e199c 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme aed.png and b/Docs/Tools/New and changed nodes per day for theme aed.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme benches.png b/Docs/Tools/New and changed nodes per day for theme benches.png index ccd209ab14..705d50fb4c 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme benches.png and b/Docs/Tools/New and changed nodes per day for theme benches.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme bookcases.png b/Docs/Tools/New and changed nodes per day for theme bookcases.png index 06d7b1f956..3c23aa0adc 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme bookcases.png and b/Docs/Tools/New and changed nodes per day for theme bookcases.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme cyclofix.png b/Docs/Tools/New and changed nodes per day for theme cyclofix.png index cc1c8d2fb4..30ea9e2838 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme cyclofix.png and b/Docs/Tools/New and changed nodes per day for theme cyclofix.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme fietsstraten.png b/Docs/Tools/New and changed nodes per day for theme fietsstraten.png index 87ef9befec..b81b68c851 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme fietsstraten.png and b/Docs/Tools/New and changed nodes per day for theme fietsstraten.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme grb.png b/Docs/Tools/New and changed nodes per day for theme grb.png index f169a4eff4..b7a7934af8 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme grb.png and b/Docs/Tools/New and changed nodes per day for theme grb.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme personal.png b/Docs/Tools/New and changed nodes per day for theme personal.png index 42c38425cf..983844f8ce 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme personal.png and b/Docs/Tools/New and changed nodes per day for theme personal.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme surveillance.png b/Docs/Tools/New and changed nodes per day for theme surveillance.png index b3214180ae..984d65031d 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme surveillance.png and b/Docs/Tools/New and changed nodes per day for theme surveillance.png differ diff --git a/Docs/Tools/New and changed nodes per day for theme trees.png b/Docs/Tools/New and changed nodes per day for theme trees.png index 1a410a57ac..877e96ec32 100644 Binary files a/Docs/Tools/New and changed nodes per day for theme trees.png and b/Docs/Tools/New and changed nodes per day for theme trees.png differ diff --git a/Docs/Tools/New and changed nodes per day for year 2021.png b/Docs/Tools/New and changed nodes per day for year 2021.png index 3f1d613cd7..69e618bb86 100644 Binary files a/Docs/Tools/New and changed nodes per day for year 2021.png and b/Docs/Tools/New and changed nodes per day for year 2021.png differ diff --git a/Docs/Tools/Theme distribution in 2021.png b/Docs/Tools/Theme distribution in 2021.png index 621d1676b0..3fb02ad843 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 d0ef1ef771..25e3e37215 100644 Binary files a/Docs/Tools/Theme distribution.png and b/Docs/Tools/Theme distribution.png differ diff --git a/Docs/Tools/stats.csv b/Docs/Tools/stats.csv index de9bfa9b2c..f1638d13c3 100644 --- a/Docs/Tools/stats.csv +++ b/Docs/Tools/stats.csv @@ -3303,7 +3303,7 @@ "2021-04-07", "ttt1234", "en", "surveillance", "MapComplete 0.6.6", 10, 31, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" "2021-04-07", "ttt1234", "nl", "fritures", "MapComplete 0.6.6", 1, 1, "Adding data with #MapComplete for theme #fritures", "pietervdvn.github.io" "2021-04-07", "Wim L", "en", "bookcases", "MapComplete 0.6.6b", 1, 1, "Adding data with #MapComplete for theme #bookcases", "mapcomplete.osm.be" -"2021-04-08", "boute002", "nl", "drinking_water", "MapComplete 0.6.6b", 1, 0, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" +"2021-04-08", "boute002", "nl", "drinking_water", "MapComplete 0.6.6b", 1, 1, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" "2021-04-08", "bvrslypp", "en", "surveillance", "MapComplete 0.6.6", 1, 1, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" "2021-04-08", "bvrslypp", "en", "surveillance", "MapComplete 0.6.6", 2, 3, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" "2021-04-08", "dkf2010", "en", "benches", "MapComplete 0.6.6b", 0, 2, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" @@ -3317,3 +3317,28 @@ "2021-04-08", "sjokomoeske", "en", "benches", "MapComplete 0.6.6b", 3, 4, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" "2021-04-08", "sjokomoeske", "en", "playgrounds", "MapComplete 0.6.6b", 1, 2, "Adding data with #MapComplete for theme #playgrounds", "mapcomplete.osm.be" "2021-04-08", "ttt1234", "en", "surveillance", "MapComplete 0.6.6", 3, 6, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" +"2021-04-09", "boute002", "en", "benches", "MapComplete 0.6.6c", 3, 10, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" +"2021-04-09", "boute002", "nl", "aed", "MapComplete 0.6.6c", 2, 2, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-04-09", "boute002", "nl", "drinking_water", "MapComplete 0.6.6c", 1, 1, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" +"2021-04-09", "boute002", "nl", "trees", "MapComplete 0.6.6c", 3, 3, "Adding data with #MapComplete for theme #trees", "mapcomplete.osm.be" +"2021-04-09", "cserpell", "en", "trees", "MapComplete 0.6.6c", 0, 2, "Adding data with #MapComplete for theme #trees", "mapcomplete.osm.be" +"2021-04-09", "Erin76", "nl", "playgrounds", "MapComplete 0.6.6c", 2, 3, "Adding data with #MapComplete for theme #playgrounds", "mapcomplete.osm.be" +"2021-04-09", "fietsersbond aarschot", "nl", "fietsstraten", "MapComplete 0.6.6c", 0, 3, "Adding data with #MapComplete for theme #fietsstraten", "mapcomplete.osm.be" +"2021-04-09", "n1kn0k", "en", "cyclofix", "MapComplete 0.6.6c", 1, 6, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-04-09", "n1kn0k", "en", "cyclofix", "MapComplete 0.6.6c", 6, 17, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-04-09", "whturner", "en", "benches", "MapComplete 0.6.6c", 1, 2, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" +"2021-04-09", "WinstonSmith", "en", "cyclofix", "MapComplete 0.6.6c", 10, 14, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-04-09", "WinstonSmith", "en", "drinking_water", "MapComplete 0.6.6c", 1, 0, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" +"2021-04-10", "fietsersbond aarschot", "nl", "fietsstraten", "MapComplete 0.6.6c", 0, 21, "Adding data with #MapComplete for theme #fietsstraten", "mapcomplete.osm.be" +"2021-04-10", "fietsersbond aarschot", "nl", "fietsstraten", "MapComplete 0.6.6c", 0, 36, "Adding data with #MapComplete for theme #fietsstraten", "mapcomplete.osm.be" +"2021-04-10", "rjvdboon", "nl", "wandelknooppunten", "MapComplete 0.6.6c", 3, 0, "Adding data with #MapComplete for theme #wandelknooppunten", "mapcomplete.osm.be" +"2021-04-10", "WinstonSmith", "en", "drinking_water", "MapComplete 0.6.6c", 1, 2, "Adding data with #MapComplete for theme #drinking_water", "mapcomplete.osm.be" +"2021-04-11", "bvrslypp", "en", "surveillance", "MapComplete 0.6.8", 2, 4, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" +"2021-04-11", "bvrslypp", "en", "surveillance", "MapComplete 0.6.8", 5, 9, "Adding data with #MapComplete for theme #surveillance", "pietervdvn.github.io" +"2021-04-11", "joost schouppe", "en", "personal", "MapComplete 0.6.6c", 1, 2, "Adding data with #MapComplete for theme #personal", "mapcomplete.osm.be" +"2021-04-11", "Peter Elderson", "en", "wandelknooppunten", "MapComplete 0.6.6c", 3, 6, "Adding data with #MapComplete for theme #wandelknooppunten", "mapcomplete.osm.be" +"2021-04-11", "Pieter Vander Vennet", "nl", "bookcases", "MapComplete 0.6.6c", 1, 4, "Adding data with #MapComplete for theme #bookcases", "mapcomplete.osm.be" +"2021-04-11", "Pieter Vander Vennet", "nl", "cyclofix", "MapComplete 0.6.6c", 1, 5, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-04-11", "Pieter Vander Vennet", "nl", "grb", "MapComplete 0.6.6c", 0, 33, "Adding data with #MapComplete for theme #grb", "mapcomplete.osm.be" +"2021-04-11", "Pieter Vander Vennet", "nl", "grb", "MapComplete 0.6.8-rc1", 0, 2, "Adding data with #MapComplete for theme #grb", "pietervdvn.github.io" +"2021-04-11", "rjvdboon", "nl", "wandelknooppunten", "MapComplete 0.6.6c", 2, 4, "Adding data with #MapComplete for theme #wandelknooppunten", "mapcomplete.osm.be" diff --git a/package.json b/package.json index cc36ca8428..158f759cc2 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "validate:layeroverview": "ts-node scripts/generateLayerOverview.ts --report", "validate:licenses": "ts-node scripts/generateLicenseInfo.ts --report", "optimize-images": "cd assets/generated/ && find -name '*.png' -exec optipng '{}' \\; && echo 'PNGs are optimized'", - "generate": "npm run generate:images && npm run generate:translations && npm run generate:licenses", + "generate": "mkdir -p ./assets/generated && echo '{\"layers\":[], \"themes\":[]}' > ./assets/generated/known_layers_and_themes.json && npm run generate:images && npm run generate:translations && npm run generate:licenses && npm run generate:licenses && npm run generate:layeroverview", "build": "rm -rf dist/ && npm run generate && parcel build --public-url ./ *.html assets/** assets/**/** assets/**/**/** vendor/* vendor/*/*", - "prepare-deploy": "npm run test && npm run generate:editor-layer-index && npm run generate:layouts && npm run generate:layeroverview && npm run generate && npm run build && rm -rf .cache && npm run generate:docs", + "prepare-deploy": "npm run generate && npm run test && npm run generate:editor-layer-index && npm run generate:layouts && npm run generate:layeroverview && npm run build && rm -rf .cache && npm run generate:docs", "deploy:staging": "npm run prepare-deploy && rm -rf /home/pietervdvn/git/pietervdvn.github.io/Staging/* && cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/Staging/ && cd /home/pietervdvn/git/pietervdvn.github.io/ && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean", "deploy:pietervdvn": "npm run prepare-deploy && rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/* && cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/ && cd /home/pietervdvn/git/pietervdvn.github.io/ && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean", "deploy:production": "rm -rf ./assets/generated && npm run prepare-deploy && npm run optimize-images && rm -rf /home/pietervdvn/git/mapcomplete.github.io/* && cp -r dist/* /home/pietervdvn/git/mapcomplete.github.io/ && cd /home/pietervdvn/git/mapcomplete.github.io/ && echo \"mapcomplete.osm.be\" > CNAME && git add * && git commit -m 'New MapComplete Version' && git push && cd - && npm run clean",