diff --git a/Svg.ts b/Svg.ts index acff7d662a..b5cc094ba5 100644 --- a/Svg.ts +++ b/Svg.ts @@ -109,11 +109,6 @@ export default class Svg { public static crosshair_svg() { return new Img(Svg.crosshair, true);} public static crosshair_ui() { return new FixedUiElement(Svg.crosshair_img);} - public static cycle_infra = "" - public static cycle_infra_img = Img.AsImageElement(Svg.cycle_infra) - public static cycle_infra_svg() { return new Img(Svg.cycle_infra, true);} - public static cycle_infra_ui() { return new FixedUiElement(Svg.cycle_infra_img);} - public static delete_icon = " image/svg+xml " public static delete_icon_img = Img.AsImageElement(Svg.delete_icon) public static delete_icon_svg() { return new Img(Svg.delete_icon, true);} @@ -359,4 +354,4 @@ export default class Svg { public static wikipedia_svg() { return new Img(Svg.wikipedia, true);} public static wikipedia_ui() { return new FixedUiElement(Svg.wikipedia_img);} -public static All = {"SocialImageForeground.svg": Svg.SocialImageForeground,"add.svg": Svg.add,"addSmall.svg": Svg.addSmall,"ampersand.svg": Svg.ampersand,"arrow-left-smooth.svg": Svg.arrow_left_smooth,"arrow-right-smooth.svg": Svg.arrow_right_smooth,"back.svg": Svg.back,"barrier.svg": Svg.barrier,"bug.svg": Svg.bug,"camera-plus.svg": Svg.camera_plus,"checkmark.svg": Svg.checkmark,"circle.svg": Svg.circle,"clock.svg": Svg.clock,"close.svg": Svg.close,"compass.svg": Svg.compass,"cross_bottom_right.svg": Svg.cross_bottom_right,"crosshair-blue-center.svg": Svg.crosshair_blue_center,"crosshair-blue.svg": Svg.crosshair_blue,"crosshair-empty.svg": Svg.crosshair_empty,"crosshair-locked.svg": Svg.crosshair_locked,"crosshair.svg": Svg.crosshair,"cycle-infra.svg": Svg.cycle_infra,"delete_icon.svg": Svg.delete_icon,"direction.svg": Svg.direction,"direction_gradient.svg": Svg.direction_gradient,"direction_masked.svg": Svg.direction_masked,"direction_outline.svg": Svg.direction_outline,"direction_stroke.svg": Svg.direction_stroke,"down.svg": Svg.down,"envelope.svg": Svg.envelope,"floppy.svg": Svg.floppy,"gear.svg": Svg.gear,"help.svg": Svg.help,"home.svg": Svg.home,"home_white_bg.svg": Svg.home_white_bg,"josm_logo.svg": Svg.josm_logo,"layers.svg": Svg.layers,"layersAdd.svg": Svg.layersAdd,"length-crosshair.svg": Svg.length_crosshair,"logo.svg": Svg.logo,"logout.svg": Svg.logout,"mapcomplete_logo.svg": Svg.mapcomplete_logo,"mapillary.svg": Svg.mapillary,"mapillary_black.svg": Svg.mapillary_black,"min.svg": Svg.min,"no_checkmark.svg": Svg.no_checkmark,"or.svg": Svg.or,"osm-copyright.svg": Svg.osm_copyright,"osm-logo-us.svg": Svg.osm_logo_us,"osm-logo.svg": Svg.osm_logo,"pencil.svg": Svg.pencil,"phone.svg": Svg.phone,"pin.svg": Svg.pin,"plus.svg": Svg.plus,"pop-out.svg": Svg.pop_out,"reload.svg": Svg.reload,"ring.svg": Svg.ring,"search.svg": Svg.search,"send_email.svg": Svg.send_email,"share.svg": Svg.share,"square.svg": Svg.square,"star.svg": Svg.star,"star_half.svg": Svg.star_half,"star_outline.svg": Svg.star_outline,"star_outline_half.svg": Svg.star_outline_half,"statistics.svg": Svg.statistics,"translate.svg": Svg.translate,"up.svg": Svg.up,"wikidata.svg": Svg.wikidata,"wikimedia-commons-white.svg": Svg.wikimedia_commons_white,"wikipedia.svg": Svg.wikipedia};} +public static All = {"SocialImageForeground.svg": Svg.SocialImageForeground,"add.svg": Svg.add,"addSmall.svg": Svg.addSmall,"ampersand.svg": Svg.ampersand,"arrow-left-smooth.svg": Svg.arrow_left_smooth,"arrow-right-smooth.svg": Svg.arrow_right_smooth,"back.svg": Svg.back,"barrier.svg": Svg.barrier,"bug.svg": Svg.bug,"camera-plus.svg": Svg.camera_plus,"checkmark.svg": Svg.checkmark,"circle.svg": Svg.circle,"clock.svg": Svg.clock,"close.svg": Svg.close,"compass.svg": Svg.compass,"cross_bottom_right.svg": Svg.cross_bottom_right,"crosshair-blue-center.svg": Svg.crosshair_blue_center,"crosshair-blue.svg": Svg.crosshair_blue,"crosshair-empty.svg": Svg.crosshair_empty,"crosshair-locked.svg": Svg.crosshair_locked,"crosshair.svg": Svg.crosshair,"delete_icon.svg": Svg.delete_icon,"direction.svg": Svg.direction,"direction_gradient.svg": Svg.direction_gradient,"direction_masked.svg": Svg.direction_masked,"direction_outline.svg": Svg.direction_outline,"direction_stroke.svg": Svg.direction_stroke,"down.svg": Svg.down,"envelope.svg": Svg.envelope,"floppy.svg": Svg.floppy,"gear.svg": Svg.gear,"help.svg": Svg.help,"home.svg": Svg.home,"home_white_bg.svg": Svg.home_white_bg,"josm_logo.svg": Svg.josm_logo,"layers.svg": Svg.layers,"layersAdd.svg": Svg.layersAdd,"length-crosshair.svg": Svg.length_crosshair,"logo.svg": Svg.logo,"logout.svg": Svg.logout,"mapcomplete_logo.svg": Svg.mapcomplete_logo,"mapillary.svg": Svg.mapillary,"mapillary_black.svg": Svg.mapillary_black,"min.svg": Svg.min,"no_checkmark.svg": Svg.no_checkmark,"or.svg": Svg.or,"osm-copyright.svg": Svg.osm_copyright,"osm-logo-us.svg": Svg.osm_logo_us,"osm-logo.svg": Svg.osm_logo,"pencil.svg": Svg.pencil,"phone.svg": Svg.phone,"pin.svg": Svg.pin,"plus.svg": Svg.plus,"pop-out.svg": Svg.pop_out,"reload.svg": Svg.reload,"ring.svg": Svg.ring,"search.svg": Svg.search,"send_email.svg": Svg.send_email,"share.svg": Svg.share,"square.svg": Svg.square,"star.svg": Svg.star,"star_half.svg": Svg.star_half,"star_outline.svg": Svg.star_outline,"star_outline_half.svg": Svg.star_outline_half,"statistics.svg": Svg.statistics,"translate.svg": Svg.translate,"up.svg": Svg.up,"wikidata.svg": Svg.wikidata,"wikimedia-commons-white.svg": Svg.wikimedia_commons_white,"wikipedia.svg": Svg.wikipedia};} diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 7f60ced897..11a98dc73e 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -610,7 +610,8 @@ "fr": "Magasin et réparateur de vélo", "gl": "Tenda/arranxo de bicicletas", "de": "Fahrradwerkstatt/geschäft", - "it": "Negozio/riparatore di bici" + "it": "Negozio/riparatore di bici", + "ru": "Обслуживание велосипедов/магазин" }, "tags": [ "shop=bicycle" diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json index c47aa23468..5c77ff8fd4 100644 --- a/assets/layers/viewpoint/viewpoint.json +++ b/assets/layers/viewpoint/viewpoint.json @@ -5,7 +5,8 @@ "nl": "Uitzicht", "de": "Aussichtspunkt", "fr": "Point de vue", - "it": "Punto panoramico" + "it": "Punto panoramico", + "ru": "Смотровая площадка" }, "description": { "en": "A nice viewpoint or nice view. Ideal to add an image if no other category fits", diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 66d034cdc3..85cb3ebb28 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -18,7 +18,8 @@ "ru": "Какой номер телефона у {name}?", "sv": "Vad är telefonnumret till {name}?", "zh_Hant": "{name} 的電話號碼是什麼？", - "it": "Qual è il numero di telefono di {name}?" + "it": "Qual è il numero di telefono di {name}?", + "pt_BR": "Qual o número de telefone de {name}?" }, "render": "{phone}", "freeform": { @@ -49,7 +50,9 @@ "ru": "Какой адрес электронной почты у {name}?", "id": "Apa alamat surel dari {name}?", "zh_Hant": "{name} 的電子郵件地址是什麼？", - "it": "Qual è l'indirizzo email di {name}?" + "it": "Qual è l'indirizzo email di {name}?", + "de": "Was ist die Mail-Adresse von {name}?", + "pt_BR": "Qual o endereço de e-mail de {name}?" }, "freeform": { "key": "email", @@ -66,7 +69,9 @@ "ru": "Какой сайт у {name}?", "id": "Apa situs web dari {name}?", "zh_Hant": "{name} 網址是什麼？", - "it": "Qual è il sito web di {name}?" + "it": "Qual è il sito web di {name}?", + "de": "Was ist die Website von {name}?", + "pt_BR": "Qual o site de {name}?" }, "render": "{website}", "freeform": { @@ -82,7 +87,8 @@ "nb_NO": "Er det noe mer som er relevant du ikke kunne opplyse om i tidligere svar? Legg det til her.
Ikke gjenta fakta som allerede er nevnt", "ru": "Есть ли еще что-то важное, о чем вы не смогли рассказать в предыдущих вопросах? Добавьте это здесь.
Не повторяйте уже изложенные факты", "zh_Hant": "有什麼相關的資訊你無法在先前的問題回應的嗎？請加在這邊吧。
不要重覆答覆已經知道的事情", - "it": "C'è ancora qualche informazione importante che non è stato possibile fornire nelle domande precedenti? Aggiungila qui.
Non ripetere informazioni già fornite" + "it": "C'è ancora qualche informazione importante che non è stato possibile fornire nelle domande precedenti? Aggiungila qui.
Non ripetere informazioni già fornite", + "de": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen." }, "render": "{description}", "freeform": { @@ -98,7 +104,8 @@ "nb_NO": "Hva er åpningstidene for {name})", "ru": "Какое время работы у {name}?", "zh_Hant": "{name} 的開放時間是什麼？", - "it": "Quali sono gli orari di apertura di {name}?" + "it": "Quali sono gli orari di apertura di {name}?", + "pt_BR": "Qual o horário de funcionamento de {name}?" }, "render": { "de": "

Öffnungszeiten

{opening_hours_table(opening_hours)}", @@ -127,11 +134,15 @@ "level": { "question": { "nl": "Op welke verdieping bevindt dit punt zich?", - "en": "On what level is this feature located?" + "en": "On what level is this feature located?", + "de": "In welchem Stockwerk befindet sich dieses Objekt?" }, "render": { "en": "Located on the {level}th floor", - "nl": "Bevindt zich op de {level}de verdieping" + "nl": "Bevindt zich op de {level}de verdieping", + "de": "Befindet sich im {level}ten Stock", + "pt_BR": "Localizado no {level}o andar", + "ru": "Расположено на {level}ом этаже" }, "freeform": { "key": "level", @@ -142,7 +153,9 @@ "if": "location=underground", "then": { "en": "Located underground", - "nl": "Bevindt zich ondergronds" + "nl": "Bevindt zich ondergronds", + "pt_BR": "Localizado no subsolo", + "ru": "Расположено под землей" }, "hideInAnswer": true }, @@ -150,14 +163,20 @@ "if": "level=0", "then": { "en": "Located on the ground floor", - "nl": "Bevindt zich gelijkvloers" + "nl": "Bevindt zich gelijkvloers", + "de": "Ist im Erdgeschoss", + "pt_BR": "Localizado no térreo", + "ru": "Расположено на первом этаже" } }, { "if": "level=1", "then": { "en": "Located on the first floor", - "nl": "Bevindt zich op de eerste verdieping" + "nl": "Bevindt zich op de eerste verdieping", + "de": "Ist im ersten Stock", + "pt_BR": "Localizado no primeiro andar", + "ru": "Расположено на первом этаже" } } ] diff --git a/assets/svg/cycle-infra.svg b/assets/themes/cycle_infra/cycle-infra.svg similarity index 100% rename from assets/svg/cycle-infra.svg rename to assets/themes/cycle_infra/cycle-infra.svg diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index fcc1289b5a..cf3e77c344 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -18,13 +18,13 @@ ], "maintainer": "", "defaultBackgroundId": "CartoDB.Voyager", - "icon": "./assets/svg/cycle-infra.svg", + "icon": "./assets/themes/cycle_infra/cycle-infra.svg", "version": "0", "startLat": 51, "startLon": 3.75, "startZoom": 11, "widenFactor": 0.05, - "socialImage": "./assets/svg/cycle-infra.svg", + "socialImage": "./assets/themes/cycle_infra/cycle-infra.svg", "enableDownload": true, "layers": [ { @@ -961,7 +961,7 @@ "render": "40,40,center" }, "color": { - "render": "#aaaaaa", + "render": "rgba(170, 170, 170, 0.7)", "mappings": [ { "if": "highway=cycleway", @@ -1008,7 +1008,7 @@ }, { "if": "cycleway=track", - "then": "30 15" + "then": "" }, { "if": "cycleway=shared_lane", diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json index ed362f0a3a..bd6a9f2bb2 100644 --- a/assets/themes/cycle_infra/license_info.json +++ b/assets/themes/cycle_infra/license_info.json @@ -1,4 +1,15 @@ [ + { + "authors": [ + "Dávid Gladiš", + "Hannah Declerck" + ], + "path": "cycle-infra.svg", + "license": "CC-BY", + "sources": [ + "https://thenounproject.com/davidgladis/collection/bicycles/?i=808040" + ] + }, { "authors": [ "Belgische Wetgever" diff --git a/assets/themes/widths/width.json b/assets/themes/widths/width.json index 298b9a1281..f2a4262517 100644 --- a/assets/themes/widths/width.json +++ b/assets/themes/widths/width.json @@ -69,7 +69,10 @@ "freeform": { "key": "width:carriageway", "type": "length", - "helperArgs": [21, "map"] + "helperArgs": [ + 21, + "map" + ] } }, { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index c0f5353343..74a19a9ccb 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1057,6 +1057,7 @@ } }, "viewpoint": { + "name": "Смотровая площадка", "presets": { "0": { "title": "Смотровая площадка" @@ -1069,7 +1070,6 @@ "1": { "question": "Вы хотите добавить описание?" } - }, - "name": "Смотровая площадка" + } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index 6faff774e2..5d859a6940 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -3,30 +3,30 @@ "phone": { "question": "Was ist die Telefonnummer von {name}?" }, + "email": { + "question": "Was ist die Mail-Adresse von {name}?" + }, + "website": { + "question": "Was ist die Website von {name}?" + }, + "description": { + "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen." + }, "opening_hours": { "question": "Was sind die Öffnungszeiten von {name}?", "render": "

Öffnungszeiten

{opening_hours_table(opening_hours)}" }, "level": { + "question": "In welchem Stockwerk befindet sich dieses Objekt?", + "render": "Befindet sich im {level}ten Stock", "mappings": { - "2": { - "then": "Ist im ersten Stock" - }, "1": { "then": "Ist im Erdgeschoss" + }, + "2": { + "then": "Ist im ersten Stock" } - }, - "render": "Befindet sich im {level}ten Stock", - "question": "In welchem Stockwerk befindet sich dieses Objekt?" - }, - "description": { - "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen." - }, - "website": { - "question": "Was ist die Website von {name}?" - }, - "email": { - "question": "Was ist die Mail-Adresse von {name}?" + } } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/pt_BR.json b/langs/shared-questions/pt_BR.json index 9c577c3966..7016de7f0e 100644 --- a/langs/shared-questions/pt_BR.json +++ b/langs/shared-questions/pt_BR.json @@ -1,30 +1,30 @@ { "undefined": { - "level": { - "render": "Localizado no {level}o andar", - "mappings": { - "2": { - "then": "Localizado no primeiro andar" - }, - "1": { - "then": "Localizado no térreo" - }, - "0": { - "then": "Localizado no subsolo" - } - } - }, - "opening_hours": { - "question": "Qual o horário de funcionamento de {name}?" - }, - "website": { - "question": "Qual o site de {name}?" + "phone": { + "question": "Qual o número de telefone de {name}?" }, "email": { "question": "Qual o endereço de e-mail de {name}?" }, - "phone": { - "question": "Qual o número de telefone de {name}?" + "website": { + "question": "Qual o site de {name}?" + }, + "opening_hours": { + "question": "Qual o horário de funcionamento de {name}?" + }, + "level": { + "render": "Localizado no {level}o andar", + "mappings": { + "0": { + "then": "Localizado no subsolo" + }, + "1": { + "then": "Localizado no térreo" + }, + "2": { + "then": "Localizado no primeiro andar" + } + } } } -} +} \ No newline at end of file diff --git a/langs/shared-questions/ru.json b/langs/shared-questions/ru.json index 93c56dc441..d1df15a6fc 100644 --- a/langs/shared-questions/ru.json +++ b/langs/shared-questions/ru.json @@ -17,18 +17,18 @@ "render": "

Часы работы

{opening_hours_table(opening_hours)}" }, "level": { + "render": "Расположено на {level}ом этаже", "mappings": { - "2": { - "then": "Расположено на первом этаже" + "0": { + "then": "Расположено под землей" }, "1": { "then": "Расположено на первом этаже" }, - "0": { - "then": "Расположено под землей" + "2": { + "then": "Расположено на первом этаже" } - }, - "render": "Расположено на {level}ом этаже" + } } } -} +} \ No newline at end of file