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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-11-27 16:05:41 +01:00
commit d0ebd0e233
187 changed files with 1201 additions and 22352 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/icons/icons.json
View file

@ -189,9 +189,6 @@
},
{
"id": "rating",
"labels": [
"defaults"
],
"icon": {
"class": "w-20 mx-1 flex items-center"
},

8
assets/layers/note/note.json
View file

@ -66,11 +66,11 @@
"marker": [
{
"icon": {
"render": "note",
"render": "./assets/svg/note.svg",
"mappings": [
{
"if": "closed_at~*",
"then": "resolved"
"then": "./assets/svg/resolved.svg"
}
]
}
@ -80,11 +80,11 @@
"iconBadges": [
{
"if": "_total_comments>1",
"then": "circle:white;speech_bubble"
"then": "circle:white;./assets/svg/speech_bubble.svg"
},
{
"if": "_is_import_note~*",
"then": "addSmall"
"then": "./assets/svg/addSmall.svg"
}
],
"anchor": "bottom"

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

@ -160,7 +160,7 @@
"craft=key_cutter"
]
},
"then": "./assets/layers/id_presets/fas-key.svg"
"then": "circle:white;./assets/layers/id_presets/fas-key.svg"
}
],
"label": {

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

@ -372,7 +372,7 @@
"mappings": [
{
"if": "mapcomplete-show_crosshair=yes",
"then": "Show a crosshair in the center of the map (when zoomed in above level 17)"
"then": "Show a crosshair in the center of the map when zoomed in above level 17"
},
{
"if": "mapcomplete-show_crosshair=no",
@ -382,6 +382,10 @@
"if": "mapcomplete-show_crosshair=",
"then": "Do not show a crosshair in the center of the map",
"hideInAnswer": true
},
{
"if": "mapcomplete-show_crosshair=always",
"then": "Always show a crosshair in the center of the map"
}
]
},