diff --git a/.github/workflows/deploy_pietervdvn.yml b/.github/workflows/deploy_pietervdvn.yml new file mode 100644 index 0000000000..d44e22cb84 --- /dev/null +++ b/.github/workflows/deploy_pietervdvn.yml @@ -0,0 +1,55 @@ +name: Deployment on pietervdvn +on: + push + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v1.2.0 + with: + node-version: '15' + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + + - name: install deps + run: npm ci + + - name: create generated dir + run: mkdir ./assets/generated + + - name: create stub themes + run: "echo '{\"layers\": [], \"themes\": []}' > ./assets/generated/known_layers_and_themes.json" + + - name: Prepare deploy + run: npm run prepare-deploy + + - name: Clone deployment repo + env: + DEPLOY_KEY_PIETERVDVN: ${{ secrets.DEPLOY_KEY_PIETERVDVN }} + run: | + echo "Cloning destination repo" + git config --global user.email "pietervdvn@posteo.net" + git config --global user.name "pietervdvn" + git clone --depth 1 --single-branch --branch master "https://x-access-token:$DEPLOY_KEY_PIETERVDVN@github.com/pietervdvn/pietervdvn.github.io.git" + echo "Destination repo is cloned" + + - name: "Copying files" + run: | + echo "Deploying" + TARGET=${GITHUB_REF:11} + rm -rf pietervdvn.github.io/mc/$TARGET/* + mkdir -p pietervdvn.github.io/mc/$TARGET/ + cp -r dist/* pietervdvn.github.io/mc/$TARGET/ + cd pietervdvn.github.io/ + git add * + if git status | grep -q "Changes to be committed" + then + git commit -am "Deploying a new version of mapcomplete" + git push + else + echo "No changes to commit" + fi diff --git a/Customizations/JSON/LayerConfig.ts b/Customizations/JSON/LayerConfig.ts index fb63d3951e..0fe05d121e 100644 --- a/Customizations/JSON/LayerConfig.ts +++ b/Customizations/JSON/LayerConfig.ts @@ -5,7 +5,6 @@ import {FromJSON} from "./FromJSON"; import SharedTagRenderings from "../SharedTagRenderings"; import {TagRenderingConfigJson} from "./TagRenderingConfigJson"; import {Translation} from "../../UI/i18n/Translation"; -import Img from "../../UI/Base/Img"; import Svg from "../../Svg"; import {Utils} from "../../Utils"; @@ -64,7 +63,14 @@ export default class LayerConfig { const self = this; this.id = json.id; this.name = Translations.T(json.name, context + ".name"); - this.description = Translations.T(json.description, context + ".description"); + + if(json.description !== undefined){ + if(Object.keys(json.description).length === 0){ + json.description = undefined; + } + } + + this.description =Translations.T(json.description, context + ".description") ; let legacy = undefined; if (json["overpassTags"] !== undefined) { @@ -360,8 +366,7 @@ export default class LayerConfig { // We use ยง as a replacement for ; const html = sourcePart.substring("html:".length) const inner = new FixedUiElement(SubstitutingTag.substituteString(html, tgs)).SetClass("block w-min text-center") - const outer = new Combine([inner]).SetClass("flex flex-col items-center") - return outer; + return new Combine([inner]).SetClass("flex flex-col items-center"); } const style = `width:100%;height:100%;transform: rotate( ${rotation} );display:block;position: absolute; top: 0; left: 0`; diff --git a/Docs/Development_deployment.md b/Docs/Development_deployment.md index 819679fe2f..7762c7a9f5 100644 --- a/Docs/Development_deployment.md +++ b/Docs/Development_deployment.md @@ -31,6 +31,14 @@ 5. By default, a landing page with available themes is served. In order to load a single theme, use `layout=themename` or `userlayout=true#` as [Query parameter](URL_Parameters.md). Note that the shorter URLs (e.g. `bookcases.html`, `aed.html`, ...) _don't_ exist on the development version. + Automatic deployment + -------------------- + + Currently, the master branch is automatically deployed to 'mapcomplete.osm.be' by a github action. + + Every branch is automatically built (upon push) to 'pietervdvn.github.io/mc/' by a github action. + + Deploying a fork ---------------- diff --git a/Docs/Tools/Changesets per theme in 2020.png b/Docs/Tools/Changesets per theme in 2020.png index 6195795bfe..181bebbaf4 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 5798bad550..aadad13633 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 848e47a79e..d15fc958af 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 23ed5fc08f..e242e86568 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 09de3ccb0c..702f4e9518 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 per total number of changesets in 2020.png b/Docs/Tools/Contributors per total number of changesets in 2020.png new file mode 100644 index 0000000000..47eb9e671d Binary files /dev/null and b/Docs/Tools/Contributors per total number of changesets in 2020.png differ diff --git a/Docs/Tools/Contributors per total number of changesets in 2021.png b/Docs/Tools/Contributors per total number of changesets in 2021.png new file mode 100644 index 0000000000..c47af18703 Binary files /dev/null and b/Docs/Tools/Contributors per total number of changesets in 2021.png differ diff --git a/Docs/Tools/Contributors per total number of changesets.png b/Docs/Tools/Contributors per total number of changesets.png new file mode 100644 index 0000000000..1807084059 Binary files /dev/null and b/Docs/Tools/Contributors per total number of changesets.png differ diff --git a/Docs/Tools/Contributors per total number of mapping days in 2020.png b/Docs/Tools/Contributors per total number of mapping days in 2020.png new file mode 100644 index 0000000000..c0707e068d Binary files /dev/null and b/Docs/Tools/Contributors per total number of mapping days in 2020.png differ diff --git a/Docs/Tools/Contributors per total number of mapping days in 2021.png b/Docs/Tools/Contributors per total number of mapping days in 2021.png new file mode 100644 index 0000000000..2da040c58d Binary files /dev/null and b/Docs/Tools/Contributors per total number of mapping days in 2021.png differ diff --git a/Docs/Tools/Contributors per total number of mapping days.png b/Docs/Tools/Contributors per total number of mapping days.png new file mode 100644 index 0000000000..08c631ebee Binary files /dev/null and b/Docs/Tools/Contributors per total number of mapping days.png differ diff --git a/Docs/Tools/Contributors.png b/Docs/Tools/Contributors.png index c58bac149b..12a576d135 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 deleted file mode 100644 index 48bd88bc2c..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme aed.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme aed_brugge.png b/Docs/Tools/Cumulative changesets per contributor for theme aed_brugge.png deleted file mode 100644 index 4940939113..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme aed_brugge.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme arbres_leffia.png b/Docs/Tools/Cumulative changesets per contributor for theme arbres_leffia.png deleted file mode 100644 index f5ad4bf844..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme arbres_leffia.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme arbres_llefia.png b/Docs/Tools/Cumulative changesets per contributor for theme arbres_llefia.png deleted file mode 100644 index a0ee70aa80..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme arbres_llefia.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme artworks.png b/Docs/Tools/Cumulative changesets per contributor for theme artworks.png deleted file mode 100644 index 8d320d1d44..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme artworks.png and /dev/null 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 deleted file mode 100644 index 72ec8bfc95..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme benches.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme benchesandpicnictables.png b/Docs/Tools/Cumulative changesets per contributor for theme benchesandpicnictables.png deleted file mode 100644 index 78cde0857c..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme benchesandpicnictables.png and /dev/null 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 deleted file mode 100644 index b3252b7a06..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme bookcases.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme buurtnatuur.png b/Docs/Tools/Cumulative changesets per contributor for theme buurtnatuur.png deleted file mode 100644 index ce3d4324a8..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme buurtnatuur.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme campersite.png b/Docs/Tools/Cumulative changesets per contributor for theme campersite.png deleted file mode 100644 index 6530f6e301..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme campersite.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme charging_stations.png b/Docs/Tools/Cumulative changesets per contributor for theme charging_stations.png deleted file mode 100644 index 5d784ed825..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme charging_stations.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme climbing.png b/Docs/Tools/Cumulative changesets per contributor for theme climbing.png deleted file mode 100644 index 9c68b36980..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme climbing.png and /dev/null 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 deleted file mode 100644 index 093afdd6d1..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme cyclofix.png and /dev/null 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 deleted file mode 100644 index ba0806e13c..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme drinking_water.png and /dev/null 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 deleted file mode 100644 index fb2f6a79a6..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme fietsstraten.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme fritures.png b/Docs/Tools/Cumulative changesets per contributor for theme fritures.png deleted file mode 100644 index b51d1aabd4..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme fritures.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme geveltuintjes.png b/Docs/Tools/Cumulative changesets per contributor for theme geveltuintjes.png deleted file mode 100644 index fddfac123d..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme geveltuintjes.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme ghostbikes.png b/Docs/Tools/Cumulative changesets per contributor for theme ghostbikes.png deleted file mode 100644 index 5a47880d37..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme ghostbikes.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme hailhydrant.png b/Docs/Tools/Cumulative changesets per contributor for theme hailhydrant.png deleted file mode 100644 index 242ee90bc2..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme hailhydrant.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme maps.png b/Docs/Tools/Cumulative changesets per contributor for theme maps.png deleted file mode 100644 index 9356925e60..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme maps.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme nature.png b/Docs/Tools/Cumulative changesets per contributor for theme nature.png deleted file mode 100644 index 0717315c0d..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme nature.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme natuurpunt.png b/Docs/Tools/Cumulative changesets per contributor for theme natuurpunt.png deleted file mode 100644 index 11d2ceb09f..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme natuurpunt.png and /dev/null 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 deleted file mode 100644 index decc4e7e74..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme personal.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme playgrounds.png b/Docs/Tools/Cumulative changesets per contributor for theme playgrounds.png deleted file mode 100644 index c5da8d4474..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme playgrounds.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme restaurants.png b/Docs/Tools/Cumulative changesets per contributor for theme restaurants.png deleted file mode 100644 index 8af380b867..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme restaurants.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme shops.png b/Docs/Tools/Cumulative changesets per contributor for theme shops.png deleted file mode 100644 index 30775da367..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme shops.png and /dev/null 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 deleted file mode 100644 index 789254b939..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme surveillance.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme toilets.png b/Docs/Tools/Cumulative changesets per contributor for theme toilets.png deleted file mode 100644 index dcec39452a..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme toilets.png and /dev/null 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 deleted file mode 100644 index 45f1a259a8..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme trees.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme updaten van metadata met mapcomplete.png b/Docs/Tools/Cumulative changesets per contributor for theme updaten van metadata met mapcomplete.png deleted file mode 100644 index 46ad4b7945..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme updaten van metadata met mapcomplete.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor for theme waldbrand.png b/Docs/Tools/Cumulative changesets per contributor for theme waldbrand.png deleted file mode 100644 index 54cb2976b2..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme waldbrand.png and /dev/null 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 deleted file mode 100644 index 2beb10b22f..0000000000 Binary files a/Docs/Tools/Cumulative changesets per contributor for theme wandelknooppunten.png and /dev/null differ diff --git a/Docs/Tools/Cumulative changesets per contributor in 2021.png b/Docs/Tools/Cumulative changesets per contributor in 2021.png index b8902f6e67..9fc24c16a1 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 c50f1f8775..b098f4da5a 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 15a3043cbe..0b8f1e0475 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 079b23513a..97b3b7b6ad 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 d562eae3e8..c8a695db15 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 7b1c53ae00..a383db5b40 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 2328600c4b..5d25b9dfa0 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 9fca1c85e7..4ad1937782 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 510445ce53..675dfd1c64 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 0a422fbb3f..222451d246 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 d6da7d423e..14537c37fb 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 38080f97f6..a431913a32 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 c09e85ec57..7bb1da60f1 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 16367a1f01..bd1045adc9 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 fa8cd9683e..c71bb71ed8 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 deleted file mode 100644 index af91399a10..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme aed.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme arbres_leffia.png b/Docs/Tools/New and changed nodes per day for theme arbres_leffia.png deleted file mode 100644 index a0a4e83799..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme arbres_leffia.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme arbres_llefia.png b/Docs/Tools/New and changed nodes per day for theme arbres_llefia.png deleted file mode 100644 index 4036840fff..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme arbres_llefia.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme artworks.png b/Docs/Tools/New and changed nodes per day for theme artworks.png deleted file mode 100644 index b160156485..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme artworks.png and /dev/null 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 deleted file mode 100644 index 291eb07940..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme benches.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme benchesandpicnictables.png b/Docs/Tools/New and changed nodes per day for theme benchesandpicnictables.png deleted file mode 100644 index 04e1291611..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme benchesandpicnictables.png and /dev/null 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 deleted file mode 100644 index 4302521b5c..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme bookcases.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme buurtnatuur.png b/Docs/Tools/New and changed nodes per day for theme buurtnatuur.png deleted file mode 100644 index 585eaee23b..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme buurtnatuur.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme charging_stations.png b/Docs/Tools/New and changed nodes per day for theme charging_stations.png deleted file mode 100644 index 9c338103c4..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme charging_stations.png and /dev/null 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 deleted file mode 100644 index 97c9800ce7..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme cyclofix.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme drinking_water.png b/Docs/Tools/New and changed nodes per day for theme drinking_water.png deleted file mode 100644 index bc16edba52..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme drinking_water.png and /dev/null 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 deleted file mode 100644 index d887b301c1..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme fietsstraten.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme ghostbikes.png b/Docs/Tools/New and changed nodes per day for theme ghostbikes.png deleted file mode 100644 index 436c68a726..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme ghostbikes.png and /dev/null 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 deleted file mode 100644 index a08c17a174..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme grb.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme hailhydrant.png b/Docs/Tools/New and changed nodes per day for theme hailhydrant.png deleted file mode 100644 index d0ab08dd0e..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme hailhydrant.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme nature.png b/Docs/Tools/New and changed nodes per day for theme nature.png deleted file mode 100644 index baba4766e5..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme nature.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme natuurpunt.png b/Docs/Tools/New and changed nodes per day for theme natuurpunt.png deleted file mode 100644 index 1fedbfd96c..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme natuurpunt.png and /dev/null 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 deleted file mode 100644 index 6f0595f2cf..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme personal.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme playgrounds.png b/Docs/Tools/New and changed nodes per day for theme playgrounds.png deleted file mode 100644 index 4e54222e4f..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme playgrounds.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme railwayarg.png b/Docs/Tools/New and changed nodes per day for theme railwayarg.png deleted file mode 100644 index bf4e0247d4..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme railwayarg.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme shops.png b/Docs/Tools/New and changed nodes per day for theme shops.png deleted file mode 100644 index 2a9acfdcb4..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme shops.png and /dev/null 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 deleted file mode 100644 index b4632ec0d7..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme surveillance.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme toilets.png b/Docs/Tools/New and changed nodes per day for theme toilets.png deleted file mode 100644 index c540fb2b9d..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme toilets.png and /dev/null 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 deleted file mode 100644 index ff2448d0a9..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme trees.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme updaten van metadata met mapcomplete.png b/Docs/Tools/New and changed nodes per day for theme updaten van metadata met mapcomplete.png deleted file mode 100644 index 0ab600dd73..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme updaten van metadata met mapcomplete.png and /dev/null differ diff --git a/Docs/Tools/New and changed nodes per day for theme wandelknooppunten.png b/Docs/Tools/New and changed nodes per day for theme wandelknooppunten.png deleted file mode 100644 index 492c90744c..0000000000 Binary files a/Docs/Tools/New and changed nodes per day for theme wandelknooppunten.png and /dev/null 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 6bf1164ee2..dbd21ecc0b 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 2020.png b/Docs/Tools/Theme distribution in 2020.png index 0445a4ee2a..9b2189cf0a 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 0c1f5bb894..be9cad4c8d 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 a84266e53a..1174226ce1 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 a96b289e37..4174cec6ea 100644 --- a/Docs/Tools/csvGrapher.py +++ b/Docs/Tools/csvGrapher.py @@ -42,7 +42,7 @@ class Hist: return self.dictionary[key] return None - # Returns (keys, values.map(f)). To be used with e.g. pyplot.plot + # Returns values.map(f). def map(self, f): vals = [] keys = self.keys() @@ -60,7 +60,7 @@ class Hist: vals.append(running_value) return vals - # Returns [(key, flatten(values))] + # Returns [(key, flatten(values))] To be used with e.g. pyplot.plot def flatten(self, flatten): result = [] keys = self.keys() @@ -147,6 +147,29 @@ def create_usercount_graphs(stats, extra_text=""): pyplot.savefig("CumulativeContributors" + extra_text + ".png", dpi=400, facecolor='w', edgecolor='w') +def create_contributors_per_total_cs(contents, extra_text = "", cutoff=25, per_day=False): + hist = Hist("contributor") + for cs in contents: + hist.add(cs[1], cs[0]) + + count_per_contributor = hist.map(lambda dates : len(set(dates))) if per_day else hist.map(len) + + per_count = Hist("per cs count") + for cs_count in count_per_contributor: + per_count.add(min(cs_count, cutoff), 1) + + to_plot = per_count.flatten(len) + to_plot.sort(key=lambda a: a[0]) + to_plot[ - 1] = (str(cutoff)+ " or more", to_plot[-1][1]) + pyplot_init() + pyplot.bar(list(map(lambda a : str(a[0]), to_plot)), list(map(lambda a: a[1], to_plot)) ) + pyplot.title("Contributors per total number of changesets"+extra_text) + pyplot.ylabel("Number of contributors") + pyplot.xlabel("Mapping days with MapComplete" if per_day else "Number of changesets with MapComplete") + pyplot.savefig("Contributors per total number of "+("mapping days" if per_day else "changesets")+extra_text+".png", dpi=400) + + + def create_theme_breakdown(stats, fileExtra="", cutoff=15): print("Creating theme breakdown " + fileExtra) themeCounts = {} @@ -292,6 +315,9 @@ def sortable_user_number(kv): def create_graphs(contents): summed_changes_per(contents, "") + create_contributors_per_total_cs(contents) + create_contributors_per_total_cs(contents, per_day=True) + cumulative_changes_per(contents, 4, "version number", cutoff=1, sort=sortable_user_number) create_usercount_graphs(contents) create_theme_breakdown(contents) @@ -306,6 +332,8 @@ def create_graphs(contents): for year in range(2020, currentYear + 1): contents_filtered = list(contents_where(contents, 0, str(year))) extratext = " in " + str(year) + create_contributors_per_total_cs(contents_filtered, extratext) + create_contributors_per_total_cs(contents_filtered, extratext, per_day=True) create_usercount_graphs(contents_filtered, extratext) create_theme_breakdown(contents_filtered, extratext) cumulative_changes_per(contents_filtered, 3, "theme", extratext, cutoff=5) @@ -334,6 +362,8 @@ def create_per_theme_graphs(contents, cutoff=10): summed_changes_per(filtered, "for theme "+theme) + + def create_per_contributor_graphs(contents, least_needed_changesets): all_contributors = set(map(lambda row: row[1], contents)) for contrib in all_contributors: @@ -363,8 +393,9 @@ theme_remappings = { "wiki-User-joost_schouppe-campersite": "campersite", "wiki-User-joost_schouppe-geveltuintjes": "geveltuintjes", "wiki:User:joost_schouppe/campersite": "campersite", - "arbres":"arbres_leffia", - "https://llefia.org/arbres/mapcomplete.json":"arbres_leffia", + "arbres":"arbres_llefia", + "aed_brugge": "aed", + "https://llefia.org/arbres/mapcomplete.json":"arbres_llefia", "toevoegen of dit natuurreservaat toegangkelijk is":"buurtnatuur", "testing mapcomplete 0.0.0":"buurtnatuur", "https://raw.githubusercontent.com/osmbe/play/master/mapcomplete/geveltuinen/geveltuinen.json": "geveltuintjes" @@ -406,10 +437,8 @@ def main(): print("Found " + str(len(stats)) + " changesets") # contributor_count(stats) - - create_graphs(stats) - create_per_theme_graphs(stats, 15) + # create_per_theme_graphs(stats, 15) # create_per_contributor_graphs(stats, 25) print("All done!") diff --git a/Docs/Tools/stats.csv b/Docs/Tools/stats.csv index 141d4f2fb1..8b0df698b8 100644 --- a/Docs/Tools/stats.csv +++ b/Docs/Tools/stats.csv @@ -3956,10 +3956,92 @@ "2021-05-27", "Jose Luis Infante", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.3", 0, 3, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" "2021-05-27", "Jose Luis Infante", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.3", 0, 9, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" "2021-05-27", "Jose Luis Infante", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.3", 1, 0, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" +"2021-05-27", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.3", 0, 5, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" "2021-05-27", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.3", 1, 5, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" "2021-05-27", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.3", 4, 39, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" +"2021-05-27", "Maarten O", "nl", "aed", "MapComplete 0.7.3", 0, 3, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" "2021-05-27", "Marvin Geisler", "de", "waldbrand", "MapComplete 0.7.2l", 1, 2, "Adding data with #MapComplete for theme #waldbrand", "waldbrand-app.de" "2021-05-27", "Marvin Geisler", "de", "waldbrand", "MapComplete 0.7.2l", 3, 3, "Adding data with #MapComplete for theme #waldbrand", "waldbrand-app.de" "2021-05-27", "mozita", "de", "waldbrand", "MapComplete 0.7.2l", 1, 0, "Adding data with #MapComplete for theme #waldbrand", "waldbrand-app.de" "2021-05-27", "paytv", "de", "waldbrand", "MapComplete 0.7.2l", 6, 9, "Adding data with #MapComplete for theme #waldbrand", "waldbrand-app.de" +"2021-05-27", "pkoby", "en", "trees", "MapComplete 0.7.3", 0, 2, "Adding data with #MapComplete for theme #trees", "mapcomplete.osm.be" "2021-05-27", "Thierry1030", "nl", "fietsstraten", "MapComplete 0.7.2n", 0, 5, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" +"2021-05-28", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4", 0, 4, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-28", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4", 0, 9, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-28", "alexashh", "en", "cyclofix", "MapComplete 0.7.4", 0, 1, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-28", "GOwin", "en", "cyclofix", "MapComplete 0.7.3", 1, 4, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-28", "joost schouppe", "nl", "fietsstraten", "MapComplete 0.7.4", 0, 7, "Adding data with #MapComplete for theme #fietsstraten", "mapcomplete.osm.be" +"2021-05-28", "Koen Rijnsent", "en", "artworks", "MapComplete 0.7.4", 1, 3, "Adding data with #MapComplete for theme #artworks", "mapcomplete.osm.be" +"2021-05-28", "Pieter Nuytinck", "en", "bookcases", "MapComplete 0.7.2n", 1, 5, "Adding data with #MapComplete for theme #bookcases", "pietervdvn.github.io" +"2021-05-28", "Thierry1030", "en", "benches", "MapComplete 0.7.2n", 1, 2, "Adding data with #MapComplete for theme #benches", "pietervdvn.github.io" +"2021-05-29", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4", 0, 1, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-29", "Albin Gasparetto", "en", "surveillance", "MapComplete 0.7.4", 1, 1, "Adding data with #MapComplete for theme #surveillance", "mapcomplete.osm.be" +"2021-05-29", "alexashh", "en", "cyclofix", "MapComplete 0.7.4", 1, 2, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-29", "familiapicarol", "ca", "aed", "MapComplete 0.7.4", 0, 7, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-05-29", "Hendrik_III", "nl", "fritures", "MapComplete 0.7.4", 3, 7, "Adding data with #MapComplete for theme #fritures", "mapcomplete.osm.be" +"2021-05-29", "hke2912", "de", "benches", "MapComplete 0.7.2n", 1, 1, "Adding data with #MapComplete for theme #benches", "pietervdvn.github.io" +"2021-05-29", "hke2912", "de", "cyclofix", "MapComplete 0.7.2n", 1, 1, "Adding data with #MapComplete for theme #cyclofix", "pietervdvn.github.io" +"2021-05-29", "hke2912", "nl", "trees", "MapComplete 0.7.2n", 1, 1, "Adding data with #MapComplete for theme #trees", "pietervdvn.github.io" +"2021-05-29", "joren0081", "nl", "fritures", "MapComplete 0.7.4", 1, 3, "Adding data with #MapComplete for theme #fritures", "mapcomplete.osm.be" +"2021-05-29", "Pieter Nuytinck", "en", "bookcases", "MapComplete 0.7.2n", 1, 2, "Adding data with #MapComplete for theme #bookcases", "pietervdvn.github.io" +"2021-05-29", "rayanr666", "nl", "fritures", "MapComplete 0.7.4", 10, 10, "Adding data with #MapComplete for theme #fritures", "mapcomplete.osm.be" +"2021-05-29", "Thierry1030", "nl", "fietsstraten", "MapComplete 0.7.2n", 0, 1, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" +"2021-05-29", "Thierry1030", "nl", "fietsstraten", "MapComplete 0.7.2n", 0, 6, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" +"2021-05-29", "Thierry1030", "nl", "playgrounds", "MapComplete 0.7.2n", 0, 3, "Adding data with #MapComplete for theme #playgrounds", "pietervdvn.github.io" +"2021-05-29", "Thierry1030", "nl", "playgrounds", "MapComplete 0.7.2n", 1, 4, "Adding data with #MapComplete for theme #playgrounds", "pietervdvn.github.io" +"2021-05-29", "Tim Couwelier", "en", "aed", "MapComplete 0.7.4", 0, 4, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-05-30", "alexashh", "en", "cyclofix", "MapComplete 0.7.4", 1, 2, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-30", "dkf2010", "en", "sport_pitches", "MapComplete 0.7.4", 1, 1, "Adding data with #MapComplete for theme #sport_pitches", "mapcomplete.osm.be" +"2021-05-30", "dkf2010", "en", "sport_pitches", "MapComplete 0.7.4", 1, 2, "Adding data with #MapComplete for theme #sport_pitches", "mapcomplete.osm.be" +"2021-05-30", "dkf2010", "en", "sport_pitches", "MapComplete 0.7.4", 2, 2, "Adding data with #MapComplete for theme #sport_pitches", "mapcomplete.osm.be" +"2021-05-30", "Jakka", "nl", "bookcases", "MapComplete 0.7.2n", 0, 2, "Adding data with #MapComplete for theme #bookcases", "pietervdvn.github.io" +"2021-05-30", "joost schouppe", "nl", "benches", "MapComplete 0.7.4", 1, 1, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" +"2021-05-30", "joost schouppe", "nl", "toilets", "MapComplete 0.7.4", 1, 1, "Adding data with #MapComplete for theme #toilets", "mapcomplete.osm.be" +"2021-05-30", "joost schouppe", "nl", "toilets", "MapComplete 0.7.4", 1, 1, "Adding data with #MapComplete for theme #toilets", "mapcomplete.osm.be" +"2021-05-30", "kudlav", "en", "cyclofix", "MapComplete 0.7.4", 0, 1, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-30", "kudlav", "en", "toilets", "MapComplete 0.7.4", 0, 2, "Adding data with #MapComplete for theme #toilets", "mapcomplete.osm.be" +"2021-05-30", "philippec", "nl", "aed", "MapComplete 0.7.2n", 0, 8, "Adding data with #MapComplete for theme #aed", "pietervdvn.github.io" +"2021-05-30", "philippec", "nl", "aed", "MapComplete 0.7.2n", 5, 12, "Adding data with #MapComplete for theme #aed", "pietervdvn.github.io" +"2021-05-30", "Wim L", "en", "bookcases", "MapComplete 0.7.4", 2, 2, "Adding data with #MapComplete for theme #bookcases", "mapcomplete.osm.be" +"2021-05-31", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4a", 0, 2, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-31", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4b", 0, 2, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-31", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4b", 0, 4, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-05-31", "Awo", "en", "ghostbikes", "MapComplete 0.7.2n", 1, 0, "Adding data with #MapComplete for theme #ghostbikes", "pietervdvn.github.io" +"2021-05-31", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.4a", 0, 1, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" +"2021-05-31", "Maarten O", "nl", "aed", "MapComplete 0.7.4a", 0, 1, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-05-31", "MarcoR", "it", "campersite", "MapComplete 0.7.4a", 1, 2, "Adding data with #MapComplete for theme #campersite", "mapcomplete.osm.be" +"2021-05-31", "Nickrds09", "en", "hailhydrant", "MapComplete 0.7.4a", 7, 7, "Adding data with #MapComplete for theme #hailhydrant", "mapcomplete.osm.be" +"2021-05-31", "skifans", "en", "cyclofix", "MapComplete 0.7.4b", 0, 4, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-05-31", "SNT-LJM-Cognac", "fr", "buildings", "MapComplete 0.7.4b", 0, 2, "Adding data with #MapComplete for theme #buildings", "mapcomplete.osm.be" +"2021-06-01", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4b", 0, 14, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-06-01", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.4b", 2, 14, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" +"2021-06-01", "Nos_Fi", "en", "playgrounds", "MapComplete 0.7.4b", 2, 6, "Adding data with #MapComplete for theme #playgrounds", "mapcomplete.osm.be" +"2021-06-01", "SNT-LJM-Cognac", "fr", "buildings", "MapComplete 0.7.4b", 0, 0, "Adding data with #MapComplete for theme #buildings", "mapcomplete.osm.be" +"2021-06-01", "SNT-LJM-Cognac", "fr", "buildings", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #buildings", "mapcomplete.osm.be" +"2021-06-01", "SNT-LJM-Cognac", "fr", "buildings", "MapComplete 0.7.4b", 0, 3, "Adding data with #MapComplete for theme #buildings", "mapcomplete.osm.be" +"2021-06-01", "SNT-LJM-Cognac", "fr", "buildings", "MapComplete 0.7.4b", 0, 9, "Adding data with #MapComplete for theme #buildings", "mapcomplete.osm.be" +"2021-06-01", "Thierry1030", "en", "fietsstraten", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" +"2021-06-01", "Thierry1030", "en", "fietsstraten", "MapComplete 0.7.4b", 0, 2, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" +"2021-06-01", "WinstonSmith", "en", "cyclofix", "MapComplete 0.7.4b", 2, 2, "Adding data with #MapComplete for theme #cyclofix", "mapcomplete.osm.be" +"2021-06-02", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4b", 0, 10, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-06-02", "AgusQui", "es", "https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #https://raw.githubusercontent.com/AgusQui/MapCompleteRailway/main/railway", "mapcomplete.osm.be" +"2021-06-02", "Awo", "en", "ghostbikes", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #ghostbikes", "pietervdvn.github.io" +"2021-06-02", "Daniel Chiarello", "en", "aed", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-06-02", "Daniel Chiarello", "en", "charging_stations", "MapComplete 0.7.4b", 1, 3, "Adding data with #MapComplete for theme #charging_stations", "mapcomplete.osm.be" +"2021-06-02", "Daniel Chiarello", "en", "hailhydrant", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #hailhydrant", "mapcomplete.osm.be" +"2021-06-02", "Gaby_", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.4b", 0, 2, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" +"2021-06-02", "Koen Rijnsent", "en", "bookcases", "MapComplete 0.7.4b", 1, 2, "Adding data with #MapComplete for theme #bookcases", "mapcomplete.osm.be" +"2021-06-02", "Maarten O", "nl", "aed", "MapComplete 0.7.4b", 0, 4, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-06-02", "Pieter Nuytinck", "en", "bookcases", "MapComplete 0.7.4b", 1, 1, "Adding data with #MapComplete for theme #bookcases", "pietervdvn.github.io" +"2021-06-02", "Robin van der Linde", "en", "benches", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #benches", "mapcomplete.osm.be" +"2021-06-03", "Gaby_", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" +"2021-06-03", "Globelotter", "nl", "speelplekken", "MapComplete 0.7.4b", 0, 7, "Adding data with #MapComplete for theme #speelplekken", "mapcomplete.osm.be" +"2021-06-03", "Globelotter", "nl", "speelplekken", "MapComplete 0.7.4b", 4, 6, "Adding data with #MapComplete for theme #speelplekken", "mapcomplete.osm.be" +"2021-06-03", "joost schouppe", "nl", "fritures", "MapComplete 0.7.4b", 1, 1, "Adding data with #MapComplete for theme #fritures", "mapcomplete.osm.be" +"2021-06-03", "L'imaginaire", "en", "aed", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-06-03", "Maarten O", "nl", "aed_brugge", "MapComplete 0.7.4b", 3, 18, "Adding data with #MapComplete for theme #aed_brugge", "mapcomplete.osm.be" +"2021-06-03", "Maarten O", "nl", "aed", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #aed", "mapcomplete.osm.be" +"2021-06-03", "miurahr", "en", "toilets", "MapComplete 0.7.4b", 0, 1, "Adding data with #MapComplete for theme #toilets", "pietervdvn.github.io" +"2021-06-03", "Siel Createlli", "nl", "speelplekken", "MapComplete 0.7.4b", 0, 57, "Adding data with #MapComplete for theme #speelplekken", "mapcomplete.osm.be" +"2021-06-03", "Soco27", "ca", "https://llefia.org/arbres/mapcomplete.json", "MapComplete 0.7.4b", 2, 11, "Adding data with #MapComplete for theme #https://llefia.org/arbres/mapcomplete.json", "mapcomplete.osm.be" +"2021-06-03", "Thierry1030", "nl", "fietsstraten", "MapComplete 0.7.4b", 0, 6, "Adding data with #MapComplete for theme #fietsstraten", "pietervdvn.github.io" diff --git a/Models/Constants.ts b/Models/Constants.ts index df63a4e53d..0c6a19e8d1 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.7.4b"; + public static vNumber = "0.7.5"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/UI/i18n/Translation.ts b/UI/i18n/Translation.ts index f6adfb2823..5bdfa82495 100644 --- a/UI/i18n/Translation.ts +++ b/UI/i18n/Translation.ts @@ -18,6 +18,9 @@ export class Translation extends UIElement { } let count = 0; for (const translationsKey in translations) { + if(!translations.hasOwnProperty(translationsKey)){ + continue + } count++; if (typeof (translations[translationsKey]) != "string") { console.error("Non-string object in translation: ", translations[translationsKey]) diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json index 2343c4dcaa..bd7eee9d39 100644 --- a/assets/themes/speelplekken/speelplekken.json +++ b/assets/themes/speelplekken/speelplekken.json @@ -44,11 +44,12 @@ "isOsmCache": true }, "icon": "./assets/themes/speelplekken/speelbos.svg", - "minzoom": 12 - }, - "calculatedTags": [ - "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" - ] + "minzoom": 12, + "calculatedTags": [ + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''", + "_video:id=new URL(feat.properties.video).searchParams.get('v')" + ] + } }, { "builtin": "playground", @@ -62,7 +63,8 @@ "isOsmCache": true }, "calculatedTags": [ - "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''", + "_video:id=new URL(feat.properties.video).searchParams.get('v')" ] } }, @@ -78,7 +80,8 @@ "isOsmCache": true }, "calculatedTags": [ - "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''", + "_video:id=new URL(feat.properties.video).searchParams.get('v')" ] } }, @@ -94,7 +97,8 @@ "isOsmCache": true }, "calculatedTags": [ - "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''", + "_video:id=new URL(feat.properties.video).searchParams.get('v')" ] } }, @@ -109,7 +113,8 @@ "isOsmCache": true }, "calculatedTags": [ - "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''" + "_is_shadowed=feat.overlapWith('shadow').length > 0 ? 'yes': ''", + "_video:id=new URL(feat.properties.video).searchParams.get('v')" ] } }, @@ -252,12 +257,10 @@ "condition": "_part_of_walking_routes~*" }, { - "render": "Een kinder-reportage vinden jullie hier", "freeform": { - "key": "video", - "type": "url" + "key": "_video:id" }, - "question": "Wat is de link naar de video-reportage?" + "render": "" } ], "overrideAll": { diff --git a/assets/themes/speelplekken/speelplekken_temp.json b/assets/themes/speelplekken/speelplekken_temp.json index 43856c9b8e..f18fbbad10 100644 --- a/assets/themes/speelplekken/speelplekken_temp.json +++ b/assets/themes/speelplekken/speelplekken_temp.json @@ -239,6 +239,14 @@ { "render": "Maakt deel uit van {_part_of_walking_routes}", "condition": "_part_of_walking_routes~*" + }, + { + "render": "Een kinder-reportage vinden jullie hier", + "freeform": { + "key": "video", + "type": "url" + }, + "question": "Wat is de link naar de video-reportage?" } ], "overrideAll": {