Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt

This commit is contained in:
karelleketers 2021-07-08 11:33:32 +02:00
commit daff0f6fb8
2 changed files with 66 additions and 94 deletions

View file

@ -32,31 +32,16 @@
"nl": "Vuilnisbak" "nl": "Vuilnisbak"
}, },
"minzoom": 12, "minzoom": 12,
"source": { "source": {"osmTags": {
"osmTags": {
"and": [ "and": [
"amenity=waste_basket" "amenity=waste_basket"
] ]
} }},
},
"title": { "title": {
"render": { "render": {
"en": "Waste Basket", "en": "Waste Basket",
"nl": "Vuilnisbak" "nl": "Vuilnisbak"
},
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
} }
}
]
}, },
"description": { "description": {
"en": "This is a public waste basket, thrash can, where you can throw away your thrash.", "en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
@ -65,20 +50,7 @@
"tagRenderings": [], "tagRenderings": [],
"hideUnderlayingFeaturesMinPercentage": 0, "hideUnderlayingFeaturesMinPercentage": 0,
"icon": { "icon": {
"render": "./assets/themes/waste_basket/waste_basket.svg", "render": "./assets/themes/waste_basket/waste_basket.svg"
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
}
}
]
}, },
"width": { "width": {
"render": "8" "render": "8"

View file

@ -20,7 +20,7 @@
"generate:layouts": "ts-node scripts/generateLayouts.ts", "generate:layouts": "ts-node scripts/generateLayouts.ts",
"generate:docs": "ts-node scripts/generateDocs.ts && ts-node scripts/generateTaginfoProjectFiles.ts", "generate:docs": "ts-node scripts/generateDocs.ts && ts-node scripts/generateTaginfoProjectFiles.ts",
"generate:cache:speelplekken": "npm run generate:layeroverview && ts-node scripts/generateCache.ts speelplekken 14 ../pietervdvn.github.io/speelplekken_cache/ 51.20 4.35 51.09 4.56", "generate:cache:speelplekken": "npm run generate:layeroverview && ts-node scripts/generateCache.ts speelplekken 14 ../pietervdvn.github.io/speelplekken_cache/ 51.20 4.35 51.09 4.56",
"generate:layeroverview": "echo {\\\"layers\\\":[], \\\"themes\\\":[]} > ./assets/generated/known_layers_and_themes.json && ts-node scripts/generateLayerOverview.ts --no-fail", "generate:layeroverview": "npm run generate:licenses && echo {\\\"layers\\\":[], \\\"themes\\\":[]} > ./assets/generated/known_layers_and_themes.json && ts-node scripts/generateLayerOverview.ts --no-fail",
"generate:licenses": "ts-node scripts/generateLicenseInfo.ts --no-fail", "generate:licenses": "ts-node scripts/generateLicenseInfo.ts --no-fail",
"generate:report": "cd Docs/Tools && ./compileStats.sh && git commit . -m 'New statistics ands graphs' && git push", "generate:report": "cd Docs/Tools && ./compileStats.sh && git commit . -m 'New statistics ands graphs' && git push",
"generate:contributor-list": "git log --pretty='%aN' | sort | uniq -c | sort -hr | sed 's/ *\\([0-9]*\\) \\(.*\\)$/{\"contributor\":\"\\2\", \"commits\":\\1}/' | tr '\\n' ',' | sed 's/^/{\"contributors\":[/' | sed 's/,$/]}/' > assets/contributors.json", "generate:contributor-list": "git log --pretty='%aN' | sort | uniq -c | sort -hr | sed 's/ *\\([0-9]*\\) \\(.*\\)$/{\"contributor\":\"\\2\", \"commits\":\\1}/' | tr '\\n' ',' | sed 's/^/{\"contributors\":[/' | sed 's/,$/]}/' > assets/contributors.json",