Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to iD v2.15.0 #2231

Merged
merged 1 commit into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,286 changes: 1,389 additions & 897 deletions vendor/assets/iD/iD.css.erb

Large diffs are not rendered by default.

198,335 changes: 100,983 additions & 97,352 deletions vendor/assets/iD/iD.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/community-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/fa-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/iD-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/temaki-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions vendor/assets/iD/iD/img/tnp-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions vendor/assets/iD/iD/locales/af.json
Original file line number Diff line number Diff line change
Expand Up @@ -1292,9 +1292,6 @@
"type/route/tram": {
"name": "Tremroete"
},
"vertex": {
"name": "Ander"
},
"waterway": {
"name": "Waterweg"
},
Expand Down
953 changes: 787 additions & 166 deletions vendor/assets/iD/iD/locales/ar.json

Large diffs are not rendered by default.

97 changes: 6 additions & 91 deletions vendor/assets/iD/iD/locales/ast.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
"line": "Escuadrar les esquines d'esta llinia.",
"area": "Escuadrar les esquines d'esti área."
},
"key": "S",
"annotation": {
"line": "Escuadraes les esquines d'una llinia.",
"area": "Escuadraes les esquines d'un área."
Expand All @@ -96,11 +95,8 @@
},
"straighten": {
"title": "Enderechar",
"description": "Enderechar esta llinia.",
"key": "S",
"annotation": "Enderechada una llinia.",
"too_bendy": "Nun pue enderechase porque ta doblada enforma.",
"connected_to_hidden": "Esta llinia nun puede enderechase porque ta coneutao a una carauterística tapecida."
"too_bendy": "Nun pue enderechase porque ta doblada enforma."
},
"delete": {
"title": "Desaniciar",
Expand Down Expand Up @@ -591,19 +587,13 @@
"cannot_zoom": "Nun puede alloñase más nel mou actual.",
"full_screen": "Conmutar pantalla completa",
"mapillary_images": {
"tooltip": "Fotos a nivel de rúa de Mapillary",
"title": "Capa de fotos (Mapillary)"
},
"mapillary_signs": {
"tooltip": "Señales de tráficu de Mapillary (tienes d'activar la capa de fotos)",
"title": "Capa de señales de tráficu (Mapillary)"
"tooltip": "Fotos a nivel de rúa de Mapillary"
},
"mapillary": {
"view_on_mapillary": "Ver esta imaxe'n Mapillary"
},
"openstreetcam_images": {
"tooltip": "Fotos a nivel de rúa d'OpenStreetCam",
"title": "Capa de fotos (OpenStreetCam)"
"tooltip": "Fotos a nivel de rúa d'OpenStreetCam"
},
"openstreetcam": {
"view_on_openstreetcam": "Ver esta imaxe n'OpenStreetCam"
Expand Down Expand Up @@ -736,35 +726,11 @@
"category-landuse": {
"name": "Elementos d'usu del terrén"
},
"category-natural-area": {
"name": "Elementos naturales"
},
"category-natural-line": {
"name": "Elementos naturales"
},
"category-natural-point": {
"name": "Elementos naturales"
},
"category-path": {
"name": "Elementos de camín"
},
"category-rail": {
"name": "Elementos ferroviarios"
},
"category-restriction": {
"name": "Elementos de torga"
},
"category-road": {
"name": "Elementos de carretera"
},
"category-route": {
"name": "Elementos de ruta"
},
"category-water-area": {
"name": "Elementos acuáticos"
},
"category-water-line": {
"name": "Elementos acuáticos"
}
},
"fields": {
Expand Down Expand Up @@ -1303,9 +1269,6 @@
"internet_access/fee": {
"label": "Accesu a Internet de pagu"
},
"internet_access/ssid": {
"label": "SSID (Nome de la rede)"
},
"label": {
"label": "Etiqueta"
},
Expand Down Expand Up @@ -1869,8 +1832,7 @@
"options": {
"bucket": "Calderu",
"chemical": "Químico",
"flush": "Cisterna",
"pitlatrine": "Pozu/Cucheru"
"flush": "Cisterna"
}
},
"toll": {
Expand Down Expand Up @@ -2211,8 +2173,7 @@
"terms": "carné,permisu,llicencia,conducir,conducción,escuela"
},
"amenity/embassy": {
"name": "Embaxada",
"terms": "Embaxada, Consuláu, Representación diplomática"
"name": "Embaxada"
},
"amenity/fast_food": {
"name": "Comida rápida",
Expand Down Expand Up @@ -2417,9 +2378,6 @@
"name": "Máquina de venta d'hixénicos femeninos",
"terms": "máquina,compresa,tampón"
},
"amenity/vending_machine/news_papers": {
"name": "Máquina de venta de periódicos"
},
"amenity/vending_machine/newspapers": {
"name": "Máquina de venta de periódicos",
"terms": "máquina,automática,periódicos.prensa,revistes"
Expand Down Expand Up @@ -2467,9 +2425,6 @@
"name": "Superficie de la carretera",
"terms": "firme,pisu,suelu"
},
"attraction/animal": {
"name": "Animales"
},
"attraction/big_wheel": {
"name": "Noria",
"terms": "rueda,atracciones"
Expand Down Expand Up @@ -2922,9 +2877,6 @@
"name": "Camín de caballeríes",
"terms": "Camín de ferradura"
},
"highway/bus_stop": {
"name": "Andén / Parada d'autobús"
},
"highway/corridor": {
"name": "Pasiellu d'edificiu"
},
Expand Down Expand Up @@ -3659,33 +3611,6 @@
"power/transformer": {
"name": "Tresformador"
},
"public_transport/platform": {
"name": "Andén / Parada de tresporte"
},
"public_transport/platform_bus": {
"name": "Andén / Parada d'autobús"
},
"public_transport/platform_ferry": {
"name": "Andén / Parada de ferry"
},
"public_transport/platform_light_rail": {
"name": "Andén / Parada de tren llixeru"
},
"public_transport/platform_monorail": {
"name": "Andén / Parada de monocarril"
},
"public_transport/platform_subway": {
"name": "Andén / Parada de metro"
},
"public_transport/platform_train": {
"name": "Andén / Parada de tren"
},
"public_transport/platform_tram": {
"name": "Andén / Parada de tranvía"
},
"public_transport/platform_trolleybus": {
"name": "Andén / Parada de trolebús"
},
"public_transport/station": {
"name": "Estación d'intercambiu"
},
Expand Down Expand Up @@ -3739,9 +3664,6 @@
"name": "Ferrocarril de vía estrecha",
"terms": "FEVE,Vía estrecha"
},
"railway/platform": {
"name": "Andén / Parada de tren"
},
"railway/rail": {
"name": "Carril"
},
Expand All @@ -3764,9 +3686,6 @@
"relation": {
"name": "Rellación"
},
"roundabout": {
"name": "Rotonda"
},
"route/ferry": {
"name": "Ruta de ferry"
},
Expand Down Expand Up @@ -3883,8 +3802,7 @@
"terms": "sex-shop"
},
"shop/fashion": {
"name": "Tienda de moda",
"terms": "boutique, moda"
"name": "Tienda de moda"
},
"shop/fishmonger": {
"name": "Pescadería"
Expand Down Expand Up @@ -4306,9 +4224,6 @@
"type/waterway": {
"name": "Vía acuática"
},
"vertex": {
"name": "Otru"
},
"waterway": {
"name": "Vía acuática"
},
Expand Down
36 changes: 3 additions & 33 deletions vendor/assets/iD/iD/locales/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"line": "Изправете ъглите на линията.",
"area": "Изправете ъглите на полигона."
},
"key": "S",
"annotation": {
"line": "Изправихте ъглите на линия.",
"area": "Изправихте ъглите на площен обект."
Expand All @@ -101,11 +100,8 @@
},
"straighten": {
"title": "Изправям",
"description": "Изправи тази линията.",
"key": "S",
"annotation": "Изправи линия.",
"too_bendy": "Това не може да се изправи защото се огъва твърде много.",
"connected_to_hidden": "Тази линия не може да се изправи, защото е свързана със скрит обект."
"too_bendy": "Това не може да се изправи защото се огъва твърде много."
},
"delete": {
"title": "Изтриване",
Expand Down Expand Up @@ -676,19 +672,13 @@
"cannot_zoom": "Не можете да намалявате повече в текущия режим.",
"full_screen": "Превключи на Цял Екран",
"mapillary_images": {
"tooltip": "Снимки за ниво на улицата от Mapillary",
"title": "Фото слой (Mapillary)"
},
"mapillary_signs": {
"tooltip": "Пътни знаци от Mapillary (трябва да е пуснат Фото слой)",
"title": "Слой пътни знаци (Mapillary)"
"tooltip": "Снимки за ниво на улицата от Mapillary"
},
"mapillary": {
"view_on_mapillary": "Вижте тази снимка на Mapillary"
},
"openstreetcam_images": {
"tooltip": "Снимки на ниво улица от OpenStreetCam",
"title": "Фото слой (OpenStreetCam)"
"tooltip": "Снимки на ниво улица от OpenStreetCam"
},
"openstreetcam": {
"view_on_openstreetcam": "Вижте това изображение на OpenStreetCam"
Expand Down Expand Up @@ -816,20 +806,6 @@
}
},
"presets": {
"categories": {
"category-path": {
"name": "Пътеки"
},
"category-rail": {
"name": "Железопътни Обекти"
},
"category-water-area": {
"name": "Водни Обекти"
},
"category-water-line": {
"name": "Водни Обекти"
}
},
"fields": {
"access": {
"label": "Разрешен достъп",
Expand Down Expand Up @@ -1415,9 +1391,6 @@
"internet_access/fee": {
"label": "Такса за достъп до интернет"
},
"internet_access/ssid": {
"label": "SSID (Име на мрежа)"
},
"kerb": {
"label": "Бордюр"
},
Expand Down Expand Up @@ -2657,9 +2630,6 @@
"type/route_master": {
"name": "Маршрутна схема"
},
"vertex": {
"name": "Друг"
},
"waterway": {
"name": "Води"
},
Expand Down
Loading