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

@ -1,102 +1,74 @@
{ {
"id": "waste_basket", "id": "waste_basket",
"title": { "title": {
"en": "Waste Basket", "en": "Waste Basket",
"nl": "Vuilnisbak" "nl": "Vuilnisbak"
}, },
"shortDescription": { "shortDescription": {
"en": "Throw away waste", "en": "Throw away waste",
"nl": "Afval weggooien" "nl": "Afval weggooien"
}, },
"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.",
"nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien." "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien."
}, },
"language": [ "language": [
"en", "en",
"nl" "nl"
], ],
"maintainer": "", "maintainer": "",
"icon": "./assets/themes/waste_basket/waste_basket.svg", "icon": "./assets/themes/waste_basket/waste_basket.svg",
"version": "7/7/2021", "version": "7/7/2021",
"startLat": 0, "startLat": 0,
"startLon": 0, "startLon": 0,
"startZoom": 1, "startZoom": 1,
"widenFactor": 0.05, "widenFactor": 0.05,
"socialImage": "", "socialImage": "",
"layers": [ "layers": [
{ {
"id": "waste_basket", "id": "waste_basket",
"name": { "name": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"amenity=waste_basket"
]
}
},
"title": {
"render": {
"en": "Waste Basket", "en": "Waste Basket",
"nl": "Vuilnisbak" "nl": "Vuilnisbak"
}, },
"mappings": [ "minzoom": 12,
{ "source": {"osmTags": {
"if": { "and": [
"and": [ "amenity=waste_basket"
"amenity=waste_basket" ]
] }},
}, "title": {
"then": { "render": {
"en": "Waste Basket", "en": "Waste Basket",
"nl": "Vuilnisbak" "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.", "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien."
"nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien." },
}, "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": [ "width": {
{ "render": "8"
"if": { },
"and": [ "iconSize": {
"amenity=waste_basket" "render": "40,40,center",
] "mappings": [
}, {
"then": { "if": {
"en": "Waste Basket", "and": [
"nl": "Vuilnisbak" "amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
}
} }
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
}
}
] ]
}, },
"color": { "color": {

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",