Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to iD v2.9.1 #1915

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Update to iD v2.9.1 #1915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions vendor/assets/iD/iD.css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,17 +1904,14 @@ path.casing.tag-status {


/* Buildings */
path.stroke.tag-building,
path.stroke.tag-amenity-shelter {
path.stroke.tag-building {
stroke: rgb(224, 110, 95);
}
path.fill.tag-building,
path.fill.tag-amenity-shelter {
path.fill.tag-building {
stroke: rgba(224, 110, 95, 0.3);
fill: rgba(224, 110, 95, 0.3);
}
.preset-icon-fill-area.tag-building,
.preset-icon-fill-area.tag-amenity-shelter {
.preset-icon-fill-area.tag-building {
border-color: rgb(224, 110, 95);
background-color: rgba(224, 110, 95, 0.3);
}
Expand Down Expand Up @@ -1956,7 +1953,8 @@ path.stroke.tag-man_made-pier {
stroke-width: 1;
stroke-linecap: butt;
stroke-dasharray: 3, 3;
}/* Cursors */
}
/* Cursors */

.nope,
.nope * {
Expand Down Expand Up @@ -2246,6 +2244,21 @@ path.stroke.tag-man_made-pier {
background-repeat: no-repeat no-repeat;
}

label.streetside-hires {
float: left;
padding: 0 10px;
cursor: pointer;
}
.streetside-hires span {
margin-top: 2px;
}
.streetside-hires input[type="checkbox"] {
float: left;
width: 12px;
height: 12px;
margin: 0 5px;
}


/* Mapillary viewer */
#mly .domRenderer .TagSymbol {
Expand Down
2,752 changes: 2,566 additions & 186 deletions vendor/assets/iD/iD.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/fa-sprite.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 30 additions & 40 deletions vendor/assets/iD/iD/locales/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,7 @@
},
"aerialway/goods": {
"name": "نقل البضائع بالكابلات ",
"terms": "نقل البضائع بالكابلات "
"terms": "نقل البضائع بالكابلات"
},
"aerialway/pylon": {
"name": "برج التلفريك / المصعد التزلج",
Expand Down Expand Up @@ -2434,8 +2434,7 @@
"terms": "تأجير القوارب، ساحة الزوارق، تأجير زوارق"
},
"amenity/bureau_de_change": {
"name": "تحويل أموال",
"terms": "<translate with synonyms or related terms for 'Currency Exchange', separated by commas>"
"name": "تحويل أموال"
},
"amenity/bus_station": {
"name": "محطة حافلات"
Expand Down Expand Up @@ -2470,7 +2469,7 @@
},
"amenity/cinema": {
"name": "سينما",
"terms": "سينما,صالة سينما, دار السينما "
"terms": "سينما,صالة سينما, دار السينما"
},
"amenity/clinic": {
"name": "عيادة",
Expand Down Expand Up @@ -2620,7 +2619,7 @@
},
"amenity/place_of_worship/jewish": {
"name": "كنيس يهودي",
"terms": "كنيس, معبد اليهود, "
"terms": "كنيس, معبد اليهود,"
},
"amenity/place_of_worship/muslim": {
"name": "مسجد",
Expand All @@ -2632,7 +2631,7 @@
},
"amenity/police": {
"name": "شرطة",
"terms": "مركز الشرطة, الشرطة "
"terms": "مركز الشرطة, الشرطة"
},
"amenity/post_box": {
"name": "صندوق البريد",
Expand Down Expand Up @@ -2771,8 +2770,7 @@
"terms": "المساحة; مساحة; منطقة; المنطقة"
},
"area/highway": {
"name": "سطح الطريق",
"terms": "<translate with synonyms or related terms for 'Road Surface', separated by commas>"
"name": "سطح الطريق"
},
"attraction/animal": {
"name": "حيوان",
Expand Down Expand Up @@ -2893,16 +2891,13 @@
"name": "ملجأ محصّن"
},
"building/cabin": {
"name": "كوخ",
"terms": "<translate with synonyms or related terms for 'Cabin', separated by commas>"
"name": "كوخ"
},
"building/cathedral": {
"name": "مبنى كاتدرائية",
"terms": "<translate with synonyms or related terms for 'Cathedral Building', separated by commas>"
"name": "مبنى كاتدرائية"
},
"building/chapel": {
"name": "مبنى معبد",
"terms": "<translate with synonyms or related terms for 'Chapel Building', separated by commas>"
"name": "مبنى معبد"
},
"building/church": {
"name": "مبنى كنيسة",
Expand All @@ -2918,7 +2913,7 @@
},
"building/construction": {
"name": "مبنى تحت الإنشاء",
"terms": "تحت الانشاء; "
"terms": "تحت الانشاء;"
},
"building/detached": {
"name": "منزل منفصل",
Expand Down Expand Up @@ -2988,12 +2983,10 @@
"terms": "غطاء"
},
"building/school": {
"name": "مبنى مدرسة",
"terms": "<translate with synonyms or related terms for 'School Building', separated by commas>"
"name": "مبنى مدرسة"
},
"building/semidetached_house": {
"name": "مبنى شبه منفصل",
"terms": "<translate with synonyms or related terms for 'Semi-Detached House', separated by commas>"
"name": "مبنى شبه منفصل"
},
"building/shed": {
"name": "سقيفة",
Expand Down Expand Up @@ -3477,8 +3470,7 @@
"terms": "مفترق طرق"
},
"landuse": {
"name": "أرض",
"terms": "<ترجم بالمصطلحات أو المرادفات لـ \"الأراضي\"، فاصلا المدخلات بالفاصلة \",\">"
"name": "أرض"
},
"landuse/aquaculture": {
"name": "مزرعة سمكية",
Expand Down Expand Up @@ -3545,7 +3537,7 @@
},
"landuse/meadow": {
"name": "مرج",
"terms": " مرج, روضة, مخضرة"
"terms": "مرج, روضة, مخضرة"
},
"landuse/military": {
"name": "منطقة عسكرية",
Expand Down Expand Up @@ -3592,7 +3584,7 @@
},
"landuse/orchard": {
"name": "بستان",
"terms": " بستان, بيارة, أشجار البستان"
"terms": "بستان, بيارة, أشجار البستان"
},
"landuse/plant_nursery": {
"name": "مشتل",
Expand Down Expand Up @@ -3748,7 +3740,7 @@
},
"leisure/pitch/volleyball": {
"name": "ملعب كرة الطائرة",
"terms": "ملعب "
"terms": "ملعب"
},
"leisure/playground": {
"name": "ساحة ألعاب للأطفال",
Expand All @@ -3772,7 +3764,7 @@
},
"leisure/sports_centre": {
"name": "مركز رياضي",
"terms": " مركز رياضي; نادي رياضي; مجمع رياضي"
"terms": "مركز رياضي; نادي رياضي; مجمع رياضي"
},
"leisure/sports_centre/swimming": {
"name": "مبنى حوض سباحة",
Expand Down Expand Up @@ -3840,7 +3832,7 @@
},
"man_made/observation": {
"name": "برج مراقبة",
"terms": "برمج المراقبة، أبراج المراقبة، أبراج المشاهدة، "
"terms": "برمج المراقبة، أبراج المراقبة، أبراج المشاهدة،"
},
"man_made/observatory": {
"name": "مرصد",
Expand Down Expand Up @@ -3952,7 +3944,7 @@
},
"natural/grassland": {
"name": "أرض عشبية",
"terms": " مرعى, مرج, أرض معشوشبة"
"terms": "مرعى, مرج, أرض معشوشبة"
},
"natural/heath": {
"name": "مرج",
Expand Down Expand Up @@ -4040,7 +4032,7 @@
},
"office/accountant": {
"name": " المحاسب ",
"terms": " المحاسب القانوني، المدقق، الحسابات "
"terms": "المحاسب القانوني، المدقق، الحسابات"
},
"office/administrative": {
"name": "مكتب الإداري "
Expand All @@ -4051,7 +4043,7 @@
},
"office/architect": {
"name": " مهندس معماري ",
"terms": " بناء، مباني، مدينة، تعمير "
"terms": "بناء، مباني، مدينة، تعمير"
},
"office/association": {
"name": "جمعية ",
Expand Down Expand Up @@ -4087,7 +4079,7 @@
},
"office/financial": {
"name": "مكتب مالي",
"terms": "وزارة المالية، المكتب المالي والضريبي، "
"terms": "وزارة المالية، المكتب المالي والضريبي،"
},
"office/forestry": {
"name": "إدارة الغابات",
Expand All @@ -4099,7 +4091,7 @@
},
"office/government": {
"name": "مكتب حكومي",
"terms": "رئاسة الوزراء، إدارة الدولة، المكتب العام، "
"terms": "رئاسة الوزراء، إدارة الدولة، المكتب العام،"
},
"office/government/register_office": {
"name": "مكتب السجل المدني",
Expand Down Expand Up @@ -4130,11 +4122,11 @@
},
"office/newspaper": {
"name": "صحيفة",
"terms": " جريدة، صفحة أخبار، يومية "
"terms": "جريدة، صفحة أخبار، يومية"
},
"office/ngo": {
"name": "مكتب المنظمات الغير حكومية",
"terms": "مكتب الجمعيات الخيرية، هيئات العمل اﻹغائي، "
"terms": "مكتب الجمعيات الخيرية، هيئات العمل اﻹغائي،"
},
"office/notary": {
"name": "كاتب عدل / موثق",
Expand Down Expand Up @@ -4173,7 +4165,7 @@
},
"office/therapist": {
"name": "المعالج",
"terms": " معالج، معالج فيزيائي، طبيب، مُمرض "
"terms": "معالج، معالج فيزيائي، طبيب، مُمرض"
},
"office/travel_agent": {
"name": "وكالة السفر"
Expand Down Expand Up @@ -4253,7 +4245,7 @@
},
"power/generator/source_nuclear": {
"name": " محطة طاقة نووية ",
"terms": " محطة طاقة نووية "
"terms": "محطة طاقة نووية"
},
"power/generator/source_wind": {
"name": "عنفة رياح",
Expand Down Expand Up @@ -4369,7 +4361,7 @@
},
"railway/signal": {
"name": "إشارات المرور ( السكك الحديدية )",
"terms": "إشارة المرور "
"terms": "إشارة المرور"
},
"railway/station": {
"name": "محطة سكة حديد"
Expand Down Expand Up @@ -4613,7 +4605,7 @@
},
"shop/locksmith": {
"name": "محل أقفال",
"terms": "صانع اﻷقفال، أقفال، حداد، "
"terms": "صانع اﻷقفال، أقفال، حداد،"
},
"shop/mall": {
"name": "مركز تسوق مول",
Expand Down Expand Up @@ -4945,7 +4937,7 @@
},
"type/route/hiking": {
"name": "ممشى ",
"terms": "مسار المشاة، طريق للمشي، "
"terms": "مسار المشاة، طريق للمشي،"
},
"type/route/horse": {
"name": "مسار ركوب",
Expand Down Expand Up @@ -5073,14 +5065,12 @@
"attribution": {
"text": "الشروط والملاحظات"
},
"description": "صور الأقمار الصناعية الممتازة لـ DigitalGlobe",
"name": "صور DigitalGlobe الممتازة"
},
"DigitalGlobe-Standard": {
"attribution": {
"text": "الشروط والملاحظات"
},
"description": "صور الأقمار الصناعية القياسية لـ DigitalGlobe",
"name": "صور DigitalGlobe القياسية"
},
"EsriWorldImagery": {
Expand Down
6 changes: 2 additions & 4 deletions vendor/assets/iD/iD/locales/ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,7 +2453,7 @@
},
"amenity/social_facility": {
"name": "Serviciu social",
"terms": "servicios sociales, "
"terms": "servicios sociales,"
},
"amenity/social_facility/food_bank": {
"name": "Bancu d'alimentos"
Expand Down Expand Up @@ -2493,7 +2493,7 @@
},
"amenity/university": {
"name": "Campus universitariu",
"terms": "terrén universitariu, "
"terms": "terrén universitariu,"
},
"amenity/vending_machine": {
"name": "Máquina de venta automática"
Expand Down Expand Up @@ -4586,7 +4586,6 @@
"attribution": {
"text": "Términos y comentarios "
},
"description": "Imáxenes de satélite DigitalGlobe Premium.",
"name": "Imáxenes DigitalGlobe Premium"
},
"DigitalGlobe-Premium-vintage": {
Expand All @@ -4599,7 +4598,6 @@
"attribution": {
"text": "Términos y comentarios "
},
"description": "Imáxenes de satélite DigitalGlobe Standard.",
"name": "Imáxenes DigitalGlobe Standard"
},
"DigitalGlobe-Standard-vintage": {
Expand Down
2 changes: 0 additions & 2 deletions vendor/assets/iD/iD/locales/bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2794,7 +2794,6 @@
"attribution": {
"text": "Условия & oбратна връзка"
},
"description": "Премиум DigitalGlobe сателитни изображения",
"name": "DigitalGlobe премиум изображения"
},
"DigitalGlobe-Premium-vintage": {
Expand All @@ -2808,7 +2807,6 @@
"attribution": {
"text": "Условия & oбратна връзка"
},
"description": "Стандартни DigitalGlobe сателитни изображения.",
"name": "Стандартни DigitalGlobe изображения"
},
"DigitalGlobe-Standard-vintage": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/bs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@
},
"power/generator": {
"name": "Generator električne energije",
"terms": "generator el. energije,generator "
"terms": "generator el. energije,generator"
},
"power/line": {
"name": "Energetski vod",
Expand Down
Loading