Permalink
Browse files

add regions ie,au

  • Loading branch information...
1 parent 1c45e8b commit 594ddcbaec5e769979686d16641086ca868c1595 @geraldb geraldb committed Apr 3, 2013
Showing with 209 additions and 37 deletions.
  1. +23 −15 europe/ch/cities.txt
  2. +19 −19 europe/ch/regions.txt
  3. +9 −2 europe/ie/cities.txt
  4. +103 −0 europe/ie/regions.txt
  5. +34 −1 pacific/au/cities.txt
  6. +16 −0 pacific/au/regions.txt
  7. +2 −0 setups/all.yml
  8. +1 −0 setups/europe.yml
  9. +2 −0 setups/sport.db.admin.yml
View
@@ -1,24 +1,32 @@
+
zuerich, Zürich, region:zh, m:742_000,
-winterthur, Winterthur, region:zh
+Winterthur, region:zh
-bern, Bern, region:be
-thun, Thun, region:be
+Bern, region:be
+Thun, region:be
biel, Biel-Bienne, region:be
stgallen, St. Gallen, region:sg
-wil, Wil, region:sg
+Wil, region:sg
+
+Bellinzona, region:ti
+Chiasso, region:ti
+Lugano, region:ti
+Locarno, region:ti
+
+Aarau, region:ag
+Wohlen, region:ag
-bellinzona, Bellinzona, region:ti
-chiasso, Chiasso, region:ti
-lugano, Lugano, region:ti
-locarno, Locarno, region:ti
+Basel, region:bs
+geneve, Genève, region:ge
+Lausanne, region:vd
+Luzern, region:lu
+Sion, region:vs
-aarau, Aarau, region:ag
-wohlen, Wohlen, region:ag
-basel, Basel, region:bs
-geneve, Genève, region:ge
-lausanne, Lausanne, region:vd
-luzern, Luzern, region:lu
-sion, Sion, region:vs
+## todo: check auto-key generator
+# for Zürich -> zuerich
+# Genève -> geneve
+# St. Gallen -> stgallen
+# remove key here
View
@@ -24,13 +24,13 @@
###
# Eastern Switzerland / Ostschweiz
-gl, Glarus, Glarus, 685, de|eastern_switzerland
-sh, Schaffhausen, Schaffhausen, 298, de|eastern_switzerland
-ar, Appenzell Ausserrhoden|Ap. Ausserrhoden, Herisau, 243, de|eastern_switzerland
-ai, Appenzell Innerrhoden|Ap. Innerrhoden, Appenzell, 173, de|eastern_switzerland
-sg, St. Gallen, St. Gallen, 2_026, de|eastern_switzerland
-gr, Graubünden, Chur, 7_105, de|rm|it|eastern_switzerland
-tg, Thurgau, Frauenfeld, 991, de|eastern_switzerland
+gl, Glarus, Glarus, 685, de|eastern
+sh, Schaffhausen, Schaffhausen, 298, de|eastern
+ar, Appenzell Ausserrhoden|Ap. Ausserrhoden, Herisau, 243, de|eastern
+ai, Appenzell Innerrhoden|Ap. Innerrhoden, Appenzell, 173, de|eastern
+sg, St. Gallen, St. Gallen, 2_026, de|eastern
+gr, Graubünden, Chur, 7_105, de|rm|it|eastern
+tg, Thurgau, Frauenfeld, 991, de|eastern
##############
# Zurich
@@ -40,19 +40,19 @@ zh, Zürich, Zürich, 1_729, de|zurich
################
# Central Switzerland / Zentralschweiz
-lu, Luzern, Luzern, 1_493, de|central_switzerland
-ur, Uri, Altdorf, 1_077, de|central_switzerland
-sz, Schwyz, Schwyz, 908, de|central_switzerland
-ow, Obwalden, Sarnen, 491, de|central_switzerland
-nw, Nidwalden, Stans, 276, de|central_switzerland
-zg, Zug, Zug, 239, de|central_switzerland
+lu, Luzern, Luzern, 1_493, de|central
+ur, Uri, Altdorf, 1_077, de|central
+sz, Schwyz, Schwyz, 908, de|central
+ow, Obwalden, Sarnen, 491, de|central
+nw, Nidwalden, Stans, 276, de|central
+zg, Zug, Zug, 239, de|central
#####################################
# Northwestern Switzerland / Nordwestschweiz
-bs, Basel-Stadt, Basel, 37, de|northwestern_switzerland
-bl, Basel-Landschaft, Liestal, 518, de|northwestern_switzerland
-ag, Aargau, Aarau, 1_404, de|northwestern_switzerland
+bs, Basel-Stadt, Basel, 37, de|northwestern
+bl, Basel-Landschaft, Liestal, 518, de|northwestern
+ag, Aargau, Aarau, 1_404, de|northwestern
########################
# Espace Mittelland
@@ -68,11 +68,11 @@ ju, Jura, Delsberg, 838, fr|espace_mittelland
####################################
# Lake Geneva region / Région lémanique / Genferseeregion
-vd, Vaud|Waadt, Lausanne, 3_212, fr|lake_geneva_region
-vs, Valais|Wallis, Sitten, 5_224, fr|de|lake_geneva_region
+vd, Vaud|Waadt, Lausanne, 3_212, fr|lake_geneva
+vs, Valais|Wallis, Sitten, 5_224, fr|de|lake_geneva
### todo: add Genève as capital
-ge, Genève|Genf, 282, fr|lake_geneva_region
+ge, Genève|Genf, 282, fr|lake_geneva
#################################
# Ticino / Tessin
View
@@ -1,3 +1,10 @@
-dublin, Dublin, m:1_128_000
-
+Dublin, DB, 1_110_627, m:1_801_040
+Cork, CO, 198_582
+Limerick, LK, 91_454
+Galway, GA, 76_778
+Waterford, WD, 51_519
+Drogheda, LH, 38_578
+Dundalk, LH, 37_816
+Bray, WW, 32_781
+Swords, DB, 30_742
View
@@ -0,0 +1,103 @@
+##################
+# for regions, counties, etc.
+#
+# see en.wikipedia.org/wiki/ISO_3166-2:IE
+# and en.wikipedia.org/wiki/NUTS_of_Ireland
+
+
+#####
+# NB: Ireland is divided into 26 (traditional) counties
+#
+# - for now use only traditional counties from nuts (skip "non-tradition")
+#
+# only exception is Tipperary!! (why? use two different NUTS 2 regions)
+# split into Northern Tipperary and
+# Southern Tipperary
+#
+# thus, 25+2 = 27 regions
+#
+# e.g.
+# Galaway City n Galway is just Galway
+# 4 Dublin Nuts is just Dublin etc.
+
+
+#########################
+# NUTS II Region: Border, Midland and Western
+
+lh, Louth / Leinster, 832 km², Dundalk, border|leinster
+
+## NB: check if auto-city generate works for names with dash e.g. Carrick-on-Shannon
+lm, Leitrim / Connaught, 1_589 km², Carrick-on-Shannon, border|connaught
+so, Sligo / Connaught, 1_837 km², Sligo, border|connaught
+cn, Cavan / Ulster, 1_932 km², Cavan, border|ulster
+dl, Donegal / Ulster, 4_860 km², Lifford, border|ulster
+mn, Monaghan / Ulster, 1_296 km², Monaghan, border|ulster
+ls, Laois / Leinster, 1_719 km², Portlaoise, midlands|leinster
+ld, Longford / Leinster, 1_091 km², Longford, midlands|leinster
+oy, Offaly / Leinster, 1_990 km², Tullamore, midlands|leinster
+wh, Westmeath / Leinster, 1_825 km², Mullingar, midlands|leinster
+
+## NB: check conflic? Galway captial for two regions?
+# gc, Galway City, 51 km², Galway, west # NB: orignal code is single-letter G only
+# ga, Galway, 6_100 km², Galway, west # NB: orginal code is single-letter G only
+
+## NB: rolled into one
+ga, Galway / Connaught, 5_940 km², Galway, west|connaught # NB: orginal code is single-letter G only
+
+mo, Mayo / Connaught, 5_588 km², Castlebar, west|connaught
+rn, Roscommon / Connaught, 2_548 km², Roscommon, west|connaught
+
+
+######################################
+# NUTS II Region: Southern and Eastern
+
+# Dublin City, 118 km², Dublin, dublin_region
+# Dún Laoghaire-Rathdown, 127 km², Dún Laoghaire, dublin
+# Fingal, 453 km², Swords, dublin_region
+# South Dublin, 223 km², Tallaght, dublin_region
+
+## NB: all *four* dublin regions rolled into one
+db, Dublin / Leinster, 921 km², Dublin, dublin|leinster # NB: orginal code is single-letter D only
+
+
+## NB: check conflic? Limerick captial for two regions?
+# lc, Limerick City, 20 km², Limerick, mid_west # NB: original code is single-letter L only
+# lk, Limerick, 2_740 km², Limerick, mid_west
+
+## NB: rolled into one
+lk, Limerick / Munster, 2_760 km², Limerick, mid_west|munster
+
+
+### merge into one ? Tipperary (ta) ?? province M
+
+tn, North Tipperary / Munster, 2_046 km², Nenagh, mid_west|munster
+ts, South Tipperary / Munster, 2_258 km², Clonmel, south_east|munster
+
+
+ce, Clare / Munster, 3_442 km², Ennis, mid_west|munster
+ke, Kildare / Leinster, 1_694 km², Naas, mid_east|leinster
+mh, Meath / Leinster, 2_335 km², Navan, mid_east|leinster
+ww, Wicklow / Leinster, 2_033 km², Wicklow, mid_east|leinster
+wx, Wexford / Leinster, 2_365 km², Wexford, south_east|leinster
+kk, Kilkenny / Leinster, 2_072 km², Kilkenny, south_east|leinster
+cw, Carlow / Leinster, 898 km², Carlow, south_east|leinster
+
+
+
+####
+# wc, Waterford City, 42 km², Waterford, south_east # NB: original code is single-letter W
+# wd, Waterford, 1_817 km², Dungarvan, south_east
+
+## NB: rolled into one
+wd, Waterford / Munster, 1_859 km², Waterford, south_east|munster
+
+
+## NB: check conflic? Cork captial for two regions?
+# cc, Cork City, 40 km², Cork, south_west # NB: original code is single-letter C
+# co, Cork, 7_468 km², Cork, south_west # NB: original code is single-letter C
+
+## NB: rolled into one
+co, Cork / Munster, 7_508 km², Cork, south_west|munster # NB: original code is single-letter C
+
+
+ky, Kerry / Munster, 4_735 km², Tralee, south_west|munster
View
@@ -1,2 +1,35 @@
+#########################
+# see en.wikipedia.org/wiki/List_of_cities_in_Australia_by_population
-## add australian regions and cities here
+
+Sydney, NS, 3_908_642, m:4_605_992
+Melbourne, VI, 3_707_530, m:4_169_103
+Brisbane, QL, 1_874_427, m:2_146_577
+Perth, WA, 1_627_576, m:1_832_114
+Adelaide, SA, 1_103_979, m:1_262_940
+Gold Coast, QL, 591_473 # NB: metro Gold Coast-Tweed Heads
+Tweed Heads, NS, 51_788 # NB: metro Gold Coast-Tweed Heads
+Newcastle, NS, 308_308, m:540_002
+Canberra, CT, 367_752 # NB: metro Canberra-Queanbeyan
+Queanbeyan, NS, 34_084 # NB: metro Canberra-Queanbeyan
+Wollongong, NS, 245_942, m:288_101
+Hobart, TS, 170_975, m:216_276 # fix/check: use Greater Hobart for metro region?
+Geelong, VI, 143_291, m:174_087
+Townsville, QL, m:167_636
+Cairns, QL, 133_893, m:146_477
+Darwin, NT, 75_908, m:129_062
+Toowoomba, QL, 96_597, m:125_265
+Launceston, TS, 74_085, m:107_746
+Albury, NS, 45_627 # NB: metro Albury-Wodonga
+Wodonga, VI, 31_605 # NB: metro Albury-Wodonga
+Ballarat, VI, 85_935, m:95_007
+Bendigo, VI, 82_794, m:89_666
+
+
+
+## fix: metro region only - Sunshine Coast, QL, m:241_643
+
+# todo/fix: check how to handle metro regions with two states e.g.
+# - Gold Coast-Tweed Heads QLD/NSW 576,747
+# - Canberra-Queanbeyan ACT/NSW 418,292
+# - Albury-Wodonga NSW/VIC 103,209
View
@@ -0,0 +1,16 @@
+#############################
+#
+# see en.wikipedia.org/wiki/ISO_3166-2:AU
+
+
+# NB: we use (old) two-letter codes for keys;
+# if you want to use "proper" iso code use the iso attribute/field
+
+ns, New South Wales, 801_425 km², Sydney # state
+ql, Queensland, 1_736_587 km², Brisbane # state
+sa, South Australia, 984_377 km², Adelaide # state
+ts, Tasmania, 68_127 km², Hobart # state
+vi, Victoria, 227_619 km², Melbourne # state
+wa, Western Australia, 2_527_621 km², Perth # state
+ct, Australian Capital Territory, 2_365 km², Canberra # territory
+nt, Northern Territory, 1_356_170 km², Darwin # territory
View
@@ -140,6 +140,7 @@ europe:
- europe/gr/cities
- europe/hr/cities
- europe/hu/cities
+- europe/ie/regions
- europe/ie/cities
- europe/it/regions
- europe/it/regions.iso
@@ -165,4 +166,5 @@ pacific:
- pacific/1-codes/fifa
- pacific/1-codes/internet
- pacific/1-codes/iso3
+- pacific/au/regions
- pacific/au/cities
View
@@ -51,6 +51,7 @@ europe:
- europe/gr/cities
- europe/hr/cities
- europe/hu/cities
+- europe/ie/regions
- europe/ie/cities
- europe/it/regions
- europe/it/regions.iso
@@ -127,6 +127,7 @@ europe:
- europe/gr/cities
- europe/hr/cities
- europe/hu/cities
+- europe/ie/regions
- europe/ie/cities
- europe/it/regions
- europe/it/regions.iso
@@ -152,4 +153,5 @@ pacific:
- pacific/1-codes/fifa
- pacific/1-codes/internet
- pacific/1-codes/iso3
+- pacific/au/regions
- pacific/au/cities

0 comments on commit 594ddcb

Please sign in to comment.