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

Themes(trees): refactor some special renderings, mark as not inline, fix #2469

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-07-28 04:25:28 +02:00
parent 0485c571f1
commit 46d3054cc8
35 changed files with 172 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

0
assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg → assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

0
assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license → assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg.license
View file

0
assets/layers/tree_node/broadleaved.svg → assets/layers/tree/broadleaved.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

0
assets/layers/tree_node/broadleaved.svg.license → assets/layers/tree/broadleaved.svg.license
View file

0
assets/layers/tree_node/leafless.svg → assets/layers/tree/leafless.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before After
Before After

0
assets/layers/tree_node/leafless.svg.license → assets/layers/tree/leafless.svg.license
View file

0
assets/layers/tree_node/license_info.json → assets/layers/tree/license_info.json
View file

0
assets/layers/tree_node/needleleaved.svg → assets/layers/tree/needleleaved.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

0
assets/layers/tree_node/needleleaved.svg.license → assets/layers/tree/needleleaved.svg.license
View file

0
assets/layers/tree_node/palm.svg → assets/layers/tree/palm.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

0
assets/layers/tree_node/palm.svg.license → assets/layers/tree/palm.svg.license
View file

67
assets/layers/tree_node/tree_node.json → assets/layers/tree/tree.json
View file

@ -1,5 +1,5 @@
{ {
"id": "tree_node", "id": "tree",
"name": { "name": {
"en": "Tree", "en": "Tree",
"ca": "Arbre", "ca": "Arbre",
@ -96,7 +96,7 @@
}, },
{ {
"icon": { "icon": {
"render": "./assets/layers/tree_node/unknown.svg", "render": "./assets/layers/tree/unknown.svg",
"mappings": [ "mappings": [
{ {
"if": { "if": {
@ -104,7 +104,7 @@
"leaf_type=broadleaved" "leaf_type=broadleaved"
] ]
}, },
"then": "./assets/layers/tree_node/broadleaved.svg" "then": "./assets/layers/tree/broadleaved.svg"
}, },
{ {
"if": { "if": {
@ -112,7 +112,7 @@
"leaf_type=needleleaved" "leaf_type=needleleaved"
] ]
}, },
"then": "./assets/layers/tree_node/needleleaved.svg" "then": "./assets/layers/tree/needleleaved.svg"
}, },
{ {
"if": { "if": {
@ -120,7 +120,7 @@
"leaf_type=palm" "leaf_type=palm"
] ]
}, },
"then": "./assets/layers/tree_node/palm.svg" "then": "./assets/layers/tree/palm.svg"
} }
] ]
} }
@ -272,6 +272,7 @@
"freeform": { "freeform": {
"key": "species:wikidata", "key": "species:wikidata",
"type": "wikidata", "type": "wikidata",
"inline": false,
"helperArgs": [ "helperArgs": [
"species", "species",
{ {
@ -578,7 +579,7 @@
}, },
"icon": { "icon": {
"class": "small", "class": "small",
"path": "./assets/layers/tree_node/broadleaved.svg" "path": "./assets/layers/tree/broadleaved.svg"
} }
}, },
{ {
@ -601,7 +602,7 @@
}, },
"icon": { "icon": {
"class": "small", "class": "small",
"path": "./assets/layers/tree_node/needleleaved.svg" "path": "./assets/layers/tree/needleleaved.svg"
} }
}, },
{ {
@ -626,7 +627,7 @@
"hideInAnswer": true, "hideInAnswer": true,
"icon": { "icon": {
"class": "small", "class": "small",
"path": "./assets/layers/tree_node/leafless.svg" "path": "./assets/layers/tree/leafless.svg"
} }
}, },
{ {
@ -714,7 +715,7 @@
} }
}, },
{ {
"id": "tree_node-name", "id": "tree-name",
"question": { "question": {
"en": "Does the tree have a name?", "en": "Does the tree have a name?",
"ca": "Té nom aquest arbre?", "ca": "Té nom aquest arbre?",
@ -819,7 +820,7 @@
}, },
"icon": { "icon": {
"class": "small", "class": "small",
"path": "./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg" "path": "./assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg"
} }
}, },
{ {
@ -915,7 +916,7 @@
} }
}, },
{ {
"id": "tree_node-ref:OnroerendErfgoed", "id": "tree-ref:OnroerendErfgoed",
"question": { "question": {
"en": "What is the ID issued by Onroerend Erfgoed Flanders?", "en": "What is the ID issued by Onroerend Erfgoed Flanders?",
"ca": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?", "ca": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?",
@ -929,17 +930,25 @@
"pt": "Qual é o ID emitido por Onroerend Erfgoed Flanders?" "pt": "Qual é o ID emitido por Onroerend Erfgoed Flanders?"
}, },
"render": { "render": {
"en": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "before": {
"ca": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/>Identifiació Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "en": "Onroerend Erfgoed ID: ",
"cs": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "ca": "Identifiació Onroerend Erfgoed: ",
"da": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "cs": "Onroerend Erfgoed ID: ",
"de": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed Kennung: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "da": "Onroerend Erfgoed ID: ",
"es": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID de Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "de": "Onroerend Erfgoed Kennung: ",
"fr": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "es": "ID de Onroerend Erfgoed: ",
"it": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "fr": "Identifiant Onroerend Erfgoed : ",
"nl": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>", "it": "ID Onroerend Erfgoed: ",
"ru": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "nl": "Onroerend Erfgoed-ID: ",
"ru": "Onroerend Erfgoed ID:"
},
"special": {
"type": "link",
"href": "https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}",
"text": "{ref:OnroerendErfgoed}"
}
}, },
"icon": "./assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg",
"freeform": { "freeform": {
"key": "ref:OnroerendErfgoed", "key": "ref:OnroerendErfgoed",
"type": "nat" "type": "nat"
@ -966,16 +975,9 @@
"pt": "Qual é o ID do Wikidata para esta árvore?" "pt": "Qual é o ID do Wikidata para esta árvore?"
}, },
"render": { "render": {
"en": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>", "special": {
"ca": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/>Wikidata<a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>", "type": "wikipedia"
"cs": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>", }
"da": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"de": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"es": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"fr": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata : <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"it": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"nl": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
"ru": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
}, },
"freeform": { "freeform": {
"key": "wikidata", "key": "wikidata",
@ -990,9 +992,6 @@
} }
} }
], ],
"deletion": {
"minNeededChangesets": 5
},
"allowMove": { "allowMove": {
"enableRelocation": false, "enableRelocation": false,
"enableImproveAccuracy": true "enableImproveAccuracy": true

0
assets/layers/tree_node/unknown.svg → assets/layers/tree/unknown.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

0
assets/layers/tree_node/unknown.svg.license → assets/layers/tree/unknown.svg.license
View file

2
assets/themes/nature/nature.json
View file

@ -78,7 +78,7 @@
} }
}, },
{ {
"builtin": "tree_node", "builtin": "tree",
"override": { "override": {
"minzoom": 18, "minzoom": 18,
"isCounted": false, "isCounted": false,

2
assets/themes/trees/trees.json
View file

@ -74,7 +74,7 @@
"Midgard" "Midgard"
], ],
"layers": [ "layers": [
"tree_node" "tree"
], ],
"osmApiTileSize": 18, "osmApiTileSize": 18,
"widenFactor": 0.2 "widenFactor": 0.2

19
langs/layers/ca.json
View file

@ -12584,7 +12584,7 @@
"render": "Parada de transport públic" "render": "Parada de transport públic"
} }
}, },
"tree_node": { "tree": {
"description": "Una capa que mostra arbres", "description": "Una capa que mostra arbres",
"name": "Arbre", "name": "Arbre",
"presets": { "presets": {
@ -12685,10 +12685,7 @@
}, },
"question": "És un arbre de fulla ampla o d'agulla?" "question": "És un arbre de fulla ampla o d'agulla?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "De quina espècie és aquest arbre?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "L'arbre no té nom." "then": "L'arbre no té nom."
@ -12697,13 +12694,17 @@
"question": "Té nom aquest arbre?", "question": "Té nom aquest arbre?",
"render": "Nom : {name}" "render": "Nom : {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?", "question": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/>Identifiació Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Identifiació Onroerend Erfgoed: "
}
},
"tree-species-wikidata": {
"question": "De quina espècie és aquest arbre?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Quin és l'identificador de Wikidata d'aquest arbre?", "question": "Quin és l'identificador de Wikidata d'aquest arbre?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/>Wikidata<a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

19
langs/layers/cs.json
View file

@ -13370,7 +13370,7 @@
"render": "Tranzitní zastávka" "render": "Tranzitní zastávka"
} }
}, },
"tree_node": { "tree": {
"description": "Vrstva zobrazující stromy", "description": "Vrstva zobrazující stromy",
"name": "Strom", "name": "Strom",
"presets": { "presets": {
@ -13477,10 +13477,7 @@
}, },
"question": "Jedná se o listnatý nebo jehličnatý strom?" "question": "Jedná se o listnatý nebo jehličnatý strom?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Jaký druh je tento strom?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "Strom nemá jméno." "then": "Strom nemá jméno."
@ -13489,13 +13486,17 @@
"question": "Má strom nějaké jméno?", "question": "Má strom nějaké jméno?",
"render": "Jméno: {name}" "render": "Jméno: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Jaké je ID vydané společností Onroerend Erfgoed Flanders?", "question": "Jaké je ID vydané společností Onroerend Erfgoed Flanders?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Onroerend Erfgoed ID: "
}
},
"tree-species-wikidata": {
"question": "Jaký druh je tento strom?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Jaké je ID Wikidata pro tento strom?", "question": "Jaké je ID Wikidata pro tento strom?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

2
langs/layers/cy.json
View file

@ -835,7 +835,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"name": "Coeden", "name": "Coeden",
"tagRenderings": { "tagRenderings": {
"tree-decidouous": { "tree-decidouous": {

19
langs/layers/da.json
View file

@ -3510,7 +3510,7 @@
"render": "Stoppested" "render": "Stoppested"
} }
}, },
"tree_node": { "tree": {
"description": "Et lag, der viser træer", "description": "Et lag, der viser træer",
"name": "Træ", "name": "Træ",
"presets": { "presets": {
@ -3597,10 +3597,7 @@
} }
} }
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Hvilken art er dette træ?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "Træet har ikke et navn." "then": "Træet har ikke et navn."
@ -3609,13 +3606,17 @@
"question": "Har træet et navn?", "question": "Har træet et navn?",
"render": "Navn: {name}" "render": "Navn: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Hvad er ID udstedt af Onroerend Erfgoed Flanders?", "question": "Hvad er ID udstedt af Onroerend Erfgoed Flanders?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Onroerend Erfgoed ID: "
}
},
"tree-species-wikidata": {
"question": "Hvilken art er dette træ?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Hvad er Wikidata-id'et for dette træ?", "question": "Hvad er Wikidata-id'et for dette træ?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

19
langs/layers/de.json
View file

@ -12573,7 +12573,7 @@
"render": "Haltestelle" "render": "Haltestelle"
} }
}, },
"tree_node": { "tree": {
"description": "Eine Ebene, die Bäume zeigt", "description": "Eine Ebene, die Bäume zeigt",
"name": "Bäume", "name": "Bäume",
"presets": { "presets": {
@ -12674,10 +12674,7 @@
}, },
"question": "Ist dies ein Laub- oder Nadelbaum?" "question": "Ist dies ein Laub- oder Nadelbaum?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Um welche Baumart handelt es sich?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "Der Baum hat keinen Namen." "then": "Der Baum hat keinen Namen."
@ -12686,13 +12683,17 @@
"question": "Hat der Baum einen Namen?", "question": "Hat der Baum einen Namen?",
"render": "Name: {name}" "render": "Name: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?", "question": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed Kennung: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Onroerend Erfgoed Kennung: "
}
},
"tree-species-wikidata": {
"question": "Um welche Baumart handelt es sich?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Was ist das passende Wikidata Element zu diesem Baum?", "question": "Was ist das passende Wikidata Element zu diesem Baum?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

19
langs/layers/en.json
View file

@ -13690,7 +13690,7 @@
"render": "Transit Stop" "render": "Transit Stop"
} }
}, },
"tree_node": { "tree": {
"description": "A layer showing trees", "description": "A layer showing trees",
"name": "Tree", "name": "Tree",
"presets": { "presets": {
@ -13797,10 +13797,7 @@
}, },
"question": "Is this a broadleaved or needleleaved tree?" "question": "Is this a broadleaved or needleleaved tree?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "What species is this tree?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "The tree does not have a name." "then": "The tree does not have a name."
@ -13809,13 +13806,17 @@
"question": "Does the tree have a name?", "question": "Does the tree have a name?",
"render": "Name: {name}" "render": "Name: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "What is the ID issued by Onroerend Erfgoed Flanders?", "question": "What is the ID issued by Onroerend Erfgoed Flanders?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Onroerend Erfgoed ID: "
}
},
"tree-species-wikidata": {
"question": "What species is this tree?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "What is the Wikidata ID for this tree?", "question": "What is the Wikidata ID for this tree?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

4
langs/layers/eo.json
View file

@ -211,9 +211,9 @@
} }
} }
}, },
"tree_node": { "tree": {
"tagRenderings": { "tagRenderings": {
"tree_node-name": { "tree-name": {
"render": "Nomo: {name}" "render": "Nomo: {name}"
} }
}, },

19
langs/layers/es.json
View file

@ -11452,7 +11452,7 @@
"render": "Parada de transporte" "render": "Parada de transporte"
} }
}, },
"tree_node": { "tree": {
"description": "Una capa que muestra árboles", "description": "Una capa que muestra árboles",
"name": "Árbol", "name": "Árbol",
"presets": { "presets": {
@ -11553,10 +11553,7 @@
}, },
"question": "¿Es este un árbol de hoja ancha o acicular?" "question": "¿Es este un árbol de hoja ancha o acicular?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "¿De qué especie es este árbol?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "El árbol no tiene nombre." "then": "El árbol no tiene nombre."
@ -11565,13 +11562,17 @@
"question": "¿Tiene el árbol un nombre?", "question": "¿Tiene el árbol un nombre?",
"render": "Nombre: {name}" "render": "Nombre: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "¿Cuál es el ID emitido por Onroerend Erfgoed Flandes?", "question": "¿Cuál es el ID emitido por Onroerend Erfgoed Flandes?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID de Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "ID de Onroerend Erfgoed: "
}
},
"tree-species-wikidata": {
"question": "¿De qué especie es este árbol?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "¿Cuál es el ID de Wikidata para este árbol?", "question": "¿Cuál es el ID de Wikidata para este árbol?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

19
langs/layers/fr.json
View file

@ -6930,7 +6930,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"description": "Une couche montrant les arbres", "description": "Une couche montrant les arbres",
"name": "Arbre", "name": "Arbre",
"presets": { "presets": {
@ -7031,10 +7031,7 @@
}, },
"question": "Cet arbre est-il un feuillu ou un résineux ?" "question": "Cet arbre est-il un feuillu ou un résineux ?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Quelle est l'espèce de cet arbre ?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "L'arbre n'a pas de nom." "then": "L'arbre n'a pas de nom."
@ -7043,13 +7040,17 @@
"question": "L'arbre a-t-il un nom ?", "question": "L'arbre a-t-il un nom ?",
"render": "Nom : {name}" "render": "Nom : {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Quel est son identifiant donné par Onroerend Erfgoed ?", "question": "Quel est son identifiant donné par Onroerend Erfgoed ?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Identifiant Onroerend Erfgoed : "
}
},
"tree-species-wikidata": {
"question": "Quelle est l'espèce de cet arbre ?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Quel est l'identifiant Wikidata de cet arbre ?", "question": "Quel est l'identifiant Wikidata de cet arbre ?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata : <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

10
langs/layers/id.json
View file

@ -764,7 +764,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"presets": { "presets": {
"2": { "2": {
"title": "Pohon" "title": "Pohon"
@ -804,10 +804,7 @@
} }
} }
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Spesies pohon apa ini?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "Pohon ini tidak memiliki nama." "then": "Pohon ini tidak memiliki nama."
@ -815,6 +812,9 @@
}, },
"question": "Apakah pohon ini memiliki nama?", "question": "Apakah pohon ini memiliki nama?",
"render": "Nama: {name}" "render": "Nama: {name}"
},
"tree-species-wikidata": {
"question": "Spesies pohon apa ini?"
} }
} }
}, },

19
langs/layers/it.json
View file

@ -13269,7 +13269,7 @@
"render": "Fermata dei mezzi pubblici" "render": "Fermata dei mezzi pubblici"
} }
}, },
"tree_node": { "tree": {
"description": "Un livello che mostra gli alberi", "description": "Un livello che mostra gli alberi",
"name": "Albero", "name": "Albero",
"presets": { "presets": {
@ -13376,10 +13376,7 @@
}, },
"question": "Questo è un albero latifoglie o aghifoglie?" "question": "Questo è un albero latifoglie o aghifoglie?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Di che specie è questo albero?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "L'albero non ha un nome." "then": "L'albero non ha un nome."
@ -13388,13 +13385,17 @@
"question": "L'albero ha un nome?", "question": "L'albero ha un nome?",
"render": "Nome: {name}" "render": "Nome: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Qual è l'ID rilasciato da Onroerend Erfgoed Fiandre?", "question": "Qual è l'ID rilasciato da Onroerend Erfgoed Fiandre?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "ID Onroerend Erfgoed: "
}
},
"tree-species-wikidata": {
"question": "Di che specie è questo albero?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Qual è l'ID Wikidata per questo albero?", "question": "Qual è l'ID Wikidata per questo albero?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

19
langs/layers/nl.json
View file

@ -10726,7 +10726,7 @@
"render": "OV-halte" "render": "OV-halte"
} }
}, },
"tree_node": { "tree": {
"description": "Een laag die bomen toont", "description": "Een laag die bomen toont",
"name": "Boom", "name": "Boom",
"presets": { "presets": {
@ -10833,10 +10833,7 @@
}, },
"question": "Is dit een naald- of loofboom?" "question": "Is dit een naald- of loofboom?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Wat is de boomsoort?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "De boom heeft geen naam." "then": "De boom heeft geen naam."
@ -10845,13 +10842,17 @@
"question": "Heeft de boom een naam?", "question": "Heeft de boom een naam?",
"render": "Naam: {name}" "render": "Naam: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?", "question": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
"before": "Onroerend Erfgoed-ID: "
}
},
"tree-species-wikidata": {
"question": "Wat is de boomsoort?"
}, },
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Wat is het Wikidata-ID van deze boom?", "question": "Wat is het Wikidata-ID van deze boom?"
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

2
langs/layers/pl.json
View file

@ -3583,7 +3583,7 @@
"render": "Ścieżka" "render": "Ścieżka"
} }
}, },
"tree_node": { "tree": {
"tagRenderings": { "tagRenderings": {
"tree-leaf_type": { "tree-leaf_type": {
"mappings": { "mappings": {

12
langs/layers/pt.json
View file

@ -1777,7 +1777,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"name": "Árvore", "name": "Árvore",
"presets": { "presets": {
"0": { "0": {
@ -1872,10 +1872,7 @@
}, },
"question": "Esta é uma árvore de folhas largas ou acículas?" "question": "Esta é uma árvore de folhas largas ou acículas?"
}, },
"tree-species-wikidata": { "tree-name": {
"question": "Que espécie é esta árvore?"
},
"tree_node-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "A árvore não tem nome." "then": "A árvore não tem nome."
@ -1884,9 +1881,12 @@
"question": "A árvore tem nome?", "question": "A árvore tem nome?",
"render": "Nome: {name}" "render": "Nome: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"question": "Qual é o ID emitido por Onroerend Erfgoed Flanders?" "question": "Qual é o ID emitido por Onroerend Erfgoed Flanders?"
}, },
"tree-species-wikidata": {
"question": "Que espécie é esta árvore?"
},
"tree_node-wikidata": { "tree_node-wikidata": {
"question": "Qual é o ID do Wikidata para esta árvore?" "question": "Qual é o ID do Wikidata para esta árvore?"
} }

2
langs/layers/pt_BR.json
View file

@ -1611,7 +1611,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"name": "Árvore", "name": "Árvore",
"presets": { "presets": {
"2": { "2": {

13
langs/layers/ru.json
View file

@ -1977,7 +1977,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"name": "Дерево", "name": "Дерево",
"presets": { "presets": {
"0": { "0": {
@ -2004,7 +2004,7 @@
}, },
"question": "Это дерево вечнозелёное или листопадное?" "question": "Это дерево вечнозелёное или листопадное?"
}, },
"tree_node-name": { "tree-name": {
"mappings": { "mappings": {
"0": { "0": {
"then": "У этого дерева нет названия." "then": "У этого дерева нет названия."
@ -2013,11 +2013,10 @@
"question": "Есть ли у этого дерева название?", "question": "Есть ли у этого дерева название?",
"render": "Название: {name}" "render": "Название: {name}"
}, },
"tree_node-ref:OnroerendErfgoed": { "tree-ref:OnroerendErfgoed": {
"render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>" "render": {
}, "before": "Onroerend Erfgoed ID:"
"tree_node-wikidata": { }
"render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
} }
}, },
"title": { "title": {

2
langs/layers/uk.json
View file

@ -2998,7 +2998,7 @@
} }
} }
}, },
"tree_node": { "tree": {
"tagRenderings": { "tagRenderings": {
"tree-species-wikidata": { "tree-species-wikidata": {
"question": "Якого виду це дерево?" "question": "Якого виду це дерево?"

4
src/UI/InputElement/Validators/WikidataValidator.ts
View file

@ -106,6 +106,10 @@ Another example is to search for species and trees:
if (str === undefined) { if (str === undefined) {
return false return false
} }
if (str.length === 0) {
// Don't show an exclamation mark if empty, the other code will prevent saving
return true
}
if (str.length == 1) { if (str.length == 1) {
return false return false
} }

40
src/UI/Popup/TagRendering/FreeformInput.svelte
View file

@ -34,7 +34,7 @@
onDestroy( onDestroy(
value.addCallbackD(() => { value.addCallbackD(() => {
dispatch("selected") dispatch("selected")
}) }),
) )
function getCountry() { function getCountry() {
@ -55,17 +55,17 @@
on:submit on:submit
/> />
{:else} {:else}
<ValidatedInput <ValidatedInput
{feedback} {feedback}
{getCountry} {getCountry}
{unit} {unit}
on:selected on:selected
on:submit on:submit
type={config.freeform.type} type={config.freeform.type}
{placeholder} {placeholder}
{value} {value}
range={config.freeform.range} range={config.freeform.range}
/> />
{/if} {/if}
</Inline> </Inline>
{:else if !hideInput} {:else if !hideInput}
@ -84,13 +84,13 @@
{/if} {/if}
{#if !(inline && hideInput)} {#if !(inline && hideInput)}
<InputHelper <InputHelper
args={config.freeform.args} args={config.freeform.args}
{feature} {feature}
type={config.freeform.type} type={config.freeform.type}
{value} {value}
{state} {state}
on:submit on:submit
/> />
{/if} {/if}
</div> </div>