Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2947' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Nov 10, 2020
2 parents e99692f + 79bb66a commit f7c5c01
Show file tree
Hide file tree
Showing 128 changed files with 305 additions and 257 deletions.
285 changes: 175 additions & 110 deletions vendor/assets/iD/iD.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/imagery.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/languages.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/locales.min.json
@@ -1 +1 @@
{"af":{"rtl":false,"pct":0.03},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":0.4},"ar-AA":{"rtl":true,"pct":0},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.29},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.24},"bg":{"rtl":false,"pct":0.19},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"bs":{"rtl":false,"pct":0.06},"ca":{"rtl":false,"pct":0.38},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":0.74},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.04},"da":{"rtl":false,"pct":0.65},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.37},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.31},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.81},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.1},"fa":{"rtl":true,"pct":0.55},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.52},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.92},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.72},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.93},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.26},"hu":{"rtl":false,"pct":0.67},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.11},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.5},"it":{"rtl":false,"pct":0.83},"ja":{"rtl":false,"pct":1},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0},"kn":{"rtl":false,"pct":0.07},"ko":{"rtl":false,"pct":0.5},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0.01},"ky":{"rtl":false,"pct":0},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.23},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.41},"mg":{"rtl":false,"pct":0.05},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.72},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.19},"my":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.02},"nl":{"rtl":false,"pct":0.71},"nn":{"rtl":false,"pct":0.03},"no":{"rtl":false,"pct":0.75},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.97},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.87},"pt-BR":{"rtl":false,"pct":0.82},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.21},"ru":{"rtl":false,"pct":0.67},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.02},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.47},"sl":{"rtl":false,"pct":0.27},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.02},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.25},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":0.99},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.17},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.04},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.7},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.83},"ur":{"rtl":true,"pct":0},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.92},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.12},"zh":{"rtl":false,"pct":0.03},"zh-CN":{"rtl":false,"pct":0.77},"zh-HK":{"rtl":false,"pct":0.36},"zh-TW":{"rtl":false,"pct":0.91},"zu":{"rtl":false,"pct":0}}
{"af":{"rtl":false,"pct":0.03},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":0.4},"ar-AA":{"rtl":true,"pct":0},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.29},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.24},"bg":{"rtl":false,"pct":0.19},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"bs":{"rtl":false,"pct":0.06},"ca":{"rtl":false,"pct":0.38},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":0.74},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.04},"da":{"rtl":false,"pct":0.67},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.37},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.31},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.81},"es":{"rtl":false,"pct":0.99},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.1},"fa":{"rtl":true,"pct":0.55},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.52},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.94},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.72},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.93},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.26},"hu":{"rtl":false,"pct":0.67},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.11},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.5},"it":{"rtl":false,"pct":0.84},"ja":{"rtl":false,"pct":1},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0},"kn":{"rtl":false,"pct":0.07},"ko":{"rtl":false,"pct":0.51},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0.01},"ky":{"rtl":false,"pct":0},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.23},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.41},"mg":{"rtl":false,"pct":0.05},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.72},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.18},"my":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.02},"nl":{"rtl":false,"pct":0.72},"nn":{"rtl":false,"pct":0.03},"no":{"rtl":false,"pct":0.75},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.97},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.87},"pt-BR":{"rtl":false,"pct":0.82},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.21},"ru":{"rtl":false,"pct":0.67},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.02},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.51},"sl":{"rtl":false,"pct":0.27},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.02},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.25},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":1},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.17},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.04},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.84},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.83},"ur":{"rtl":true,"pct":0},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.92},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.12},"zh":{"rtl":false,"pct":0.03},"zh-CN":{"rtl":false,"pct":0.77},"zh-HK":{"rtl":false,"pct":0.36},"zh-TW":{"rtl":false,"pct":0.91},"zu":{"rtl":false,"pct":0}}
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/preset_fields.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/preset_presets.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/taginfo.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/af.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ak.json
@@ -1 +1 @@
{"ak":{"languageNames":{"ak":"Akan","am":"Amarik","ar":"Arabik","ar-001":"Arabik (001)","be":"Belarus kasa","bg":"Bɔlgeria kasa","bn":"Bengali kasa","cs":"Kyɛk kasa","de":"Gyaaman","de-AT":"Gyaaman (Ɔstria)","de-CH":"Gyaaman (Swetzaland)","el":"Greek kasa","en":"Borɔfo","en-AU":"Borɔfo (Ɔstrelia)","en-CA":"Borɔfo (Kanada)","en-GB":"Borɔfo (Ahendiman Nkabom)","en-US":"Borɔfo (Amɛrika)","es":"Spain kasa","es-419":"Spain kasa (419)","es-ES":"Spain kasa (Spain)","es-MX":"Spain kasa (Mɛksiko)","fa":"Pɛɛhyia kasa","fa-AF":"Pɛɛhyia kasa (Afganistan)","fr":"Frɛnkye","fr-CA":"Frɛnkye (Kanada)","fr-CH":"Frɛnkye (Swetzaland)","ha":"Hausa","hi":"Hindi","hu":"Hangri kasa","id":"Indonihyia kasa","ig":"Igbo","it":"Italy kasa","ja":"Gyapan kasa","jv":"Gyabanis kasa","km":"Kambodia kasa","ko":"Korea kasa","ms":"Malay kasa","my":"Bɛɛmis kasa","nds-NL":"nds (Nɛdɛland)","ne":"Nɛpal kasa","nl":"Dɛɛkye","nl-BE":"Dɛɛkye (Bɛlgyium)","pa":"Pungyabi kasa","pl":"Pɔland kasa","pt":"Pɔɔtugal kasa","pt-BR":"Pɔɔtugal kasa (Brazil)","pt-PT":"Pɔɔtugal kasa (Pɔtugal)","ro":"Romenia kasa","ro-MD":"Romenia kasa (Mɔldova)","ru":"Rahyia kasa","rw":"Rewanda kasa","so":"Somalia kasa","sv":"Sweden kasa","sw-CD":"sw (Kongo [Zair])","ta":"Tamil kasa","th":"Taeland kasa","tr":"Tɛɛki kasa","uk":"Ukren kasa","ur":"Urdu kasa","vi":"Viɛtnam kasa","yo":"Yoruba","zh":"Kyaena kasa","zh-Hans":"Kyaena kasa (Hans)","zh-Hant":"Kyaena kasa (Hant)","zu":"Zulu"},"scriptNames":{}}}
{"ak":{"languageNames":{"ak":"Akan","am":"Amarik","ar":"Arabik","be":"Belarus kasa","bg":"Bɔlgeria kasa","bn":"Bengali kasa","cs":"Kyɛk kasa","de":"Gyaaman","el":"Greek kasa","en":"Borɔfo","es":"Spain kasa","fa":"Pɛɛhyia kasa","fr":"Frɛnkye","ha":"Hausa","hi":"Hindi","hu":"Hangri kasa","id":"Indonihyia kasa","ig":"Igbo","it":"Italy kasa","ja":"Gyapan kasa","jv":"Gyabanis kasa","km":"Kambodia kasa","ko":"Korea kasa","ms":"Malay kasa","my":"Bɛɛmis kasa","ne":"Nɛpal kasa","nl":"Dɛɛkye","pa":"Pungyabi kasa","pl":"Pɔland kasa","pt":"Pɔɔtugal kasa","ro":"Romenia kasa","ru":"Rahyia kasa","rw":"Rewanda kasa","so":"Somalia kasa","sv":"Sweden kasa","ta":"Tamil kasa","th":"Taeland kasa","tr":"Tɛɛki kasa","uk":"Ukren kasa","ur":"Urdu kasa","vi":"Viɛtnam kasa","yo":"Yoruba","zh":"Kyaena kasa","zh-Hans":"Kyaena kasa (Hans)","zh-Hant":"Kyaena kasa (Hant)","zu":"Zulu"},"scriptNames":{}}}

0 comments on commit f7c5c01

Please sign in to comment.