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

Merge branch 'develop' into RobinLinde-patch-2

Browse source
This commit is contained in:
Robin van der Linde 2024-05-13 23:14:03 +02:00
commit e8491b4f44
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
353 changed files with 54100 additions and 31966 deletions
Download patch file Download diff file Expand all files Collapse all files

1
assets/layers/advertising/advertising.json
View file

@ -28,6 +28,7 @@
"pt_BR": "Completaremos os dados das características de publicidade com referência, operador e iluminação",
"it": "Completeremo i dati da caratteristiche pubblicitarie, con referenza, operatore e illuminazione"
},
"enableMorePrivacy": true,
"source": {
"osmTags": {
"and": [

16
assets/layers/bench/bench.json
View file

@ -155,8 +155,8 @@
{
"if": "backrest=yes",
"then": {
"en": "Does have a backrest",
"de": "Die Sitzbank hat eine Rückenlehne",
"en": "This bench does have a backrest",
"de": "Diese Sitzbank hat eine Rückenlehne",
"fr": "Dossier : Oui",
"nl": "Heeft een rugleuning",
"es": "Tiene respaldo",
@ -186,8 +186,8 @@
"two_sided="
],
"then": {
"en": "Does <b>not</b> have a backrest",
"de": "Die Sitzbank hat <b>keine</b> Rückenlehne",
"en": "This bench does <b>not</b> have a backrest",
"de": "Diese Sitzbank hat <b>keine</b> Rückenlehne",
"fr": "Dossier : Non",
"nl": "Heeft <b>geen</b> rugleuning",
"es": "<b>No</b> tiene respaldo",
@ -236,8 +236,8 @@
},
{
"render": {
"en": "{seats} seats",
"de": "Die Sitzbank hat {seats} Sitzplätze",
"en": "This bench has {seats} seats",
"de": "Diese Sitzbank hat {seats} Sitzplätze",
"fr": "{seats} places",
"nl": "{seats} zitplaatsen",
"es": "{seats} asientos",
@ -882,7 +882,7 @@
"bench-questions"
],
"render": {
"en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>",
"en": "This bench has the following inscription:<br/><p><i>{inscription}</i></p>",
"nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>",
"de": "Diese Bank hat folgende Inschrift:<br/><p><i>{inscription}</i></p>",
"fr": "Ce banc a l'inscription suivante :<br/><p><i>{inscription}</i></p>",
@ -931,7 +931,7 @@
{
"if": "inscription=",
"then": {
"en": "This bench does <span class='subtle'>(probably)</span> not have an inscription",
"en": "This bench <span class='subtle'>(probably)</span> does not not have an inscription",
"nl": "Deze bank heeft <span class='subtle'>(waarschijnlijk)</span> geen inscriptie",
"de": "Diese Bank hat <span class='subtle'>(wahrscheinlich)</span> keine Inschrift",
"fr": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription",

11
assets/layers/bike_parking/bike_parking.json
View file

@ -712,16 +712,7 @@
"type": "currency"
}
},
{
"builtin": "opening_hours_24_7",
"override": {
"mappings": [
{
"alsoShowIf": "opening_hours="
}
]
}
},
"opening_hours_24_7_default",
{
"id": "operator",
"question": {

1
assets/layers/brothel/brothel.json
View file

@ -11,6 +11,7 @@
"source": {
"osmTags": "amenity=brothel"
},
"enableMorePrivacy": true,
"minzoom": 6,
"title": {
"render": {

2
assets/layers/climbing_opportunity/climbing_opportunity.json
View file

@ -34,7 +34,7 @@
]
}
},
"minzoom": 19,
"minzoom": 18,
"title": {
"render": {
"en": "Climbing opportunity?",

1
assets/layers/love_hotel/love_hotel.json
View file

@ -8,6 +8,7 @@
"en": "A love hotel is a type of short-stay hotel found around the world operated primarily for the purpose of allowing guests privacy for sexual activities",
"de": "Ein Love Hotel ist eine Art Kurzzeithotel, das in erster Linie zu dem Zweck betrieben wird, den Gästen Privatsphäre für sexuelle Aktivitäten zu bieten"
},
"enableMorePrivacy": true,
"source": {
"osmTags": "amenity=love_hotel"
},

2
assets/layers/outdoor_seating/outdoor_seating.json
View file

@ -9,7 +9,7 @@
"source": {
"osmTags": "leisure=outdoor_seating"
},
"minzoom": 19,
"minzoom": 18,
"title": {
"render": {
"en": "Outdoor Seating area"

1
assets/layers/postoffices/postoffices.json
View file

@ -169,7 +169,6 @@
"ca": "Aquesta botiga és un col·laborador postal?",
"cs": "Jedná se o partnerskou poštu?"
},
"condition": "post_office=post_partner",
"mappings": [
{
"if": "post_office=post_partner",

3
assets/layers/questions/dogs_outside.svg Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg width="160.21mm" height="131.54mm" version="1.1" viewBox="0 0 160.21 131.54" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-43.988 -77.522)"><path d="m80.388 193.43h-18.565v11c0 6.0362-9.1609 6.0362-9.1609 0v-24.018h-4.1207c-5.8933 0-5.9456-8.1428-0.13883-8.1428h7.3702v0.0101l23.241-8e-3 14.103-14.103v7.183l9.7585 9.7585c2.2716 2.3581 0.96378 5.2374-1.1288 5.2374h-12.251l-0.04228 24.082c0 6.0362-9.0744 6.0362-9.0744 0v-11" stroke="#fff" stroke-width=".19276"/><g stroke="#000" stroke-width="1.4737"><path d="m164.17 78.471-37.945 30.739h75.889l-18.972-15.37zm-39.18 31.996v97.853h78.359v-97.853z" opacity=".996"/><g transform="translate(.17501)" fill="#fff"><rect x="171.66" y="124.83" width="20.068" height="18.921" opacity=".996"/><rect x="136.27" y="124.8" width="20.068" height="18.921" opacity=".996"/></g><rect x="153.28" y="164.55" width="21.788" height="43.766" fill="#fff" opacity=".996"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

8
assets/layers/questions/license_info.json
View file

@ -100,6 +100,14 @@
"https://www.onlinewebfonts.com/icon/464507"
]
},
{
"path": "open24_7.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "payment_card.svg",
"license": "CC0-1.0",

106
assets/layers/questions/open24_7.svg Normal file
View file

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="59.535809mm"
height="53.162579mm"
viewBox="0 0 59.535809 53.162579"
version="1.1"
id="svg1"
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
sodipodi:docname="open24_7.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#999999"
borderopacity="1"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
inkscape:zoom="1.2448246"
inkscape:cx="167.49348"
inkscape:cy="144.19702"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g4" />
<defs
id="defs1">
<rect
x="195.29895"
y="583.53101"
width="265.52469"
height="247.68958"
id="rect2" />
<rect
x="69.833305"
y="301.19489"
width="537.72614"
height="337.24045"
id="rect1" />
<rect
x="69.833305"
y="301.19489"
width="537.72614"
height="337.24045"
id="rect1-4" />
</defs>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-23.847285,-105.0215)">
<text
xml:space="preserve"
transform="scale(0.26458333)"
id="text2"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:151.181px;line-height:2;font-family:'Ubuntu Mono';-inkscape-font-specification:'Ubuntu Mono Bold';white-space:pre;shape-inside:url(#rect2);fill:#000000;fill-opacity:1;stroke:#0000ff;stroke-width:0.00001;stroke-linecap:round"><tspan
x="195.29883"
y="1028.9189"
id="tspan4">7</tspan></text>
<g
id="g4"
transform="rotate(19.031252,53.955502,129.65312)">
<text
xml:space="preserve"
transform="matrix(0.24864277,-0.0904495,0.0904495,0.24864277,-37.896511,23.10344)"
id="text1"
style="font-size:151.181px;line-height:2;font-family:QTBrushStroke;-inkscape-font-specification:QTBrushStroke;white-space:pre;shape-inside:url(#rect1);fill:#ffffff;stroke:#0000ff;stroke-width:0.00001;stroke-linecap:round"><tspan
x="69.833984"
y="498.89354"
id="tspan6"><tspan
style="font-weight:bold;font-family:'Ubuntu Mono';-inkscape-font-specification:'Ubuntu Mono Bold';fill:#000000"
id="tspan5">24</tspan></tspan></text>
<text
xml:space="preserve"
transform="matrix(0.31987307,-0.11005382,0.11005382,0.31987307,-8.6266834,2.8601416)"
id="text1-5"
style="font-size:151.181px;line-height:2;font-family:QTBrushStroke;-inkscape-font-specification:QTBrushStroke;white-space:pre;shape-inside:url(#rect1-4);display:inline;fill:#ffffff;stroke:#0000ff;stroke-width:0.00001;stroke-linecap:round"><tspan
x="69.833984"
y="498.89354"
id="tspan8"><tspan
style="font-weight:bold;font-family:'Ubuntu Mono';-inkscape-font-specification:'Ubuntu Mono Bold';fill:#000000"
id="tspan7">7</tspan></tspan></text>
<g
id="path2"
transform="translate(1.922053,-1.2055383)">
<path
style="color:#000000;fill:#000000;stroke-linecap:round;-inkscape-stroke:none"
d="M 41.997064,155.10511 71.103506,106.61208"
id="path3" />
<path
style="color:#000000;fill:#000000;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
d="m 72.390625,104.46875 a 2.5,2.5 0 0 0 -3.429688,0.85742 l -29.107421,48.49219 a 2.5,2.5 0 0 0 0.857421,3.42969 2.5,2.5 0 0 0 3.429688,-0.85547 l 29.105469,-48.49414 a 2.5,2.5 0 0 0 -0.855469,-3.42969 z"
id="path4" />
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

2
assets/layers/questions/open24_7.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0

21
assets/layers/questions/questions.json
View file

@ -619,6 +619,14 @@
"da": "Hunde er tilladt og kan løbe frit rundt",
"cs": "Psi mají vstup povolen a mohou volně pobíhat"
}
},
{
"if": "dog=outside",
"icon": "./assets/layers/questions/dogs_outside.svg",
"then": {
"en": "Dogs are allowed only outside",
"it": "I cani sono ammessi solo all'esterno"
}
}
]
},
@ -753,6 +761,7 @@
"+mappings": [
{
"if": "opening_hours=24/7",
"icon": "./assets/layers/questions/open24_7.svg",
"then": {
"en": "24/7 opened (including holidays)",
"de": "durchgehend geöffnet (auch an Feiertagen)",
@ -771,6 +780,18 @@
]
}
},
{
"id": "opening_hours_24_7_default",
"builtin": "opening_hours_24_7",
"override": {
"mappings": [
{
"#": "The first mapping is 'opening_hours=24/7', we amend this to also show if no info is known",
"alsoShowIf": "opening_hours="
}
]
}
},
{
"id": "opening_hours_by_appointment",
"builtin": "opening_hours",

1
assets/layers/stripclub/stripclub.json
View file

@ -8,6 +8,7 @@
"en": "A venue where erotic dance, striptease, or lap dances are performed commercially. ",
"de": "Ein Ort, an dem erotische Tanz-, Striptease- oder Lapdances kommerziell durchgeführt werden. "
},
"enableMorePrivacy": true,
"source": {
"osmTags": "amenity=stripclub"
},

1
assets/layers/surveillance_camera/surveillance_camera.json
View file

@ -22,6 +22,7 @@
"cs": "Tato vrstva zobrazuje sledovací kamery a umožňuje přispěvateli aktualizovat informace a přidávat nové kamery",
"sl": "Ta sloj prikazuje nadzorne kamere in urednikom omogoča posodabljanje informacij obstoječih in dodajanje novih kamer"
},
"enableMorePrivacy": true,
"source": {
"osmTags": {
"and": [

35
assets/layers/usersettings/usersettings.json
View file

@ -484,6 +484,41 @@
}
]
},
{
"id": "more_privacy_theme_override",
"mappings": [
{
"if": "__featureSwitchMorePrivacy=true",
"then": {
"en": "This theme is sensitive. Making changes will not indicate if you were nearby explicitly."
}
}
]
},
{
"id": "more_privacy",
"question":
{
"en": "When making changes, should a rough indication be given how far away you were from the object?"
},
"questionHint": {
"en": "If you make a change to one or more objects and you enabled your location, a rough indication of where you made will be saved: it is indicated if you were closer then 25m, 500m, 5km or further away then 5km. This helps mappers understand your context when making changes, but gives an indication of where you were at this time. "
},
"mappings": [
{
"if": "mapcomplete-more_privacy=yes",
"then": {
"en": "When making changes to OpenStreetMap, do not indicate how far away you were from the changed objects."
}
},
{
"if": "mapcomplete-more_privacy=no",
"then": {
"en": "When making changes to OpenStreetMap, roughly indicate how far away you were from the changed objects. This helps other contributors to understand how you made the change"
}
}
]
},
{
"id": "mangrove-keys",
"render": {