From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 7 Feb 2017 16:53:11 +0000 (-0500)
Subject: Update to iD v2.1.2
X-Git-Tag: live~4152
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7606d1369a4f04b0a744ac7041020db1ca46d861?ds=inline

Update to iD v2.1.2
---

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 3fbd5ce7e..22a9842ab 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -50891,14 +50891,20 @@ function modeDragNode$$1(context) {
     function start(entity) {
         wasMidpoint = entity.type === 'midpoint';
 
-        // vertices classed "sibling" include:  (see svg/vertices.js)
-        // - children of selected ways or multipolygons
-        // - vertices sharing a way with selected vertices
-        var selection$$1 = selectAll('g.vertex-persistent.' + entity.id),
-            isSelected = !selection$$1.empty() &&
-                (selection$$1.classed('selected') || selection$$1.classed('sibling'));
-
-        isCancelled = event.sourceEvent.shiftKey || !(wasMidpoint || isSelected) ||
+        // Things allowed to be dragged include:
+        // - midpoints
+        // - nodes that are selected
+        // - vertices that are selected
+        // - vertices classed 'sibling' which includes (see svg/vertices.js)
+        //   - children of selected ways or multipolygons
+        //   - vertices sharing a way with selected vertices
+        var selector$$1 = 'g.node.point.selected.' + entity.id +
+            ', g.vertex-persistent.selected.' + entity.id +
+            ', g.vertex-persistent.sibling.' + entity.id;
+
+        var isDraggable = wasMidpoint || !select(selector$$1).empty();
+
+        isCancelled = event.sourceEvent.shiftKey || !isDraggable ||
             context.features().hasHiddenConnections(entity, context.graph());
 
         if (isCancelled) {
@@ -67924,7 +67930,7 @@ function coreContext() {
 
 
     /* Init */
-    context.version = '2.1.1';
+    context.version = '2.1.2';
 
     context.projection = geoRawMercator();
 
diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index 4cee0f6c4..3bd7d2550 100644
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -106,11 +106,24 @@
                     "multiple": "これらの地物を完全に削除します。"
                 },
                 "annotation": {
-                    "point": "ポイントを削除",
-                    "vertex": "ウェイ上のノードを削除",
-                    "line": "ライン削除",
-                    "area": "エリア削除",
-                    "relation": "リレーション削除"
+                    "point": "ポイントを削除しました。",
+                    "vertex": "ウェイ上のノードを削除しました。",
+                    "line": "ラインを削除しました。",
+                    "area": "エリアを削除しました。",
+                    "relation": "リレーションを削除しました。",
+                    "multiple": "{n}件の地物を削除しました。"
+                },
+                "incomplete_relation": {
+                    "single": "関連する地物データをすべてダウンロードしていないため、この地物を削除できません。",
+                    "multiple": "地物全体がダウンロードされていないため、削除することができません。"
+                },
+                "part_of_relation": {
+                    "single": "この地物は大きなリレーションの一部であるため、削除できません。まずリレーションから削除してください。",
+                    "multiple": "これらの地物は大きなリレーションの一部であるため、削除できません。まずリレーションから削除してください。"
+                },
+                "connected_to_hidden": {
+                    "single": "この地物は非表示の地物に接続しているため、削除できません。",
+                    "multiple": "これらの地物は非表示の地物に接続しているため、削除できません。"
                 }
             },
             "add_member": {
@@ -149,12 +162,17 @@
             },
             "move": {
                 "title": "移動",
+                "description": {
+                    "single": "この地物を別の位置へ移動します。",
+                    "multiple": "これらの地物を別な位置へ移動します。"
+                },
                 "key": "M",
                 "annotation": {
                     "point": "ポイントを移動",
                     "vertex": "ウェイ上のノードを移動",
                     "line": "ラインの移動",
-                    "area": "エリアの移動"
+                    "area": "エリアの移動",
+                    "multiple": "複数の地物を移動しました。"
                 }
             },
             "rotate": {
diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json
index ff013ce4c..915a9f023 100644
--- a/vendor/assets/iD/iD/locales/ko.json
+++ b/vendor/assets/iD/iD/locales/ko.json
@@ -191,12 +191,12 @@
                 "title": "비추기",
                 "description": {
                     "long": {
-                        "single": "이것을 장축을 가로질러 반영합니다.",
-                        "multiple": "이것들을 장축을 가로질러 반영합니다."
+                        "single": "긴 축으로 회전",
+                        "multiple": "이들을 긴 축으로 회전"
                     },
                     "short": {
                         "single": "짧은 축으로 회전",
-                        "multiple": "이것들을 단축을 가로질러 표시합니다."
+                        "multiple": "이들을 짧을 축으로 회전"
                     }
                 },
                 "key": {
@@ -206,11 +206,11 @@
                 "annotation": {
                     "long": {
                         "single": "긴 축으로 회전",
-                        "multiple": "이것들을 장축을 가로질러 표시합니다."
+                        "multiple": "이들을 긴 축으로 회전"
                     },
                     "short": {
-                        "single": "이것을 단축을 가로질러 표시합니다.",
-                        "multiple": "이것들을 단축을 가로질러 표시합니다."
+                        "single": "짧은 축으로 회전",
+                        "multiple": "이들을 짧은 축으로 회전"
                     }
                 },
                 "incomplete_relation": {
diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index 195df8230..ec89dbe1d 100644
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -1850,6 +1850,10 @@
                     "name": "Gôndola",
                     "terms": "Gôndola, Bondinho"
                 },
+                "aerialway/goods": {
+                    "name": "Teleférico de transporte de mercadorias",
+                    "terms": "Teleférico de transporte de produtos, teleférico, mercadorias, bens, produtos"
+                },
                 "aerialway/magic_carpet": {
                     "name": "Esteira de Ski",
                     "terms": "Esteira, Esteira de Ski"
@@ -1908,6 +1912,10 @@
                     "name": "Pista de taxiamento",
                     "terms": "Taxiway"
                 },
+                "aeroway/terminal": {
+                    "name": "Terminal de Aeroporto",
+                    "terms": "aeroporto, edifício, terminal aeroportuário, embarque, desembarque, viagem, turismo, avião, helicóptero"
+                },
                 "amenity": {
                     "name": "Serviço"
                 },
@@ -1924,8 +1932,8 @@
                     "terms": "Banco"
                 },
                 "amenity/bar": {
-                    "name": "Drinqueria",
-                    "terms": "Drinqueria, Drinkeria"
+                    "name": "Bar requintado / Drinqueria",
+                    "terms": "Drinqueria, Drinkeria, pub, bar, casa de drinques, casa de drinks, marguerita, caipirinha"
                 },
                 "amenity/bbq": {
                     "name": "Churrasqueira",
@@ -2171,8 +2179,8 @@
                     "terms": "Cela, Cadeia"
                 },
                 "amenity/pub": {
-                    "name": "Bar",
-                    "terms": "Pub, botequim, boteco, buteco"
+                    "name": "Bar / Boteco",
+                    "terms": "Pub, botequim, boteco, buteco, bar, butequim, chopperia, choperia,"
                 },
                 "amenity/public_bath": {
                     "name": "Banho Público",
@@ -2341,7 +2349,8 @@
                     "terms": "Pilar, Poste, Cabeço, Pedestal, Estaca, frade"
                 },
                 "barrier/border_control": {
-                    "name": "Controle de fronteira"
+                    "name": "Controle de fronteira",
+                    "terms": "Fronteira, Alfândega, Imigração, Passaporte, divisa"
                 },
                 "barrier/cattle_grid": {
                     "name": "Mata-burro",
@@ -3236,6 +3245,10 @@
                     "name": "Campo de Golfe",
                     "terms": "Campo de Golfe"
                 },
+                "leisure/horse_riding": {
+                    "name": "Centro de Hipismo",
+                    "terms": "hipismo, equitação, centro de equitação, cavalos, galopamento, "
+                },
                 "leisure/ice_rink": {
                     "name": "Pista de Patinação no Gelo",
                     "terms": "Rinque de Patinação no Gelo"
@@ -3456,7 +3469,8 @@
                     "terms": "Tratamento de Água"
                 },
                 "man_made/works": {
-                    "name": "Fábrica"
+                    "name": "Fábrica",
+                    "terms": "Fábrica, Planta de produção, chão de fábrica,"
                 },
                 "natural": {
                     "name": "Natural",
@@ -3511,7 +3525,8 @@
                     "terms": "<translate with synonyms or related terms for 'Saddle', separated by commas>"
                 },
                 "natural/sand": {
-                    "name": "Areia"
+                    "name": "Areia",
+                    "terms": "areia, dunas, duna, deserto"
                 },
                 "natural/scree": {
                     "name": "Pedregulhos",
@@ -3561,6 +3576,10 @@
                     "name": "Mata Nativa",
                     "terms": "Floresta, Bosque"
                 },
+                "noexit/yes": {
+                    "name": "Rua sem Saída",
+                    "terms": "sem saída, rua fechada, beco sem saída, bloqueio"
+                },
                 "office": {
                     "name": "Escritório",
                     "terms": "Escritório"
diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index f47b1b6c0..deb6660f1 100644
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -3589,6 +3589,10 @@
                     "name": "Skog (utan skogsbruk)",
                     "terms": "skog, Urskog, djungel, bush, regnskog, vildmark, träd"
                 },
+                "noexit/yes": {
+                    "name": "Återvändsgata",
+                    "terms": "Återvändsgränd, blindgata återvändsgata, vägslut"
+                },
                 "office": {
                     "name": "Kontor",
                     "terms": "Kontor, tjänster, tjänsteman, tjänstemän, byrå, expedition"
@@ -3649,6 +3653,10 @@
                     "name": "Advokatkontor",
                     "terms": "Advokatkontor, advokat, jurist, juridiskt ombud, rättsombud, ombud, jurist, försvarare, lagman"
                 },
+                "office/lawyer/notary": {
+                    "name": "Notariekontor",
+                    "terms": "Notariekontor, Notarie, Notarius, Notarius publicus, signatur, fullmakt, namnteckning, påskrift, underskrift, bevittna, testamente, arv, handlingar, kontrakt, avtal, egendom, dödsbo, värdehandlningar"
+                },
                 "office/newspaper": {
                     "name": "Tidningsredaktion",
                     "terms": "Tidningsredaktion, tidning, nyhetsredaktion, redaktion, tidningslokal, utgivare, tidskrift, magasin"
@@ -4301,6 +4309,10 @@
                     "name": "TV-spel",
                     "terms": "TV-spel, videospel, konsolspel, spelkonsoler, datorspel, dataspel, tvspel"
                 },
+                "shop/watches": {
+                    "name": "Klockaffär",
+                    "terms": "Klockaffär, klockbutik, urbutik, uraffär, ur, klocka , klockor"
+                },
                 "shop/water_sports": {
                     "name": "Vattensport/simning ",
                     "terms": "Vattensport, simning, badkläder"
diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 9c6766cdb..dfdf1c6af 100644
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -3589,6 +3589,10 @@
                     "name": "Rừng",
                     "terms": "rừng, cây cối, rung, cay coi"
                 },
+                "noexit/yes": {
+                    "name": "Không có Lối ra",
+                    "terms": "không có lối ra, không ra được, đường cùng, ngõ cụt, cuối đường, khong co loi ra, khong ra duoc, duong cung, ngo cut, cuoi duong"
+                },
                 "office": {
                     "name": "Văn phòng",
                     "terms": "văn phòng, sở, van phong, so"
@@ -4305,6 +4309,10 @@
                     "name": "Tiệm Video Game",
                     "terms": "tiệm video game, tiệm trò chơi video, tiệm trò chơi điện tử, tiệm game, cửa hàng video game, cửa hàng trò chơi video, cửa hàng trò chơi điện tử, cửa hàng game, cửa hiệu video game, cửa hiệu trò chơi video, cửa hiệu trò chơi điện tử, cửa hiệu game, tiem video game, tiem tro choi video, tiem tro choi dien tu, tiem game, cua hang video game, cua hang tro choi video, cua hang tro choi dien tu, cua hang game, cua hieu video game, cua hieu tro choi video, cua hieu tro choi dien tu, cua hieu game"
                 },
+                "shop/watches": {
+                    "name": "Tiệm Đồng hồ Đeo tay",
+                    "terms": "tiệm đồng hồ đeo tay, cửa hàng đồng hồ đeo tay, tiem dong ho deo tay, cua hang dong ho deo tay"
+                },
                 "shop/water_sports": {
                     "name": "Tiệm Dụng cụ Bơi lội",
                     "terms": "tiệm dụng cụ bơi lội, tiệm bán đồ bơi lội, cửa hàng dụng cụ bơi lội, cửa hàng bán đồ bơi lội, cửa hiệu dụng cụ bơi lội, cửa hiệu bán đồ bơi lội, tiem dung cu boi loi, tiem ban do boi loi, cua hang dung cu boi loi, cua hang ban do boi loi, cua hieu dung cu boi loi, cua hieu ban do boi loi"