Merge branch 'nyalldawson-aus_data'

resources/dictionaries/en/building_types.txt

@@ -1,4 +1,5 @@
-annex|anex|annx|anx|annexe
+annex|anex|annx|anx
+annexe
 building|bdg|bldg|blg
 bungalow|bongalow|bunglow|bungalo|bngw|bnglw
 cabin|cabn

resources/dictionaries/en/personal_titles.txt

@@ -23,7 +23,6 @@ emperor
 brother|br
 father|fr
 sister|sr
-honorable|hon|hounourable
 his royal highness|hrh|h r h
 her royal highness|hrh|h r h
 general|gen

resources/dictionaries/en/place_names.txt

@@ -3,25 +3,31 @@ aerodome
 aged care center|aged care centre|aged care|centre for aged care|center for aged care|center for the aged|centre for the aged|aged care facilities
 amphitheatre|amphitheater
 animal hospital|animal hosp
+annex|anex|annx|anx
+annexe
 air force base|afb
 air national guard base|angb
 airport|aprt
 apartments|apts|appartments
 aquarium
+arcade
 arms
 art gallery|arts gallery
 arts center
 arts centre
 auditorium
 bakery
+ballroom
 bank
 bar
 barn
 barbecue|barbeque|bar be que|bar be cue|bbq
 barracks|barrack|baracks
 bazaar
+beach
 boarding house|bhouse|bh|board house
 bistro
+boathouse
 book store|bookstore
 brewery
 business park|bus pk|biz pk|bus prk|biz prk
@@ -34,6 +40,9 @@ casino
 castle|cst
 cemetery
 center for the arts|centre for the arts
+chalet
+chambers
+chase
 child care|childcare
 chiropractic
 church|chr
@@ -45,11 +54,13 @@ city hall
 clinic
 club|clb
 clubhouse|club house
+clubrooms
 coffee
 college
 committee
 community center|communitycentre|communitycenter|community centre
 community|cmnty|cmty
+complex
 concert hall
 conservatory
 convalescent center|convalescent|convalescent centre|convalescent home|convalescent hospital
@@ -70,6 +81,7 @@ dental
 dentist
 dentistry
 detention|det|detn
+development
 diner
 distillery
 distributor|dstr|distrib|dstrb
@@ -77,6 +89,7 @@ district|dist
 doctors
 elementary school|primary school|public school|ps|p s
 embassy
+estate
 ex services complex
 factory|fcty|fty|fy
 family practice
@@ -86,18 +99,26 @@ farmhouse
 fire department|fd|f d
 fire station
 flats|flts
+foreshore
 forge
 fort|ft
 fountain
 gaol
 garage
+garden
 gallery
 gas station
+gate
 geriatric unit
+golf course
+golf club
 graveyard|grave yard
 grill
+ground
 gym|gymnasium
 hall
+harbor
+harbour
 headquarters
 home|hm|hme|hom
 homes
@@ -109,6 +130,7 @@ hotel|hot|hotl|htel
 hostel
 house
 houses|hses
+hub
 ice cream|icecream
 industrial park|ind park
 inn
@@ -128,7 +150,7 @@ mall|mll
 maison
 manor|mnr
 manors|mnrs
-market|mkt|mrkt
+marina
 marketplace|mktpl|mktplc
 mansion
 mansions
@@ -147,12 +169,11 @@ nursing
 nursing center|nursing centre
 nursing home|nh|nhome|nrs|nrsg|nsg|nurs|nrsng hm|n h|nrs home|n home|nursing hom|nursing ho|nursing h
 high school|hs|h s
-secondary school
 junior high school|jr high school|jhs|j h s|jr hs|jr h s
 laboratory
 lab
 labs
-market|mkt
+market|mkt|mrkt
 middle school|ms|m s
 movie theater
 movie theatre
@@ -166,12 +187,12 @@ offices|ofcs
 office tower|ofc twr|office twr|ofc tower
 office towers|ofc twrs|office twrs|ofc towers
 opera house
+oval
 parish
 park|pk|prk
 parking
 parking lot
 pavilion
-pharmacy
 pediatric
 penitentiary
 performing arts centre
@@ -179,6 +200,7 @@ performing arts center
 pharmacy
 pier
 playhouse
+plaza
 police department|pd|p d
 police station
 polytechnic
@@ -193,16 +215,21 @@ prison
 pub
 public pool
 public school|ps
+raceway
+racing track
+racecourse
 recycling
 retreat|rtt
 rotary|rty
 reservation|res|resrv|resv|rsrv|rserv|rs
 reserve|res|resrv|resv|rsrv|rserv|rserve|rsrve
 reservoir|res
+resort
 restaurant
 retirement home|retirement village|ret village|masonic retirement village|retirement|ret vill|retirement home|retirement v|rh|r h
 roadhouse
 roller rink
+room
 saloon
 salon
 sanctuary|sanct
@@ -211,11 +238,13 @@ secondary school
 shelter
 sheriff's department|sherrifs department|sheriff's dept|sherrifs dept
 sherrif's office|sherffis office|sheriff's ofc|sheriffs ofc
-shopping center|shoppingcenter|shoppingcentre|shopping|shoppingtown|shopping town|shopping centre|shctr|sh ctr
+shopping center|shoppingcenter|shoppingcentre|shopping|shoppingtown|shopping town|shopping centre|shctr|sh ctr|s / centre|shp / centre
 shop|shp
+showground
 sisters
 social club
 spa
+sportsground
 stables
 stadium
 station|sta|stn
@@ -223,10 +252,13 @@ steakhouse
 store|stor
 studio
 studios
+subdivision
+supermarket
 swimming pool
 tavern
 tea
 terminal|term
+terrace
 theater
 theatre
 theatres
@@ -239,6 +271,8 @@ trailer park|tlpk
 university|uni|univ|univers|unvrsty
 units
 urgent care
+vault
+velodrome
 vet
 veterinary
 veterinarian
@@ -248,7 +282,9 @@ villa|vll|vla
 villas|vlls|vlas
 village|vil|vge|vill|villag|villg|vlg|vlge|vllg
 villages|vlgs
+vineyard
 wine bar|winebar
 winery
 yoga
-youth center|youth centre
+youth center|youth centre
+zoo

resources/dictionaries/en/post_office.txt

@@ -1,8 +1,14 @@
 bag|lb|lmb|mailbag|lockedbag|mail bag|locked bag|locked mail bag
+community mail bag|cmb
+gpo box|gpo
 p.o. box|pobox|postbox|post box|po box|post office box|post box|p o box|p office box|pb
 post mail box|post mail box|pmb
+locked bag
 mail|m|ml
 mailservice|ms|m s|mail service
 mailcenter|mail center|mail centre|mc|m c
-rmb|road mail box|r m b|roadside mail box|roadside mailbox|rms box
+rmb|road mail box|r m b|roadside mail box|roadside mailbox|rms box|road mailbox
+roadside delivery|rsd
+roadside mail service|rmd
 post office|po|postoffice|pst
+private bag

resources/dictionaries/en/stopwords.txt

@@ -6,4 +6,5 @@ of
 near
 the
 to
-via
+via
+opposite

resources/dictionaries/en/street_types.txt

@@ -4,9 +4,10 @@ acres|acrs
 alley|aly|ally|alee
 alleyway|alwy|allyway|allwy
 amble|ambl
+anchorage|ancg
 annex|anx
 apartments|apts|appartments
-approach|app|apch
+approach|app|apch|appr
 arcade|arc
 arterial|artl
 artery|art|arty
@@ -100,6 +101,7 @@ curve|cve|crv|crve|curv
 cutting|cttg|ctg|cutt
 dale|dle
 dell
+dene
 deviation|devn
 dip
 distributor|dstr
@@ -138,7 +140,6 @@ firetrack|ftrk|fire track
 firetrail|fit|fitr|fire trail
 flat|fl|flt
 flats|flts
-field|fd
 follow|folw
 footway|ftwy|foot way
 ford|frd
@@ -183,7 +184,7 @@ inlet|inlt
 interchange|intg|intchg|inter change
 intersection|intn|inter section|intsctn
 interstate|inter state|i
-island|is|id|i|isld
+island|is|id|i|isl|isld
 islands|iss|ids|islds
 isle
 junction|jct|jnc|jnct|jctn|jtn|junct|j
@@ -197,8 +198,9 @@ ladder|ladr
 lagoon|lagn|lgn|lagon
 land
 landing|ldg|lndg|landng
-lane|ln|la
+lane|l|ln|la
 laneway|lnwy
+lees
 light|lgt|lt
 limits|lmts
 line|ln
@@ -268,6 +270,7 @@ prairie|pr
 priors|prrs
 private|pvt
 promenade|prom|prm
+pursuit|pur
 quad|qd
 quadrangle|qdgl
 quadrant|qdrt|qd
@@ -301,6 +304,7 @@ roads|raods|rds
 roadside|rdsd|road side
 roadway|rdwy|rdw|rdy
 rocks|rks
+ronde|rnde
 rosebowl|rsbl|rose bowl
 rotary|rty
 round|rnd
@@ -326,10 +330,12 @@ springs|spgs|sprngs
 spur|spr
 square|sq|sqr
 squares|sqs
+stairs|strs
 stairway|stwy|strwy|stair way|st.wy|st wy|str.way|str way
 state highway|s.highway|s highway|st.highway|st highway|sh|s.h.|s.h|s h|st.h|st h|s.hw|s hw|st.hw|st hw|s.hwy|s hwy|shwy|s.hgwy|s hgwy|st.hgwy|st hgwy|s.hway|s hway|st.hway|st hway|s.hwy|s hwy|st.hwy|st hwy|s.hi|s hi|st.hi|st hi|statehighway
 state road|sr|stateroad|s.r.|s.r|s r|s.road|s road|st.road|st road|staterd|srd|s.rd|s rd|state rd|strd|st.rd|st rd
 state route|sr|stateroute|s.r.|s.r|s r|s.route|s route|st.route|st route|statert|srt|s.rt|s rt|srte|s.rte|s rte|state rt|state rte|strt|strte|st.rt|st rt|st.rte|st rte
+steps|stps
 strand|stra|strnd|strd
 strands|strnds|strds
 stravenue|stra|strav
@@ -344,12 +350,13 @@ terrace|tce|ter|tr|terr|terace|terrac|terrasse|tsse
 thicket|thick
 thoroughfare|thor|throughfare|thorough fare|thfr
 thoroughway|thwy
-throughway|thru|thruway|trwy
+throughway|thru|thro|thruway|trwy
 tollway|tlwy|twy
+top
+tor
 township highway|th|t.h.|t.h|t h|twp.h|twp h|tshp.h|tshp h|t.hw|t hw|twp.hw|twp hw|tshp.hw|tshp hw|t.hgwy|t hgwy|twp.hgwy|twp hgwy|tshp.hgwy|tshp hgwy|t.hway|t hway|twp.hway|twp hway|tshp.hway|tshp hway|t.hwy|t hwy|twp.hwy|twp hwy|tshp.hwy|tshp hwy|t.hi|t hi|twp.hi|twp hi|tshp.hi|tshp hi
 township road|tr|t.r.|t.r|t r|t rd|t.rd|trd|twpr|twp.r|twp r|twp.rd|twp rd|tshp.r|tshp r|tshp.rd|tshp rd
 township route|tr|t.r.|t.r|t r|t rt|t.rt|trt|t.rte|t rte|twpr|twp.r|twp r|twp.rt|twp rt|twp.rte|twp rte|tshp.r|tshp r|tshp.rt|tshp rt|tshp.rte|tshp rte
-tor
 tower|twr
 towers|twrs
 townline|tline

resources/dictionaries/en/unit_types.txt

@@ -1,7 +1,11 @@
+allotment
 antenna|ant
 apartment|apartement|apt|aprt|apparement|appartment
+bathing box|bbox
 barbeque|bbq|barbecue
 berth|brth
+building|bdg|bldg|blg
+bungalow|bongalow|bunglow|bungalo|bngw|bnglw
 cage
 caravan|cvan
 carpark|carp
@@ -24,7 +28,7 @@ location|loc
 lot
 lower|lwr
 maisonette|msnt
-marine berth|mb
+marine berth|mb|mbth
 number|#|nbr|num|no|nmbr|nr
 office|ofc|off|offc
 penthouse|pths|ph|pent house