]> git.openstreetmap.org Git - rails.git/commitdiff
Update to iD v1.5.1
authorJohn Firebaugh <john.firebaugh@gmail.com>
Thu, 10 Jul 2014 17:13:01 +0000 (10:13 -0700)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Thu, 10 Jul 2014 17:13:01 +0000 (10:13 -0700)
vendor/assets/iD/iD.js
vendor/assets/iD/iD/locales/ca.json
vendor/assets/iD/iD/locales/en-GB.json
vendor/assets/iD/iD/locales/en.json
vendor/assets/iD/iD/locales/pt.json
vendor/assets/iD/iD/locales/ru.json

index a28af85618ad5d1fe07483674f51189c5f0f164d..cbda33878f441ae7e4e799aa652ccfd6fa03b21c 100644 (file)
@@ -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": {
index 6215c44a709f8ac084cb5e923e387c3a296182a6..c63b3e074239e231d4a8e1ef6af79c1230fb778b 100644 (file)
                 "name": "Búnquer"
             },
             "building/cabin": {
-                "name": "Cabina"
+                "name": "Cabana"
             },
             "building/cathedral": {
                 "name": "Catedral"
                 "name": "Terrisseria"
             },
             "craft/rigger": {
-                "name": "Aparellador"
+                "name": "Armador d'embarcacions"
             },
             "craft/roofer": {
                 "name": "Constructor de teulades"
                 "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"
index 771cb75f9ebb61814004cd55600fc76d701baff1..f7a0129fbf357fb78e31d1cb3f10a0c847392747 100644 (file)
             "building/terrace": {
                 "name": "Terraced houses"
             },
+            "footway/crosswalk": {
+                "name": "Zebra Crossing"
+            },
+            "highway/crosswalk": {
+                "name": "Zebra Crossing"
+            },
             "shop/garden_centre": {
                 "name": "Garden Centre"
             },
index b2a050b07b73cbfd60ffb60ec4d3b51c984d5e18..020b50df84052e8a553dd52be166d01dd42da17d 100644 (file)
                 }
             },
             "access_simple": {
+                "label": "Access",
+                "placeholder": "yes"
+            },
+            "access_toilets": {
                 "label": "Access"
             },
             "address": {
index 50e23112bcb886e8c1780d42296981198990efac..b1113616b538cb19a6ab02bb5a6e49cbfe6535d7 100644 (file)
                 "terms": "Inversão de Marcha"
             },
             "highway/unclassified": {
-                "name": "Estrada Normal",
+                "name": "Estrada Sem Classificação Oficial",
                 "terms": "Estrada Não-Classificada"
             },
             "historic": {
index f34655fee3db72c1d988e462ca224c315162cd73..c18a5cadc1f253d6a6dcaed7621f7ff9b83c177d 100644 (file)
             "address": {
                 "label": "Адрес",
                 "placeholders": {
-                    "housename": "Номер дома",
-                    "housenumber": "123",
+                    "housename": "Housename",
+                    "housenumber": "Номер",
                     "street": "Улица",
                     "city": "Город",
                     "postcode": "Почтовый индекс",
             "craft/carpet_layer": {
                 "name": "Ковровое покрытие"
             },
+            "craft/caterer": {
+                "name": "Поставщик"
+            },
             "craft/clockmaker": {
                 "name": "Часовщик",
                 "terms": "часовщик"