Update to iD v2.1.2
authorBryan Housel <bryan@mapbox.com>
Tue, 7 Feb 2017 16:53:11 +0000 (11:53 -0500)
committerBryan Housel <bryan@mapbox.com>
Tue, 7 Feb 2017 16:53:11 +0000 (11:53 -0500)
vendor/assets/iD/iD.js
vendor/assets/iD/iD/locales/ja.json
vendor/assets/iD/iD/locales/ko.json
vendor/assets/iD/iD/locales/pt-BR.json
vendor/assets/iD/iD/locales/sv.json
vendor/assets/iD/iD/locales/vi.json

index 3fbd5ce7ebb26b92f5a0fdc5c273459003c025b9..22a9842abb6b9fe69bc5cdba736b27cd9bd9354c 100644 (file)
@@ -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();
 
index 4cee0f6c47e269bca54d86aa8236fa99965b46c2..3bd7d25504fd28c964f89be6daf55da8280b763c 100644 (file)
                     "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": {
             },
             "move": {
                 "title": "移動",
+                "description": {
+                    "single": "この地物を別の位置へ移動します。",
+                    "multiple": "これらの地物を別な位置へ移動します。"
+                },
                 "key": "M",
                 "annotation": {
                     "point": "ポイントを移動",
                     "vertex": "ウェイ上のノードを移動",
                     "line": "ラインの移動",
-                    "area": "エリアの移動"
+                    "area": "エリアの移動",
+                    "multiple": "複数の地物を移動しました。"
                 }
             },
             "rotate": {
index ff013ce4ca956d2afdbfe475d7e1af3e75f11d02..915a9f023f15c5f5455bdef079a9cef4a72323b0 100644 (file)
                 "title": "비추기",
                 "description": {
                     "long": {
-                        "single": "이것을 장축을 가로질러 반영합니다.",
-                        "multiple": "이것들을 장축을 가로질러 반영합니다."
+                        "single": "긴 축으로 회전",
+                        "multiple": "이들을 긴 축으로 회전"
                     },
                     "short": {
                         "single": "짧은 축으로 회전",
-                        "multiple": "이것들을 단축을 가로질러 표시합니다."
+                        "multiple": "이들을 짧을 축으로 회전"
                     }
                 },
                 "key": {
                 "annotation": {
                     "long": {
                         "single": "긴 축으로 회전",
-                        "multiple": "이것들을 장축을 가로질러 표시합니다."
+                        "multiple": "이들을 긴 축으로 회전"
                     },
                     "short": {
-                        "single": "ì\9d´ê²\83ì\9d\84 ë\8b¨ì¶\95ì\9d\84 ê°\80ë¡\9cì§\88ë\9f¬ í\91\9cì\8b\9cí\95©ë\8b\88ë\8b¤.",
-                        "multiple": "이것들을 단축을 가로질러 표시합니다."
+                        "single": "짧ì\9d\80 ì¶\95ì\9c¼ë¡\9c í\9a\8cì \84",
+                        "multiple": "이들을 짧은 축으로 회전"
                     }
                 },
                 "incomplete_relation": {
index 195df82303567ca6f4fc55724a09bcbe1b239a3e..ec89dbe1d55dea56ea4105aaa54887159a6b1100 100644 (file)
                     "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"
                     "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"
                 },
                     "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",
                     "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",
                     "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",
                     "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"
                     "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",
                     "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",
                     "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"
index f47b1b6c01fa7c1fd7b6dd3fb4fdbc3261ccb111..deb6660f16eb879ed566ae4a6150a3e7c3e2fca0 100644 (file)
                     "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"
                     "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"
                     "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"
index 9c6766cdb574deb98e7b88d25ccfa539b7ab6689..dfdf1c6af60fbb579d9b8296e2734013c3ec062a 100644 (file)
                     "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"
                     "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"