midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Various styling tweaks, add playgrounds to toerisme vlaanderen

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-14 18:29:39 +02:00
parent 2c2649a05b
commit 85ef41e8d5
16 changed files with 903 additions and 717 deletions
Download patch file Download diff file Expand all files Collapse all files

13
UI/Popup/DeleteWizard.ts
View file

@ -117,7 +117,18 @@ export default class DeleteWizard extends Toggle {
deleteButton,
confirm),
new VariableUiElement(deleteAbility.canBeDeleted.map(cbd => new Combine([cbd.reason.Clone(), t.useSomethingElse.Clone()]))),
new VariableUiElement(deleteAbility.canBeDeleted.map(cbd =>
new Combine([
Svg.delete_not_allowed_svg().SetStyle("height: 2rem; width: auto").SetClass("mr-2"),
new Combine([
t.cannotBeDeleted.Clone(),
cbd.reason.Clone().SetClass("subtle"),
t.useSomethingElse.Clone().SetClass("subtle")]).SetClass("flex flex-col")
]).SetClass("flex m-2 p-2 rounded-lg bg-gray-200 bg-gray-200")))
,
deleteAbility.canBeDeleted.map(cbd => allowSoftDeletion || cbd.canBeDeleted !== false)),
t.loginToDelete.Clone().onClick(State.state.osmConnection.AttemptLogin),

4
UI/Popup/MoveWizard.ts
View file

@ -210,11 +210,11 @@ export default class MoveWizard extends Toggle {
super(
moveFlow,
new Combine([
Svg.move_not_allowed_svg().SetStyle("height: 2rem"),
Svg.move_not_allowed_svg().SetStyle("height: 2rem").SetClass("m-2"),
new Combine([t.cannotBeMoved.Clone(),
new VariableUiElement(moveDisallowedReason).SetClass("subtle")
]).SetClass("flex flex-col")
]).SetClass("flex"),
]).SetClass("flex m-2 p-2 rounded-lg bg-gray-200"),
moveDisallowedReason.map(r => r === undefined)
)
}

5
assets/layers/cafe_pub/cafe_pub.json
View file

@ -184,7 +184,10 @@
],
"deletion": {
"softDeletionTags": {
"and": ["amenity=","disused:amenity:={amenity}"]
"and": [
"amenity=",
"disused:amenity:={amenity}"
]
}
},
"allowMove": true

5
assets/layers/food/food.json
View file

@ -627,7 +627,10 @@
],
"deletion": {
"softDeletionTags": {
"and": ["amenity=","disused:amenity:={amenity}"]
"and": [
"amenity=",
"disused:amenity:={amenity}"
]
}
},
"allowMove": true

10
assets/layers/playground/playground.json
View file

@ -527,5 +527,13 @@
}
}
],
"wayHandling": 2
"wayHandling": 2,
"deletion": {
"softDeletionTags": {
"and": [
"disused:leisure=playground",
"leisure="
]
}
}
}

5
assets/layers/shops/shops.json
View file

@ -316,7 +316,10 @@
"wayHandling": 2,
"deletion": {
"softDeletionTags": {
"and": ["amenity=","disused:amenity:={amenity}"]
"and": [
"amenity=",
"disused:amenity:={amenity}"
]
}
},
"allowMove": true

44
assets/layers/waste_basket/waste_basket.json
View file

@ -75,6 +75,50 @@
}
}
]
},
{
"id": "dispensing_dog_bags",
"question": {
"en": "Does this waste basket have a dispenser for dog excrement bags?"
},
"condition": {
"or": [
"waste=dog_excrement",
"waste=trash",
"waste="
]
},
"mappings": [
{
"if": {
"and": [
"vending=dog_excrement_bag",
"not:vending="
]
},
"then": {
"en": "This waste basket has a dispenser for (dog) excrement bags"
}
},
{
"if": {
"and": [
"not:vending=dog_excrement_bag",
"vending="
]
},
"then": {
"en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags"
}
},
{
"if": "vending=",
"then": {
"en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags"
},
"hideInAnwer": true
}
]
}
],
"icon": {

86
assets/svg/delete_not_allowed.svg Normal file
View file

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 -256 2801.2319 2801.2319"
id="svg3741"
version="1.1"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="2801.2319"
height="2801.2319"
sodipodi:docname="delete_not_allowed.svg">
<metadata
id="metadata3751">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3749" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1013"
id="namedview3747"
showgrid="false"
inkscape:zoom="0.18624688"
inkscape:cx="2830.1035"
inkscape:cy="1600.3947"
inkscape:window-x="907"
inkscape:window-y="1080"
inkscape:window-maximized="1"
inkscape:current-layer="svg3741" />
<circle
cx="1405.9852"
cy="1149.9852"
id="circle4-3"
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:28.47442627;stroke-opacity:1"
r="1395.2467" />
<g
id="g881"
transform="matrix(1.255247,0,0,1.255247,149.11911,-316.26492)">
<path
d="m 757.99043,900.46233 v 576.00007 q 0,14 -9,23 -9,9 -23,9 h -64 q -14,0 -23,-9 -9,-9 -9,-23 V 900.46233 q 0,-14 9,-23 9,-9 23,-9 h 64 q 14,0 23,9 9,9 9,23 z m 255.99997,0 v 576.00007 q 0,14 -9,23 -8.99997,9 -22.99997,9 h -64 q -14,0 -23,-9 -9,-9 -9,-23 V 900.46233 q 0,-14 9,-23 9,-9 23,-9 h 64 q 14,0 22.99997,9 9,9 9,23 z m 256,0 v 576.00007 q 0,14 -9,23 -9,9 -23,9 h -64 q -14,0 -23,-9 -9,-9 -9,-23 V 900.46233 q 0,-14 9,-23 9,-9 23,-9 h 64 q 14,0 23,9 9,9 9,23 z m 128,724.00007 V 676.46233 H 501.99043 v 948.00007 q 0,22 7,40.5 7,18.5 14.5,27 7.5,8.5 10.5,8.5 h 831.99997 q 3,0 10.5,-8.5 7.5,-8.5 14.5,-27 7,-18.5 7,-40.5 z M 725.99043,548.46233 h 447.99997 l -48,-117 q -7,-9 -17,-11 H 791.99043 q -10,2 -17,11 z m 927.99997,32 v 64 q 0,14 -9,23 -9,9 -23,9 h -96 v 948.00007 q 0,83 -47,143.5 -47,60.5 -113,60.5 H 533.99043 q -66,0 -113,-58.5 -47,-58.5 -47,-141.5 V 676.46233 h -96 q -14,0 -23,-9 -9,-9 -9,-23 v -64 q 0,-14 9,-23 9,-9 23,-9 h 309 l 70,-167 q 15,-37 54,-63 39,-26 79,-26 h 319.99997 q 40,0 79,26 39,26 54,63 l 70,167 h 309 q 14,0 23,9 9,9 9,23 z"
id="path3745"
inkscape:connector-curvature="0"
style="fill:#000000;fill-opacity:1" />
<circle
r="428.78763"
style="fill:#e72c44;fill-opacity:1;stroke:none;stroke-width:8.75076866;stroke-opacity:1"
id="circle4"
cy="1546.505"
cx="1396.2404" />
<g
inkscape:label="Layer 1"
id="layer1"
transform="matrix(18.610644,0,0,18.610644,1155.9889,-3741.7197)">
<path
style="fill:none;stroke:#ffffff;stroke-width:6.0128417;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 22.551907,293.60329 2.927466,273.97885 v 0"
id="path815"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#fcffff;stroke-width:6.0128417;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 22.581499,273.88422 2.9570535,293.50867 v 0"
id="path815-3"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

8
assets/svg/delete_not_allowed.svg.license_info.json Normal file
View file

@ -0,0 +1,8 @@
{
"authors": [
"Pieter Vander Vennet"
],
"path": "delete_not_allowed.svg",
"license": "CC0",
"sources": []
}

9
assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
View file

@ -54,6 +54,15 @@
"minzoom": 14
}
},
{
"builtin": [
"playground"
],
"override": {
"minzoom": 14,
"iconSize": "25,25,center"
}
},
{
"builtin": [
"binocular",

4
css/index-tailwind-output.css
View file

@ -1074,10 +1074,6 @@ video {
width: 1.5rem;
}
.w-1\/2 {
width: 50%;
}
.w-max {
width: -webkit-max-content;
width: -moz-max-content;

1
langs/en.json
View file

@ -40,6 +40,7 @@
"delete": "Delete",
"cancel": "Cancel",
"isDeleted": "This feature is deleted",
"cannotBeDeleted": "This feature can not be deleted",
"loginToDelete": "You must be logged in to delete a point",
"safeDelete": "This point can be safely deleted.",
"isntAPoint": "Only points can be deleted, the selected feature is a way, area or relation.",

14
langs/layers/en.json
View file

@ -3855,6 +3855,20 @@
}
},
"tagRenderings": {
"dispensing_dog_bags": {
"mappings": {
"0": {
"then": "This waste basket has a dispenser for (dog) excrement bags"
},
"1": {
"then": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags"
},
"2": {
"then": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags"
}
},
"question": "Does this waste basket have a dispenser for dog excrement bags?"
},
"waste-basket-waste-types": {
"mappings": {
"0": {