diff --git a/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg b/assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg similarity index 100% rename from assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg rename to assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg diff --git a/assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license b/assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg.license similarity index 100% rename from assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg.license rename to assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg.license diff --git a/assets/layers/tree_node/broadleaved.svg b/assets/layers/tree/broadleaved.svg similarity index 100% rename from assets/layers/tree_node/broadleaved.svg rename to assets/layers/tree/broadleaved.svg diff --git a/assets/layers/tree_node/broadleaved.svg.license b/assets/layers/tree/broadleaved.svg.license similarity index 100% rename from assets/layers/tree_node/broadleaved.svg.license rename to assets/layers/tree/broadleaved.svg.license diff --git a/assets/layers/tree_node/leafless.svg b/assets/layers/tree/leafless.svg similarity index 100% rename from assets/layers/tree_node/leafless.svg rename to assets/layers/tree/leafless.svg diff --git a/assets/layers/tree_node/leafless.svg.license b/assets/layers/tree/leafless.svg.license similarity index 100% rename from assets/layers/tree_node/leafless.svg.license rename to assets/layers/tree/leafless.svg.license diff --git a/assets/layers/tree_node/license_info.json b/assets/layers/tree/license_info.json similarity index 100% rename from assets/layers/tree_node/license_info.json rename to assets/layers/tree/license_info.json diff --git a/assets/layers/tree_node/needleleaved.svg b/assets/layers/tree/needleleaved.svg similarity index 100% rename from assets/layers/tree_node/needleleaved.svg rename to assets/layers/tree/needleleaved.svg diff --git a/assets/layers/tree_node/needleleaved.svg.license b/assets/layers/tree/needleleaved.svg.license similarity index 100% rename from assets/layers/tree_node/needleleaved.svg.license rename to assets/layers/tree/needleleaved.svg.license diff --git a/assets/layers/tree_node/palm.svg b/assets/layers/tree/palm.svg similarity index 100% rename from assets/layers/tree_node/palm.svg rename to assets/layers/tree/palm.svg diff --git a/assets/layers/tree_node/palm.svg.license b/assets/layers/tree/palm.svg.license similarity index 100% rename from assets/layers/tree_node/palm.svg.license rename to assets/layers/tree/palm.svg.license diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree/tree.json similarity index 86% rename from assets/layers/tree_node/tree_node.json rename to assets/layers/tree/tree.json index 5131fb597..7959b01b9 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree/tree.json @@ -1,5 +1,5 @@ { - "id": "tree_node", + "id": "tree", "name": { "en": "Tree", "ca": "Arbre", @@ -96,7 +96,7 @@ }, { "icon": { - "render": "./assets/layers/tree_node/unknown.svg", + "render": "./assets/layers/tree/unknown.svg", "mappings": [ { "if": { @@ -104,7 +104,7 @@ "leaf_type=broadleaved" ] }, - "then": "./assets/layers/tree_node/broadleaved.svg" + "then": "./assets/layers/tree/broadleaved.svg" }, { "if": { @@ -112,7 +112,7 @@ "leaf_type=needleleaved" ] }, - "then": "./assets/layers/tree_node/needleleaved.svg" + "then": "./assets/layers/tree/needleleaved.svg" }, { "if": { @@ -120,7 +120,7 @@ "leaf_type=palm" ] }, - "then": "./assets/layers/tree_node/palm.svg" + "then": "./assets/layers/tree/palm.svg" } ] } @@ -272,6 +272,7 @@ "freeform": { "key": "species:wikidata", "type": "wikidata", + "inline": false, "helperArgs": [ "species", { @@ -578,7 +579,7 @@ }, "icon": { "class": "small", - "path": "./assets/layers/tree_node/broadleaved.svg" + "path": "./assets/layers/tree/broadleaved.svg" } }, { @@ -601,7 +602,7 @@ }, "icon": { "class": "small", - "path": "./assets/layers/tree_node/needleleaved.svg" + "path": "./assets/layers/tree/needleleaved.svg" } }, { @@ -626,7 +627,7 @@ "hideInAnswer": true, "icon": { "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": { "en": "Does the tree have a name?", "ca": "Té nom aquest arbre?", @@ -819,7 +820,7 @@ }, "icon": { "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": { "en": "What is the ID issued by 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?" }, "render": { - "en": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}", - "ca": "\"\"/Identifiació Onroerend Erfgoed: {ref:OnroerendErfgoed}", - "cs": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}", - "da": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}", - "de": "\"\"/ Onroerend Erfgoed Kennung: {ref:OnroerendErfgoed}", - "es": "\"\"/ ID de Onroerend Erfgoed: {ref:OnroerendErfgoed}", - "fr": "\"\"/ Identifiant Onroerend Erfgoed : {ref:OnroerendErfgoed}", - "it": "\"\"/ ID Onroerend Erfgoed: {ref:OnroerendErfgoed}", - "nl": "\"\"/ Onroerend Erfgoed-ID: {ref:OnroerendErfgoed}", - "ru": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}" + "before": { + "en": "Onroerend Erfgoed ID: ", + "ca": "Identifiació Onroerend Erfgoed: ", + "cs": "Onroerend Erfgoed ID: ", + "da": "Onroerend Erfgoed ID: ", + "de": "Onroerend Erfgoed Kennung: ", + "es": "ID de Onroerend Erfgoed: ", + "fr": "Identifiant Onroerend Erfgoed : ", + "it": "ID Onroerend Erfgoed: ", + "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": { "key": "ref:OnroerendErfgoed", "type": "nat" @@ -966,16 +975,9 @@ "pt": "Qual é o ID do Wikidata para esta árvore?" }, "render": { - "en": "\"\"/ Wikidata: {wikidata}", - "ca": "\"\"/Wikidata{wikidata}", - "cs": "\"\"/ Wikidata: {wikidata}", - "da": "\"\"/ Wikidata: {wikidata}", - "de": "\"\"/ Wikidata: {wikidata}", - "es": "\"\"/ Wikidata: {wikidata}", - "fr": "\"\"/ Wikidata : {wikidata}", - "it": "\"\"/ Wikidata: {wikidata}", - "nl": "\"\"/ Wikidata: {wikidata}", - "ru": "\"\"/ Wikidata: {wikidata}" + "special": { + "type": "wikipedia" + } }, "freeform": { "key": "wikidata", @@ -990,9 +992,6 @@ } } ], - "deletion": { - "minNeededChangesets": 5 - }, "allowMove": { "enableRelocation": false, "enableImproveAccuracy": true diff --git a/assets/layers/tree_node/unknown.svg b/assets/layers/tree/unknown.svg similarity index 100% rename from assets/layers/tree_node/unknown.svg rename to assets/layers/tree/unknown.svg diff --git a/assets/layers/tree_node/unknown.svg.license b/assets/layers/tree/unknown.svg.license similarity index 100% rename from assets/layers/tree_node/unknown.svg.license rename to assets/layers/tree/unknown.svg.license diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json index 55031965d..08571b3f8 100644 --- a/assets/themes/nature/nature.json +++ b/assets/themes/nature/nature.json @@ -78,7 +78,7 @@ } }, { - "builtin": "tree_node", + "builtin": "tree", "override": { "minzoom": 18, "isCounted": false, diff --git a/assets/themes/trees/trees.json b/assets/themes/trees/trees.json index 3cc32641d..25d5574e5 100644 --- a/assets/themes/trees/trees.json +++ b/assets/themes/trees/trees.json @@ -74,7 +74,7 @@ "Midgard" ], "layers": [ - "tree_node" + "tree" ], "osmApiTileSize": 18, "widenFactor": 0.2 diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 54dd593b5..e4ac8aee9 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -12584,7 +12584,7 @@ "render": "Parada de transport públic" } }, - "tree_node": { + "tree": { "description": "Una capa que mostra arbres", "name": "Arbre", "presets": { @@ -12685,10 +12685,7 @@ }, "question": "És un arbre de fulla ampla o d'agulla?" }, - "tree-species-wikidata": { - "question": "De quina espècie és aquest arbre?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "L'arbre no té nom." @@ -12697,13 +12694,17 @@ "question": "Té nom aquest arbre?", "render": "Nom : {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?", - "render": "\"\"/Identifiació Onroerend Erfgoed: {ref:OnroerendErfgoed}" + "render": { + "before": "Identifiació Onroerend Erfgoed: " + } + }, + "tree-species-wikidata": { + "question": "De quina espècie és aquest arbre?" }, "tree_node-wikidata": { - "question": "Quin és l'identificador de Wikidata d'aquest arbre?", - "render": "\"\"/Wikidata{wikidata}" + "question": "Quin és l'identificador de Wikidata d'aquest arbre?" } }, "title": { diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 319fb8195..f43c5248f 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -13370,7 +13370,7 @@ "render": "Tranzitní zastávka" } }, - "tree_node": { + "tree": { "description": "Vrstva zobrazující stromy", "name": "Strom", "presets": { @@ -13477,10 +13477,7 @@ }, "question": "Jedná se o listnatý nebo jehličnatý strom?" }, - "tree-species-wikidata": { - "question": "Jaký druh je tento strom?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "Strom nemá jméno." @@ -13489,13 +13486,17 @@ "question": "Má strom nějaké jméno?", "render": "Jméno: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Jaké je ID vydané společností Onroerend Erfgoed Flanders?", - "render": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}" + "render": { + "before": "Onroerend Erfgoed ID: " + } + }, + "tree-species-wikidata": { + "question": "Jaký druh je tento strom?" }, "tree_node-wikidata": { - "question": "Jaké je ID Wikidata pro tento strom?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "Jaké je ID Wikidata pro tento strom?" } }, "title": { diff --git a/langs/layers/cy.json b/langs/layers/cy.json index 54dbfc505..2f2908031 100644 --- a/langs/layers/cy.json +++ b/langs/layers/cy.json @@ -835,7 +835,7 @@ } } }, - "tree_node": { + "tree": { "name": "Coeden", "tagRenderings": { "tree-decidouous": { diff --git a/langs/layers/da.json b/langs/layers/da.json index d788ed127..b704c09a8 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -3510,7 +3510,7 @@ "render": "Stoppested" } }, - "tree_node": { + "tree": { "description": "Et lag, der viser træer", "name": "Træ", "presets": { @@ -3597,10 +3597,7 @@ } } }, - "tree-species-wikidata": { - "question": "Hvilken art er dette træ?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "Træet har ikke et navn." @@ -3609,13 +3606,17 @@ "question": "Har træet et navn?", "render": "Navn: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Hvad er ID udstedt af Onroerend Erfgoed Flanders?", - "render": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}" + "render": { + "before": "Onroerend Erfgoed ID: " + } + }, + "tree-species-wikidata": { + "question": "Hvilken art er dette træ?" }, "tree_node-wikidata": { - "question": "Hvad er Wikidata-id'et for dette træ?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "Hvad er Wikidata-id'et for dette træ?" } }, "title": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 7b8869eeb..27c384de1 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -12573,7 +12573,7 @@ "render": "Haltestelle" } }, - "tree_node": { + "tree": { "description": "Eine Ebene, die Bäume zeigt", "name": "Bäume", "presets": { @@ -12674,10 +12674,7 @@ }, "question": "Ist dies ein Laub- oder Nadelbaum?" }, - "tree-species-wikidata": { - "question": "Um welche Baumart handelt es sich?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "Der Baum hat keinen Namen." @@ -12686,13 +12683,17 @@ "question": "Hat der Baum einen Namen?", "render": "Name: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?", - "render": "\"\"/ Onroerend Erfgoed Kennung: {ref:OnroerendErfgoed}" + "render": { + "before": "Onroerend Erfgoed Kennung: " + } + }, + "tree-species-wikidata": { + "question": "Um welche Baumart handelt es sich?" }, "tree_node-wikidata": { - "question": "Was ist das passende Wikidata Element zu diesem Baum?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "Was ist das passende Wikidata Element zu diesem Baum?" } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index d5c81adcf..c9632acd7 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -13690,7 +13690,7 @@ "render": "Transit Stop" } }, - "tree_node": { + "tree": { "description": "A layer showing trees", "name": "Tree", "presets": { @@ -13797,10 +13797,7 @@ }, "question": "Is this a broadleaved or needleleaved tree?" }, - "tree-species-wikidata": { - "question": "What species is this tree?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "The tree does not have a name." @@ -13809,13 +13806,17 @@ "question": "Does the tree have a name?", "render": "Name: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "What is the ID issued by Onroerend Erfgoed Flanders?", - "render": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}" + "render": { + "before": "Onroerend Erfgoed ID: " + } + }, + "tree-species-wikidata": { + "question": "What species is this tree?" }, "tree_node-wikidata": { - "question": "What is the Wikidata ID for this tree?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "What is the Wikidata ID for this tree?" } }, "title": { diff --git a/langs/layers/eo.json b/langs/layers/eo.json index 65274ecbd..cbdf2e8d2 100644 --- a/langs/layers/eo.json +++ b/langs/layers/eo.json @@ -211,9 +211,9 @@ } } }, - "tree_node": { + "tree": { "tagRenderings": { - "tree_node-name": { + "tree-name": { "render": "Nomo: {name}" } }, diff --git a/langs/layers/es.json b/langs/layers/es.json index bd188f450..0baced4d3 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -11452,7 +11452,7 @@ "render": "Parada de transporte" } }, - "tree_node": { + "tree": { "description": "Una capa que muestra árboles", "name": "Árbol", "presets": { @@ -11553,10 +11553,7 @@ }, "question": "¿Es este un árbol de hoja ancha o acicular?" }, - "tree-species-wikidata": { - "question": "¿De qué especie es este árbol?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "El árbol no tiene nombre." @@ -11565,13 +11562,17 @@ "question": "¿Tiene el árbol un nombre?", "render": "Nombre: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "¿Cuál es el ID emitido por Onroerend Erfgoed Flandes?", - "render": "\"\"/ ID de Onroerend Erfgoed: {ref:OnroerendErfgoed}" + "render": { + "before": "ID de Onroerend Erfgoed: " + } + }, + "tree-species-wikidata": { + "question": "¿De qué especie es este árbol?" }, "tree_node-wikidata": { - "question": "¿Cuál es el ID de Wikidata para este árbol?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "¿Cuál es el ID de Wikidata para este árbol?" } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 7098d2a0e..9321344af 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -6930,7 +6930,7 @@ } } }, - "tree_node": { + "tree": { "description": "Une couche montrant les arbres", "name": "Arbre", "presets": { @@ -7031,10 +7031,7 @@ }, "question": "Cet arbre est-il un feuillu ou un résineux ?" }, - "tree-species-wikidata": { - "question": "Quelle est l'espèce de cet arbre ?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "L'arbre n'a pas de nom." @@ -7043,13 +7040,17 @@ "question": "L'arbre a-t-il un nom ?", "render": "Nom : {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Quel est son identifiant donné par Onroerend Erfgoed ?", - "render": "\"\"/ Identifiant Onroerend Erfgoed : {ref:OnroerendErfgoed}" + "render": { + "before": "Identifiant Onroerend Erfgoed : " + } + }, + "tree-species-wikidata": { + "question": "Quelle est l'espèce de cet arbre ?" }, "tree_node-wikidata": { - "question": "Quel est l'identifiant Wikidata de cet arbre ?", - "render": "\"\"/ Wikidata : {wikidata}" + "question": "Quel est l'identifiant Wikidata de cet arbre ?" } }, "title": { diff --git a/langs/layers/id.json b/langs/layers/id.json index 465de7229..cc5cd707c 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -764,7 +764,7 @@ } } }, - "tree_node": { + "tree": { "presets": { "2": { "title": "Pohon" @@ -804,10 +804,7 @@ } } }, - "tree-species-wikidata": { - "question": "Spesies pohon apa ini?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "Pohon ini tidak memiliki nama." @@ -815,6 +812,9 @@ }, "question": "Apakah pohon ini memiliki nama?", "render": "Nama: {name}" + }, + "tree-species-wikidata": { + "question": "Spesies pohon apa ini?" } } }, diff --git a/langs/layers/it.json b/langs/layers/it.json index d01597f11..5a210ede3 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -13269,7 +13269,7 @@ "render": "Fermata dei mezzi pubblici" } }, - "tree_node": { + "tree": { "description": "Un livello che mostra gli alberi", "name": "Albero", "presets": { @@ -13376,10 +13376,7 @@ }, "question": "Questo è un albero latifoglie o aghifoglie?" }, - "tree-species-wikidata": { - "question": "Di che specie è questo albero?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "L'albero non ha un nome." @@ -13388,13 +13385,17 @@ "question": "L'albero ha un nome?", "render": "Nome: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Qual è l'ID rilasciato da Onroerend Erfgoed Fiandre?", - "render": "\"\"/ ID Onroerend Erfgoed: {ref:OnroerendErfgoed}" + "render": { + "before": "ID Onroerend Erfgoed: " + } + }, + "tree-species-wikidata": { + "question": "Di che specie è questo albero?" }, "tree_node-wikidata": { - "question": "Qual è l'ID Wikidata per questo albero?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "Qual è l'ID Wikidata per questo albero?" } }, "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index cde21b3c4..0ae22478d 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -10726,7 +10726,7 @@ "render": "OV-halte" } }, - "tree_node": { + "tree": { "description": "Een laag die bomen toont", "name": "Boom", "presets": { @@ -10833,10 +10833,7 @@ }, "question": "Is dit een naald- of loofboom?" }, - "tree-species-wikidata": { - "question": "Wat is de boomsoort?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "De boom heeft geen naam." @@ -10845,13 +10842,17 @@ "question": "Heeft de boom een naam?", "render": "Naam: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?", - "render": "\"\"/ Onroerend Erfgoed-ID: {ref:OnroerendErfgoed}" + "render": { + "before": "Onroerend Erfgoed-ID: " + } + }, + "tree-species-wikidata": { + "question": "Wat is de boomsoort?" }, "tree_node-wikidata": { - "question": "Wat is het Wikidata-ID van deze boom?", - "render": "\"\"/ Wikidata: {wikidata}" + "question": "Wat is het Wikidata-ID van deze boom?" } }, "title": { diff --git a/langs/layers/pl.json b/langs/layers/pl.json index 6622991a8..decd96ce4 100644 --- a/langs/layers/pl.json +++ b/langs/layers/pl.json @@ -3583,7 +3583,7 @@ "render": "Ścieżka" } }, - "tree_node": { + "tree": { "tagRenderings": { "tree-leaf_type": { "mappings": { diff --git a/langs/layers/pt.json b/langs/layers/pt.json index d3d1dace7..6e2b577c2 100644 --- a/langs/layers/pt.json +++ b/langs/layers/pt.json @@ -1777,7 +1777,7 @@ } } }, - "tree_node": { + "tree": { "name": "Árvore", "presets": { "0": { @@ -1872,10 +1872,7 @@ }, "question": "Esta é uma árvore de folhas largas ou acículas?" }, - "tree-species-wikidata": { - "question": "Que espécie é esta árvore?" - }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "A árvore não tem nome." @@ -1884,9 +1881,12 @@ "question": "A árvore tem nome?", "render": "Nome: {name}" }, - "tree_node-ref:OnroerendErfgoed": { + "tree-ref:OnroerendErfgoed": { "question": "Qual é o ID emitido por Onroerend Erfgoed Flanders?" }, + "tree-species-wikidata": { + "question": "Que espécie é esta árvore?" + }, "tree_node-wikidata": { "question": "Qual é o ID do Wikidata para esta árvore?" } diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json index 1bb85c215..2834d9a0c 100644 --- a/langs/layers/pt_BR.json +++ b/langs/layers/pt_BR.json @@ -1611,7 +1611,7 @@ } } }, - "tree_node": { + "tree": { "name": "Árvore", "presets": { "2": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index b5ed86b3b..4cda3d5e1 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1977,7 +1977,7 @@ } } }, - "tree_node": { + "tree": { "name": "Дерево", "presets": { "0": { @@ -2004,7 +2004,7 @@ }, "question": "Это дерево вечнозелёное или листопадное?" }, - "tree_node-name": { + "tree-name": { "mappings": { "0": { "then": "У этого дерева нет названия." @@ -2013,11 +2013,10 @@ "question": "Есть ли у этого дерева название?", "render": "Название: {name}" }, - "tree_node-ref:OnroerendErfgoed": { - "render": "\"\"/ Onroerend Erfgoed ID: {ref:OnroerendErfgoed}" - }, - "tree_node-wikidata": { - "render": "\"\"/ Wikidata: {wikidata}" + "tree-ref:OnroerendErfgoed": { + "render": { + "before": "Onroerend Erfgoed ID:" + } } }, "title": { diff --git a/langs/layers/uk.json b/langs/layers/uk.json index da167fd20..3df620e97 100644 --- a/langs/layers/uk.json +++ b/langs/layers/uk.json @@ -2998,7 +2998,7 @@ } } }, - "tree_node": { + "tree": { "tagRenderings": { "tree-species-wikidata": { "question": "Якого виду це дерево?" diff --git a/src/UI/InputElement/Validators/WikidataValidator.ts b/src/UI/InputElement/Validators/WikidataValidator.ts index 58c9c46b5..51b2ccf6d 100644 --- a/src/UI/InputElement/Validators/WikidataValidator.ts +++ b/src/UI/InputElement/Validators/WikidataValidator.ts @@ -106,6 +106,10 @@ Another example is to search for species and trees: if (str === undefined) { 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) { return false } diff --git a/src/UI/Popup/TagRendering/FreeformInput.svelte b/src/UI/Popup/TagRendering/FreeformInput.svelte index 9ca78679e..850c5a8c2 100644 --- a/src/UI/Popup/TagRendering/FreeformInput.svelte +++ b/src/UI/Popup/TagRendering/FreeformInput.svelte @@ -34,7 +34,7 @@ onDestroy( value.addCallbackD(() => { dispatch("selected") - }) + }), ) function getCountry() { @@ -55,17 +55,17 @@ on:submit /> {:else} - + {/if} {:else if !hideInput} @@ -84,13 +84,13 @@ {/if} {#if !(inline && hideInput)} - + {/if}