Skip to content

Commit

Permalink
Merge branch '2.15'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhousel
bhousel committed Aug 14, 2019
2 parents 3e6d493 + 75ffacf commit 5f3aaa8
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions data/presets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6293,8 +6293,8 @@ en:
name: Physician
office/political_party:
# office=political_party
name: Political Party
terms: '<translate with synonyms or related terms for ''Political Party'', separated by commas>'
name: Political Party Office
terms: '<translate with synonyms or related terms for ''Political Party Office'', separated by commas>'
office/private_investigator:
# office=private_investigator
name: Private Investigator Office
Expand Down
2 changes: 1 addition & 1 deletion data/presets/presets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@
"office/newspaper": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"office": "newspaper"}, "terms": [], "name": "Newspaper Office"},
"office/ngo": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "ngo"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation"], "name": "NGO Office"},
"office/notary": {"icon": "fas-stamp", "geometry": ["point", "area"], "tags": {"office": "notary"}, "terms": ["clerk", "deeds", "estate", "signature", "wills"], "name": "Notary Office"},
"office/political_party": {"icon": "maki-town-hall", "geometry": ["point", "area"], "tags": {"office": "political_party"}, "terms": [], "name": "Political Party"},
"office/political_party": {"icon": "maki-town-hall", "geometry": ["point", "area"], "tags": {"office": "political_party"}, "terms": [], "name": "Political Party Office"},
"office/private_investigator": {"icon": "fas-user-secret", "geometry": ["point", "area"], "tags": {"office": "private_investigator"}, "terms": ["PI", "private eye", "private detective"], "name": "Private Investigator Office"},
"office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
"office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"},
Expand Down
2 changes: 1 addition & 1 deletion data/presets/presets/office/political_party.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"office": "political_party"
},
"terms": [],
"name": "Political Party"
"name": "Political Party Office"
}
2 changes: 1 addition & 1 deletion data/taginfo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@
{"key": "office", "value": "newspaper", "description": "🄿 Newspaper Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-newspaper.svg"},
{"key": "office", "value": "ngo", "description": "🄿 NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
{"key": "office", "value": "notary", "description": "🄿 Notary Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-stamp.svg"},
{"key": "office", "value": "political_party", "description": "🄿 Political Party", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
{"key": "office", "value": "political_party", "description": "🄿 Political Party Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
{"key": "office", "value": "private_investigator", "description": "🄿 Private Investigator Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-user-secret.svg"},
{"key": "office", "value": "quango", "description": "🄿 Quasi-NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
{"key": "office", "value": "religion", "description": "🄿 Religious Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
Expand Down
32 changes: 16 additions & 16 deletions data/territory-languages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ci": ["fr", "bci", "sef", "dnj", "kfo", "bqv"],
"ck": ["en"],
"cl": ["es", "en", "arn"],
"cm": ["fr", "en", "bum", "ff", "ewo", "ybb", "bbj", "nnh", "bkm", "bas", "bax", "byv", "mua", "maf", "bfd", "bss", "kkj", "dua", "mgo", "ar", "jgo", "ksf", "agq", "ha-Arab", "nmg", "yav", "ff-Adlm"],
"cm": ["fr", "en", "bum", "ff", "ewo", "ybb", "nnh", "bbj", "bkm", "bax", "bas", "byv", "mua", "maf", "bfd", "bss", "kkj", "dua", "mgo", "ar", "jgo", "ksf", "agq", "ha-Arab", "nmg", "yav", "ff-Adlm"],
"cn": ["zh", "wuu", "yue-Hans", "hsn", "hak", "nan", "gan", "ii", "ug", "za", "mn-Mong", "bo", "ko", "kk-Arab", "lis", "ky-Arab", "nxq", "khb", "tdd", "lcp", "en", "ru", "vi", "uz-Cyrl", "lzh"],
"co": ["es", "guc"],
"cp": ["und"],
Expand All @@ -58,7 +58,7 @@
"cx": ["en"],
"cy": ["el", "en", "tr", "fr", "hy", "ar"],
"cz": ["cs", "en", "sk", "de", "pl"],
"de": ["de", "en", "fr", "bar", "nds", "nl", "it", "es", "ru", "vmf", "tr", "gsw", "da", "swg", "hr", "ku", "el", "ksh", "pl", "hsb", "frr", "dsb", "frs", "stq", "pfl"],
"de": ["de", "en", "fr", "bar", "nds", "nl", "it", "vmf", "ru", "es", "tr", "gsw", "da", "swg", "hr", "ku", "el", "ksh", "pl", "hsb", "frr", "dsb", "frs", "stq", "pfl"],
"dg": ["en"],
"dj": ["aa", "so", "ar", "fr"],
"dk": ["da", "en", "de", "sv", "fo", "kl", "jut"],
Expand All @@ -78,7 +78,7 @@
"fk": ["en"],
"fm": ["en", "chk", "pon", "kos", "yap", "uli"],
"fo": ["fo"],
"fr": ["fr", "en", "es", "de", "oc", "it", "pt", "pcd", "gsw", "br", "co", "ca", "eu", "nl", "frp", "ia"],
"fr": ["fr", "en", "es", "de", "oc", "it", "pt", "pcd", "gsw", "br", "co", "ca", "nl", "eu", "frp", "ia"],
"ga": ["fr", "puu"],
"gb": ["en", "fr", "de", "sco", "pa", "cy", "bn", "zh-Hant", "syl", "el", "it", "ks", "gd", "yi", "ml", "ga", "kw"],
"gd": ["en"],
Expand All @@ -105,14 +105,14 @@
"ht": ["ht", "fr"],
"hu": ["hu", "en", "de", "fr", "ro", "hr", "sk", "sl"],
"ic": ["es"],
"id": ["id", "jv", "su", "mad", "ms-Arab", "min", "bew", "ban", "bug", "bjn", "ace", "sas", "bbc", "zh-Hant", "mak", "ljp", "rej", "gor", "nij", "kge", "aoz", "kvr", "lbw", "gay", "rob", "mdr", "sxn", "sly", "mwv"],
"id": ["id", "jv", "su", "mad", "ms-Arab", "min", "bew", "ban", "bug", "bjn", "ace", "sas", "zh-Hant", "bbc", "mak", "ljp", "rej", "gor", "nij", "kge", "aoz", "kvr", "lbw", "gay", "rob", "mdr", "sxn", "sly", "mwv"],
"ie": ["en", "ga", "fr"],
"il": ["he", "en", "ar", "ru", "ro", "yi", "pl", "lad", "hu", "am", "ti", "ml"],
"im": ["en", "gv"],
"in": ["hi", "en", "bn", "te", "mr", "ta", "ur", "gu", "kn", "ml", "or", "pa", "bho", "awa", "as", "bgc", "mag", "mai", "mwr", "hne", "dcc", "bjj", "ne", "sat", "wtm", "rkt", "ks", "kok", "gom", "swv", "gbm", "lmn", "sd", "gon", "kfy", "doi", "kru", "sck", "wbq", "xnr", "khn", "tcy", "wbr", "brx", "noe", "bhb", "mni", "hoc", "raj", "mtr", "unr", "bhi", "hoj", "kha", "kfr", "grt", "unx", "bfy", "srx", "saz", "ccp", "sd-Deva", "bfq", "njo", "ria", "bo", "bpy", "bft", "bra", "lep", "btv", "lif", "lah", "sa", "kht", "dv", "dz"],
"in": ["hi", "en", "bn", "te", "mr", "ta", "ur", "gu", "kn", "ml", "or", "pa", "bho", "awa", "as", "mwr", "bgc", "mag", "mai", "hne", "dcc", "ne", "bjj", "sat", "wtm", "rkt", "ks", "kok", "gom", "swv", "gbm", "lmn", "sd", "gon", "kfy", "doi", "kru", "sck", "wbq", "xnr", "tcy", "wbr", "khn", "brx", "noe", "bhb", "mni", "hoc", "raj", "mtr", "unr", "bhi", "hoj", "kha", "kfr", "grt", "unx", "bfy", "srx", "saz", "ccp", "sd-Deva", "njo", "bfq", "ria", "bo", "bpy", "bft", "bra", "lep", "btv", "lif", "lah", "sa", "kht", "dv", "dz"],
"io": ["en"],
"iq": ["ar", "en", "ckb", "az-Arab", "fa", "lrc", "syr"],
"ir": ["fa", "az-Arab", "mzn", "glk", "ckb", "sdh", "tk", "lrc", "ar", "bal", "rmt", "bqi", "luz", "lki", "bgn", "prd", "hy", "ps", "ka", "gbz", "kk-Arab"],
"ir": ["fa", "az-Arab", "mzn", "glk", "ckb", "sdh", "tk", "lrc", "bal", "ar", "rmt", "bqi", "luz", "lki", "bgn", "prd", "hy", "ps", "ka", "gbz", "kk-Arab"],
"is": ["is", "da"],
"it": ["it", "en", "fr", "sc", "de", "vec", "nap", "lij", "scn", "sdc", "sl", "fur", "egl", "ca", "el", "lmo", "pms", "hr", "rgn"],
"je": ["en"],
Expand Down Expand Up @@ -141,15 +141,15 @@
"lu": ["fr", "lb", "de", "en", "pt"],
"lv": ["lv", "en", "ru", "ltg"],
"ly": ["ar"],
"ma": ["ary", "ar", "zgh", "fr", "en", "tzm", "shi", "shi-Latn", "rif", "rif-Latn", "es"],
"ma": ["ary", "ar", "zgh", "fr", "en", "tzm", "shi", "shi-Latn", "rif-Latn", "rif", "es"],
"mc": ["fr"],
"md": ["ro", "uk", "bg", "gag", "ru"],
"me": ["sr-Latn", "sq", "sr"],
"mf": ["fr"],
"mg": ["mg", "fr", "en"],
"mh": ["en", "mh"],
"mk": ["mk", "sq", "tr"],
"ml": ["bm", "fr", "ffm", "snk", "mwk", "ses", "tmh", "bm-Nkoo", "khq", "dtm", "kao", "ar", "bmq", "bze"],
"ml": ["fr", "bm", "ffm", "snk", "mwk", "ses", "tmh", "bm-Nkoo", "khq", "dtm", "kao", "ar", "bmq", "bze"],
"mm": ["my", "shn", "kac", "mnw", "kht"],
"mn": ["mn", "kk-Arab", "zh", "ru", "ug-Cyrl"],
"mo": ["zh-Hant", "pt", "zh", "en"],
Expand All @@ -168,11 +168,11 @@
"nc": ["fr"],
"ne": ["ha", "fr", "dje", "fuq", "tmh", "ar", "twq", "ff", "ff-Adlm"],
"nf": ["en"],
"ng": ["en", "pcm", "ha", "ig", "yo", "fuv", "tiv", "efi", "ibb", "ha-Arab", "bin", "kaj", "kcg", "ar", "cch", "amo", "ff", "ff-Adlm"],
"ng": ["en", "pcm", "ha", "ig", "yo", "fuv", "tiv", "ibb", "efi", "ha-Arab", "bin", "kaj", "kcg", "ar", "cch", "amo", "ff", "ff-Adlm"],
"ni": ["es"],
"nl": ["nl", "en", "de", "fr", "nds", "li", "fy", "gos", "id", "zea", "rif-Latn", "tr"],
"no": ["nb", "nn", "se"],
"np": ["ne", "mai", "bho", "taj", "new", "jml", "en", "dty", "awa", "thl", "bap", "tdg", "thr", "lif", "mgp", "thq", "mrd", "gvr", "bfy", "xsr", "rjs", "hi", "bo", "tkt", "tdh", "bn", "unr-Deva", "lep"],
"np": ["ne", "mai", "bho", "taj", "new", "jml", "en", "dty", "awa", "thl", "bap", "tdg", "thr", "mgp", "lif", "thq", "mrd", "gvr", "bfy", "xsr", "rjs", "hi", "bo", "tkt", "tdh", "bn", "unr-Deva", "lep"],
"nr": ["en", "na"],
"nu": ["en", "niu"],
"nz": ["en", "mi"],
Expand All @@ -181,7 +181,7 @@
"pe": ["es", "qu", "ay"],
"pf": ["fr", "ty", "zh-Hant"],
"pg": ["tpi", "en", "ho"],
"ph": ["en", "fil", "es", "ceb", "ilo", "hil", "bik", "war", "bhk", "pam", "pag", "mdh", "tsg", "zh-Hant", "cps", "krj", "bto", "hnn", "tbw", "bku"],
"ph": ["en", "fil", "es", "ceb", "ilo", "hil", "bik", "war", "pam", "bhk", "pag", "mdh", "tsg", "zh-Hant", "cps", "krj", "bto", "hnn", "tbw", "bku"],
"pk": ["ur", "pa-Arab", "en", "lah", "ps", "sd", "skr", "bal", "brh", "hno", "fa", "bgn", "hnd", "tg-Arab", "gju", "bft", "kvx", "khw", "mvy", "kxp", "gjk", "ks", "btv"],
"pl": ["pl", "en", "de", "ru", "szl", "be", "uk", "csb", "sli", "lt"],
"pm": ["fr", "en"],
Expand All @@ -195,7 +195,7 @@
"re": ["fr", "rcf", "ta"],
"ro": ["ro", "en", "fr", "es", "hu", "de", "tr", "sr-Latn", "bg", "el", "pl"],
"rs": ["sr", "sr-Latn", "sq", "hu", "ro", "hr", "sk", "uk"],
"ru": ["ru", "tt", "ba", "cv", "hy", "ce", "av", "udm", "chm", "os", "sah", "kbd", "myv", "dar", "bua", "mdf", "kum", "kv", "lez", "krc", "inh", "tyv", "az-Cyrl", "ady", "krl", "lbe", "koi", "mrj", "alt", "fi", "sr-Latn", "vep", "mn", "izh", "cu", "vot"],
"ru": ["ru", "tt", "ba", "cv", "hy", "ce", "av", "udm", "chm", "os", "sah", "kbd", "myv", "dar", "bua", "mdf", "kum", "lez", "kv", "krc", "inh", "tyv", "az-Cyrl", "ady", "krl", "lbe", "koi", "mrj", "alt", "fi", "sr-Latn", "vep", "mn", "izh", "cu", "vot"],
"rw": ["rw", "en", "fr"],
"sa": ["ar"],
"sb": ["en", "rug"],
Expand Down Expand Up @@ -223,22 +223,22 @@
"td": ["fr", "ar"],
"tf": ["fr"],
"tg": ["fr", "ee", "ife"],
"th": ["th", "en", "tts", "nod", "sou", "mfa", "zh-Hant", "kxm", "kdt", "mnw", "shn", "lcp", "lwl"],
"th": ["th", "en", "tts", "nod", "sou", "mfa", "zh-Hant", "kxm", "kdt", "mnw", "shn", "lwl", "lcp"],
"tj": ["tg", "ru", "fa", "ar"],
"tk": ["en", "tkl"],
"tl": ["pt", "tet"],
"tm": ["tk", "ru", "uz", "ku"],
"tn": ["aeb", "ar", "fr"],
"to": ["to", "en"],
"tr": ["tr", "en", "ku", "zza", "kbd", "az", "az-Arab", "ar", "bgx", "bg", "ady", "kiu", "hy", "ka", "lzz", "sr-Latn", "sq", "ab", "el", "tru", "uz", "ky-Latn", "kk"],
"tr": ["tr", "en", "ku", "zza", "kbd", "az", "az-Arab", "ar", "bgx", "bg", "ady", "kiu", "ka", "hy", "lzz", "sr-Latn", "sq", "el", "ab", "tru", "uz", "ky-Latn", "kk"],
"tt": ["en", "es"],
"tv": ["tvl", "en"],
"tw": ["zh-Hant", "trv"],
"tz": ["sw", "en", "suk", "nym", "kde", "bez", "ksb", "mas", "mgy", "asa", "lag", "jmc", "rof", "vun", "rwk", "sbp"],
"tz": ["sw", "en", "suk", "nym", "kde", "ksb", "bez", "mas", "mgy", "asa", "lag", "rof", "jmc", "vun", "rwk", "sbp"],
"ua": ["uk", "ru", "pl", "yi", "rue", "be", "crh", "ro", "bg", "tr", "hu", "el"],
"ug": ["sw", "lg", "nyn", "cgg", "xog", "en", "teo", "laj", "ach", "myx", "rw", "ttj", "hi"],
"um": ["en"],
"us": ["en", "es", "zh-Hant", "fr", "de", "fil", "it", "vi", "ko", "ru", "nv", "yi", "pdc", "haw", "frc", "chr", "esu", "dak", "cho", "lkt", "ik", "mus"],
"us": ["en", "es", "zh-Hant", "fr", "de", "fil", "vi", "it", "ko", "ru", "nv", "yi", "pdc", "haw", "frc", "chr", "esu", "dak", "cho", "lkt", "ik", "mus"],
"uy": ["es"],
"uz": ["uz", "uz-Cyrl", "ru", "kaa", "tr"],
"va": ["it", "la"],
Expand Down
2 changes: 1 addition & 1 deletion dist/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8239,7 +8239,7 @@
"terms": "clerk,deeds,estate,signature,wills"
},
"office/political_party": {
"name": "Political Party",
"name": "Political Party Office",
"terms": ""
},
"office/private_investigator": {
Expand Down

0 comments on commit 5f3aaa8

Please sign in to comment.