From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 10 Jul 2014 17:13:01 +0000 (-0700)
Subject: Update to iD v1.5.1
X-Git-Tag: live~4389
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d9521aeeb9194a7d4364b09a414218a7f96f7714?hp=542c45db01c64d783bab242c88f8b9714ba65795

Update to iD v1.5.1
---

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index a28af8561..cbda33878 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -16407,7 +16407,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.5.0';
+iD.version = '1.5.1';
 
 (function() {
     var detected = {};
@@ -16443,7 +16443,7 @@ iD.version = '1.5.0';
 })();
 iD.countryCode  = function() {
     var countryCode = {},
-        endpoint = 'http://nominatim.openstreetmap.org/reverse?';
+        endpoint = 'https://nominatim.openstreetmap.org/reverse?';
 
     if (!iD.countryCode.cache) {
         iD.countryCode.cache = rbush();
@@ -30858,10 +30858,8 @@ iD.ui.preset.typeCombo = function(field) {
                 return o;
             }));
 
-            input.attr('placeholder', function() {
-                if (opts.length < 3) return '';
-                return opts.slice(0, 3).join(', ') + '...';
-            });
+            input.attr('placeholder', field.placeholder() ||
+                (opts.length < 3 ? '' : opts.slice(0, 3).join(', ') + '...'));
         }
     }
 
@@ -65632,8 +65630,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "toilets/disposal",
                     "operator",
                     "building_area",
-                    "fee",
-                    "access_simple"
+                    "access_toilets"
                 ],
                 "geometry": [
                     "point",
@@ -101333,6 +101330,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 }
             },
             "access_simple": {
+                "key": "access",
+                "type": "combo",
+                "label": "Access",
+                "placeholder": "yes",
+                "options": [
+                    "permissive",
+                    "private",
+                    "customers",
+                    "no"
+                ]
+            },
+            "access_toilets": {
                 "key": "access",
                 "type": "combo",
                 "label": "Access",
@@ -114819,6 +114828,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     }
                 },
                 "access_simple": {
+                    "label": "Access",
+                    "placeholder": "yes"
+                },
+                "access_toilets": {
                     "label": "Access"
                 },
                 "address": {
diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 6215c44a7..c63b3e074 100644
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -1392,7 +1392,7 @@
                 "name": "Búnquer"
             },
             "building/cabin": {
-                "name": "Cabina"
+                "name": "Cabana"
             },
             "building/cathedral": {
                 "name": "Catedral"
@@ -1575,7 +1575,7 @@
                 "name": "Terrisseria"
             },
             "craft/rigger": {
-                "name": "Aparellador"
+                "name": "Armador d'embarcacions"
             },
             "craft/roofer": {
                 "name": "Constructor de teulades"
@@ -2545,6 +2545,9 @@
                 "name": "Supermercat",
                 "terms": "Supermercat, Súper, Hipermercat, Híper"
             },
+            "shop/tailor": {
+                "name": "Sastreria"
+            },
             "shop/toys": {
                 "name": "Botiga de joguines",
                 "terms": "Botiga de joguines, Botiga de jocs, Joguineria"
diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index 771cb75f9..f7a0129fb 100644
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -84,6 +84,12 @@
             "building/terrace": {
                 "name": "Terraced houses"
             },
+            "footway/crosswalk": {
+                "name": "Zebra Crossing"
+            },
+            "highway/crosswalk": {
+                "name": "Zebra Crossing"
+            },
             "shop/garden_centre": {
                 "name": "Garden Centre"
             },
diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index b2a050b07..020b50df8 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -485,6 +485,10 @@
                 }
             },
             "access_simple": {
+                "label": "Access",
+                "placeholder": "yes"
+            },
+            "access_toilets": {
                 "label": "Access"
             },
             "address": {
diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index 50e23112b..b1113616b 100644
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -1942,7 +1942,7 @@
                 "terms": "Inversão de Marcha"
             },
             "highway/unclassified": {
-                "name": "Estrada Normal",
+                "name": "Estrada Sem Classificação Oficial",
                 "terms": "Estrada Não-Classificada"
             },
             "historic": {
diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index f34655fee..c18a5cadc 100644
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -486,8 +486,8 @@
             "address": {
                 "label": "Адрес",
                 "placeholders": {
-                    "housename": "Номер дома",
-                    "housenumber": "123",
+                    "housename": "Housename",
+                    "housenumber": "Номер",
                     "street": "Улица",
                     "city": "Город",
                     "postcode": "Почтовый индекс",
@@ -1502,6 +1502,9 @@
             "craft/carpet_layer": {
                 "name": "Ковровое покрытие"
             },
+            "craft/caterer": {
+                "name": "Поставщик"
+            },
             "craft/clockmaker": {
                 "name": "Часовщик",
                 "terms": "часовщик"