Skip to content

Commit

Permalink
Update to iD v2.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhousel
bhousel committed Aug 26, 2017
1 parent 8d2acb8 commit c754569
Show file tree
Hide file tree
Showing 9 changed files with 310 additions and 88 deletions.
7 changes: 4 additions & 3 deletions vendor/assets/iD/iD.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73756,10 +73756,11 @@ function uiCommit(context) {

// always update userdetails, just in case user reauthenticates as someone else
if (userDetails && userDetails.changesets_count !== undefined) {
tags.changesets_count = String(userDetails.changesets_count);
var changesetsCount = parseInt(userDetails.changesets_count, 10) + 1; // #4283
tags.changesets_count = String(changesetsCount);

// first 100 edits - new user
if (parseInt(tags.changesets_count, 10) < 100) {
if (changesetsCount <= 100) {
var s;
s = context.storage('walkthrough_completed');
if (s) {
Expand Down Expand Up @@ -75842,7 +75843,7 @@ function setAreaKeys(value) {

function coreContext() {
var context = {};
context.version = '2.4.0';
context.version = '2.4.1';

// create a special translation that contains the keys in place of the strings
var tkeys = lodash.cloneDeep(en);
Expand Down
1 change: 1 addition & 0 deletions vendor/assets/iD/iD/locales/en-GB.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@
"title": "Upload to OpenStreetMap",
"upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
"upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
"request_review": "I would like someone to review my edits.",
"save": "Upload",
"cancel": "Cancel",
"changes": "{count} Changes",
Expand Down
11 changes: 10 additions & 1 deletion vendor/assets/iD/iD/locales/ko.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1712,6 +1712,15 @@
"container": "컨테이너"
}
},
"ref_highway_junction": {
"label": "나들목/분기점 번호"
},
"ref_road_number": {
"label": "노선번호"
},
"ref_route": {
"label": "노선번호"
},
"relation": {
"label": "유형"
},
Expand Down Expand Up @@ -1844,7 +1853,7 @@
"label": "시작 날짜"
},
"step_count": {
"label": "걸음 수"
"label": "계단 수"
},
"stop": {
"label": "정지 유형",
Expand Down
83 changes: 67 additions & 16 deletions vendor/assets/iD/iD/locales/nl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@
"presets": {
"categories": {
"category-barrier": {
"name": "Afscheidingsobjecten"
"name": "Afscheidingsobjectdetails"
},
"category-building": {
"name": "Gebouwobjecten"
Expand Down Expand Up @@ -2574,7 +2574,8 @@
"terms": "ziekenhuis,hospitaal,ziekenhuisgrond,hospitaalgrond,ziekenhuisgebied,hospitaalgebied,kliniek"
},
"amenity/hunting_stand": {
"name": "Jachthut"
"name": "Jachthut",
"terms": "jachttoren,hoogzit"
},
"amenity/ice_cream": {
"name": "IJskraam",
Expand Down Expand Up @@ -2728,6 +2729,9 @@
"name": "Beschutting",
"terms": "afdak,schuilplaats,bescherming,beschutting,wachthuisje,wachthokje,bushokje,buskotje"
},
"amenity/shower": {
"name": "Douche"
},
"amenity/social_facility": {
"name": "Sociale Faciliteit",
"terms": "OCMW,kansarmen,hulp,hulpcentrum"
Expand Down Expand Up @@ -2784,7 +2788,8 @@
"terms": "verkoopautomaat"
},
"amenity/vending_machine/cigarettes": {
"name": "Sigarettenautomaat"
"name": "Sigarettenautomaat",
"terms": "sigarettenautomaat,tabaksautomaat"
},
"amenity/vending_machine/condoms": {
"name": "Condoomautomaat",
Expand Down Expand Up @@ -2865,7 +2870,8 @@
"name": "Dier"
},
"attraction/big_wheel": {
"name": "Reuzenrad"
"name": "Reuzenrad",
"terms": "reuzenrat"
},
"attraction/bumper_car": {
"name": "Botsautootjes",
Expand All @@ -2883,6 +2889,25 @@
"name": "Darkride",
"terms": "spookhuis,thema-attractie"
},
"attraction/drop_tower": {
"name": "Valtoren"
},
"attraction/pirate_ship": {
"name": "Piratenschip",
"terms": "piratenschip,piratenboot"
},
"attraction/river_rafting": {
"name": "Rivierraften"
},
"attraction/roller_coaster": {
"name": "Achtbaan"
},
"attraction/train": {
"name": "Toeristentrein"
},
"attraction/water_slide": {
"name": "Waterglijbaan"
},
"barrier": {
"name": "Barrière",
"terms": "grens,afscheiding,afsluiting,scheiding"
Expand Down Expand Up @@ -3308,6 +3333,9 @@
"emergency/fire_hydrant": {
"name": "Brandkraan"
},
"emergency/life_ring": {
"name": "Reddingsboei"
},
"emergency/no": {
"name": "Toegang voor hulpdiensten: nee"
},
Expand Down Expand Up @@ -4315,7 +4343,8 @@
"terms": "stroom,elektriciteit,energieopwekking,windmolen,windturbine,zonnepaneel,elektriciteitscentrale,energiecentrale,kerncentrale"
},
"power/generator/source_nuclear": {
"name": "Kernreactor"
"name": "Kernreactor",
"terms": "kernreactor,kerncentrale"
},
"power/generator/source_wind": {
"name": "Windturbine",
Expand Down Expand Up @@ -4345,7 +4374,8 @@
"terms": "stroom,elektriciteit,energievoorzieningen,transformator,distributie,transformatiecabine,laagspanning,hoogspanning,voltage,spanning,onderstation,klein onderstation,distributiecabine,ondercentrale"
},
"power/tower": {
"name": "Hoogspanningsmast"
"name": "Hoogspanningsmast",
"terms": "hoogspanningsmast"
},
"power/transformer": {
"name": "Transformator",
Expand Down Expand Up @@ -4373,6 +4403,10 @@
"name": "Spoorwegovergang (pad)",
"terms": "gelijkvloerse overgang,gelijkgrondse overgang,overweg,spooroverweg,treinkruising,treinsporen"
},
"railway/derail": {
"name": "Ontspoorblok",
"terms": "ontspoorinrichting,ontspoorblok,stopontspoorblok"
},
"railway/disused": {
"name": "Ongebruikte spoorweg (sporen nog aanwezig)",
"terms": "in onbruik geraakte spoorbaan,verloederde spoorweg,oude spoorweg,voormalige spoorweg,rails,oude rails,sporen,oude sporen,oude treinroute,treinroute,voormalige spoorweg,verloederde spoorweg"
Expand Down Expand Up @@ -4490,7 +4524,8 @@
"terms": "sanitairwinkel"
},
"shop/beauty": {
"name": "Schoonheidssalon"
"name": "Schoonheidssalon",
"terms": "schoonheidswinkel,schoonheidsspeciaalzaak"
},
"shop/beauty/nails": {
"name": "Nagelsalon",
Expand All @@ -4513,7 +4548,8 @@
"terms": "fietsenwinkel"
},
"shop/bookmaker": {
"name": "Bookmaker (gokkantoor)"
"name": "Bookmaker (gokkantoor)",
"terms": "bookmaker"
},
"shop/books": {
"name": "Boekwinkel",
Expand Down Expand Up @@ -4544,7 +4580,8 @@
"terms": "garage,autohersteller"
},
"shop/carpet": {
"name": "Tapijtwinkel"
"name": "Tapijtwinkel",
"terms": "vloerbedekkingswinkel,vloerbedekkingsspeciaalzaak"
},
"shop/charity": {
"name": "Winkel van goed doel",
Expand Down Expand Up @@ -4575,24 +4612,28 @@
"terms": "IT,ICT,hardware,software,electronica,laptop"
},
"shop/confectionery": {
"name": "Snoepwinkel"
"name": "Snoepwinkel",
"terms": "snoepwinkel"
},
"shop/convenience": {
"name": "Gemakswinkel",
"terms": "buurtsuper,kruidenier,buurtwinkel,tankstationwinkel"
},
"shop/copyshop": {
"name": "Copyshop"
"name": "Copyshop",
"terms": "kopieshop,kopieerwinkel"
},
"shop/cosmetics": {
"name": "Cosmeticawinkel",
"terms": "parfumerie"
},
"shop/craft": {
"name": "Schilder- en Tekengereedschapswinkel"
"name": "Schilder- en Tekengereedschapswinkel",
"terms": "kunstbenodigdhedenwinkel,knutselwinkel"
},
"shop/curtain": {
"name": "Gordijnenwinkel"
"name": "Gordijnenwinkel",
"terms": "gordijnenwinkel,gordijnenzaak"
},
"shop/dairy": {
"name": "Zuivelhandel",
Expand Down Expand Up @@ -4682,7 +4723,8 @@
"terms": "kapper"
},
"shop/hardware": {
"name": "Bouwmarkt"
"name": "Bouwmarkt",
"terms": "bouwcentrum,bouwmaterialenspeciaalzaak"
},
"shop/hearing_aids": {
"name": "Hoorapparatenwinkel",
Expand All @@ -4709,10 +4751,12 @@
"terms": "juwelier"
},
"shop/kiosk": {
"name": "Krantenkiosk"
"name": "Krantenkiosk",
"terms": "kiosk,nieuwskiosk,krantenwinkel,krantenkiosk"
},
"shop/kitchen": {
"name": "Keukenontwerpwinkel"
"name": "Keukenontwerpwinkel",
"terms": "keukendesignwinkel,keukendesignzaak,keukenwinkel,keukenzaak"
},
"shop/laundry": {
"name": "Wasserette",
Expand Down Expand Up @@ -5212,6 +5256,13 @@
"description": "DigitalGlobe standaard satellietbeelden",
"name": "DigitalGlobe-standaardbeelden"
},
"EsriWorldImagery": {
"attribution": {
"text": "Voorwaarden & Terugkoppeling"
},
"description": "Esri world imagery",
"name": "Esri World Imagery"
},
"MAPNIK": {
"attribution": {
"text": "© OpenStreetMap-bijdragers, CC-BY-SA"
Expand Down
41 changes: 35 additions & 6 deletions vendor/assets/iD/iD/locales/pt-BR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2849,17 +2849,33 @@
"name": "Superfície da estrada",
"terms": "Superfície rodoviária, pavimentação"
},
"attraction/amusement_ride": {
"name": "Brinquedo de parque de diversões",
"terms": "atração, parque de diversões, montanha russa, camicase, ranger, kamikase, navio pirata"
},
"attraction/animal": {
"name": "Animal"
"name": "Animal",
"terms": "Animal de zoológico"
},
"attraction/big_wheel": {
"name": "Roda Gigante"
"name": "Roda Gigante",
"terms": "roda panorâmica"
},
"attraction/bumper_car": {
"name": "Carro Choque"
"name": "Carrinhos de bate-bate",
"terms": "carro choque, carrinho choque, carro de batida, carrinho de batida, bumper"
},
"attraction/carousel": {
"name": "Carrossel"
"name": "Carrossel",
"terms": "maxambomba, trivoli"
},
"attraction/dark_ride": {
"name": "Trem Fantasma",
"terms": "escuro, brinquedo, fechado"
},
"attraction/drop_tower": {
"name": "Torre de Queda Livre",
"terms": "big tower"
},
"attraction/pirate_ship": {
"name": "Navio Pirata"
Expand All @@ -2868,7 +2884,8 @@
"name": "Montanha Russa"
},
"attraction/water_slide": {
"name": "Toboágua"
"name": "Toboágua",
"terms": "tobogã, tobogan, escorregador"
},
"barrier": {
"name": "Barreira",
Expand Down Expand Up @@ -4067,6 +4084,18 @@
"name": "Fábrica",
"terms": "Fábrica, Planta de produção, chão de fábrica,"
},
"manhole": {
"name": "Poço de visita",
"terms": "bueiro, poço de inspeção"
},
"manhole/drain": {
"name": "Boca de lobo",
"terms": "grelha de sarjeta, caixa de captação, drenagem"
},
"manhole/telecom": {
"name": "Poço de visita de telefone",
"terms": "poço de inspeção de telefone"
},
"natural": {
"name": "Natural",
"terms": "Natural"
Expand Down Expand Up @@ -4970,7 +4999,7 @@
},
"tourism/attraction": {
"name": "Atração Turística",
"terms": "Atração Turística"
"terms": "ponto turístico"
},
"tourism/camp_site": {
"name": "Local de Acampamento",
Expand Down
Loading

0 comments on commit c754569

Please sign in to comment.