From 21cf7245a7be357da20bc44f3fa1348b89f46c9d Mon Sep 17 00:00:00 2001
From: Riordan <dr@daveriordan.com>
Date: Mon, 22 Feb 2016 17:27:14 -0500
Subject: [PATCH 1/2] Added additional street types from NY State Post-Address
 Types

NY State [posted their state address database](http://gis.ny.gov/gisdata/inventories/details.cfm?DSID=921) along with the metadata standards for consuming it. Included in this metadata is a [guide to abbreviations](http://gis.ny.gov/gisdata/supportfiles/Updated-Deliverable-Schema.pdf), incorporated in this commit.
---
 resources/dictionaries/en/street_types.txt | 78 +++++++++++++++++++---
 1 file changed, 69 insertions(+), 9 deletions(-)

diff --git a/resources/dictionaries/en/street_types.txt b/resources/dictionaries/en/street_types.txt
index 3ac4658a..b65171a4 100644
--- a/resources/dictionaries/en/street_types.txt
+++ b/resources/dictionaries/en/street_types.txt
@@ -1,6 +1,6 @@
 abbey|abby
 access|accs
-acres
+acres|acrs
 alley|aly|ally|alee
 alleyway|alwy|allyway|allwy
 amble|ambl
@@ -36,19 +36,24 @@ break|brk
 bridge|bdge|br|brdg|bri|brg
 broadway|bdwy|bway|bwy|brdway
 brook|brk
+brooks|brks
 brow|brw
 burg|bg
+burgs|brgs
 butte|btte|bte
 bypass|bypa|byps|bps|byp
 byway|bywy
 camp|cp
+cape|cpe
 canyon|cyn|cnyn
 caravan|cvan|cvn|c van
 causeway|csway|cswy|causewy|caus|cause|cway
 center|centre|cetr|cntr|ctr|c|cen
+centers|ctrs
 centreway|cnwy
-chase|ch
+chase|ch|chas
 circle|cir|circel
+circles|cirs
 circlet|clt
 circuit|crct|circ|cct|cirt|ci|circt
 circus|crcs|crc
@@ -56,6 +61,7 @@ claim|clm
 cliff|clf
 cliffs|clfs
 close|cl|cls|clse
+club|clb
 cluster|clr|clstr
 colonnade|clde|clnde
 common|cmmn|comm|cmn
@@ -72,7 +78,7 @@ corseo|cseo
 corso|cso
 county highway|ch|c.h.|c.h|c h|c.hw|c hw|co.hw|co hw|cty.hw|cty hw|c.hgwy|c hgwy|co.hgwy|co hgwy|cty.hgwy|cty hgwy|c.hway|c hway|co.hway|co hway|cty.hway|cty hway|c.hwy|c hwy|co.hwy|co hwy|cty.hwy|cty hwy|c.hi|c hi|co.hi|co hi|cty.hi|cty hi
 county road|cr|c.r.|c.r|c r|co.r|co r|c.rd|c rd|co.rd|co rd|cty.r|cty r|cty.rd|cty rd
-county route|cr|c.r.|c.r|c r|co.r|co r|c.rt|c rt|co.rt|co rt|cty.r|cty r|cty.rt|cty rt|c.rte|c rte|co.rte|co rte|cty.rte|cty rte
+county route|cr|c.r.|c.r|c r|co.r|co r|c.rt|c rt|co.rt|co rt|cty.r|cty r|cty.rt|cty rt|c.rte|c rte|co.rte|co rte|cty.rte|cty rte|county touring route
 course|crse
 court|ct|crt
 courts|crts|cts
@@ -84,13 +90,14 @@ crest|crst|cst
 crief|crf
 croft|cft
 cross|cs|crss
-crossing|crsg|xing|csg
+crossing|crsg|xing|csg|x ing|x-ing
 crossroad|crd|cross road|xroad|x-road|x road|xrd|x-rd|x rd
+crossroads|cross roads|xrds
 crossway|cowy|crwy|xway|xwy|x-way|x way|x-wy|xwy
 cruiseway|cuwy|crwy
 cul
 cul de sac|cul-de-sac|culdesac|cds|cusac|csac
-curve|cve|crv|crve
+curve|cve|crv|crve|curv
 cutting|cttg|ctg|cutt
 dale|dle
 dell
@@ -116,6 +123,7 @@ estates|ests
 exit
 expressway|exp|expwy|expway|expy
 extension|ex|ext|extn|exten
+extensions|exts
 fairway|fawy|fy
 fall|fl
 falls|fls
@@ -131,13 +139,19 @@ firetrack|ftrk|fire track
 firetrail|fit|fitr|fire trail
 flat|fl|flt
 flats|flts
-ferry|fy
 field|fd
 follow|folw
 footway|ftwy|foot way
 ford|frd
+fords|frds
+fork|frk
+forks|frks
 foreshore|fshr|fore shore
+forest|frst
+forge|frg
+forges|frgs
 formation|form|fmtn
+fort|ft
 freeway|frwy|fw|fwy|fway
 front|frnt
 frontage|frtg|fr
@@ -149,16 +163,20 @@ gates|gtes
 gateway|gwy|gway|gtwy|gtway
 glade|gl|gld|glde
 glen|gln
+glens|glns
 grand boulevard|gbd|grbd|grdbd|gdbd|g bd|gr bd|grd bd|gd bd|g blvd|gr blvd|grd blvd|gd blvd|g bde|gr bde|grd bde|gd bde|g blvrd|gr blvrd|grd blvrd|gd blvrd|g boul|gr boul|grd boul|gd boul|g bvd|gr bvd|grd bvd|gd bvd|g bld|gr bld|grd bld|gd bld
 grange|gra
 green|grn|gn
+greens|grns
 ground|grnd
 grounds|grnds
 grove|gr|grv|grve|gro
+groves|grvs
 gulch
 gully|gly
 hanger|hngr
 harbor|harbour|hbr|hrbr
+harbors|hbrs
 haven|hvn
 head|hd
 heads|hds
@@ -178,14 +196,17 @@ intersection|intn|inter section|intsctn
 interstate|inter state|i
 island|is|id|i|isld
 islands|iss|ids|islds
+isle
 junction|jct|jnc|jnct|jctn|jtn|junct|j
+junctions|jcts
 key|ky
 keys|kys
 knob
-knoll|knol
+knoll|knol|knl
 knolls|knls
 ladder|ladr
 lagoon|lagn|lgn|lagon
+land
 landing|ldg|lndg|landng
 lane|ln|la
 laneway|lnwy
@@ -194,6 +215,10 @@ limits|lmts
 line|ln
 link|lnk|lk
 little|lit|ltl|lt
+lock|lck
+locks|lcks
+lodge|ldg
+loaf|lf
 lookout|lkt|look out
 loop|lp
 loops|lps
@@ -201,6 +226,7 @@ lot
 lynne|lynn
 mall|ml
 manor|mnr
+manors|mnrs
 maze
 meadow|mdw
 meadows|mdws
@@ -211,22 +237,30 @@ mews|mws
 mile|mi
 mill|ml
 mills|mls
+mission|msn
 moor
+mountain|mt|mtn
+mountains|mts|mtns
 motorway|mway|mwy|mtwy
 neaves|nvs
+neck|nck
 nook|nk
 number|#|nbr|num|no|nmbr|nr
 oaks
+orchard|orch
 outlet|otlt
 outlook|out|otlk
 oval
 overbridge|ovrb|over bridge
+overlook|over look|ovlk
+overpass|over pass|opas
 paddock|padk
 palms|plms
 parade|pde|prd|prde
 park|pk|prk
 parklands|pkld|pklds|parkland|park lands|park land
 parkway|pkwy|parkwy|pky|pkway|prkwy|prkway|pkw|pwy
+parkways|pkwys
 part|prt
 pass|ps
 passage|psge|pass
@@ -234,17 +268,22 @@ path|pth
 pathway|phwy|pway|pthway|pthwy|ptway|ptwy
 peninsula|psla
 piazza|piaz|pzza
+pier
 pike|pk
 pine|pne|pn
 pines|pns|pnes
+pond
 place|pl|pla|plc
 plain|pln|pl
 plains|plns|pls
 plateau|plat|plt
 plaza|plz|plza|pz
+prarie|pr
 pocket|pkt|pokt|pckt
 point|piont|pnt|pt
 pointe|pte|pnte
+port|prt
+ports|prts
 prairie|pr
 priors|prrs
 private|pvt
@@ -270,10 +309,12 @@ retreat|rt|rtt
 return|rtn
 ride
 ridge|rdge|rdg
+ridges|rdgs
 ridgeway|rgwy|rdgwy|ridge way
 right of way|rowy|rightofway|rofw|row|r o w|r of w
 ring
 rise|ri
+river|riv
 riverway|rvwy
 riviera|rvra
 road|raod|rd
@@ -287,15 +328,19 @@ round|rnd
 roundabout
 route|rt|rte
 row|rw
+rue
 run|rn
 service road|svc rd|svc road|service rd
 serviceway|swy|svwy|svcwy
 shoal|shl
 shoals|shls
+shopping center|shctr
 shore|shor|shr
 shores|shors|shrs
 shunt|shun|shnt
 siding|sdng|sdg
+skyway|skwy
+slip
 slope|slpe|slp
 sound|snd
 space|spc
@@ -303,14 +348,18 @@ spring|spg|sprng
 springs|spgs|sprngs
 spur|spr
 square|sq|sqr
+squares|sqs
 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
+station|sta
 strand|stra|strnd|strd
 strands|strnds|strds
 stravenue|stra|strav
+stream|strm
 street|st|str
+streets|sts
 strip|strp
 subdivision|subdiv
 subway|sbwy
@@ -321,6 +370,7 @@ thicket|thick
 thoroughfare|thor|throughfare|thorough fare|thfr
 thoroughway|thwy
 throughway|thru
+thruway|trwy
 tollway|tlwy|twy
 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
@@ -334,10 +384,12 @@ track|tr|trk|trak
 trafficway|trfy
 trail|tr|trl
 trailer|trlr
+trailer park|tlpk
 tram
 tramway|tmwy
 trees|trs
 triangle|tri
+truck trail|trktrl
 trunkway|tkwy
 tunnel|tun|tunl
 turnabout|trnabt
@@ -345,12 +397,19 @@ turn|tn|trn
 turnpike|tpk|tpke
 underpass|upas|upass|ups|under pass
 union|un
+unions|uns
+us highway|us hwy
+us route|us rte
 vale|va|vl
 valley|vlly|vly|vy
+valleys|vlys|vllys
 vennel
 viaduct|via|viad|vdct|viadct
 view|vw
 views|vws
+village|vlg
+villages|vlgs
+ville|vl
 vista|vst|vsta|vis
 vue
 wade
@@ -361,6 +420,7 @@ way|wy
 ways|wys
 well|wl
 wells|wls
-wharf|whrf
+wharf|whrf|whf
+woods|wds
 wynd|wyn
-yard|yd|yrd
\ No newline at end of file
+yard|yd|yrd

From f349dbac01f1be7e34ea58edd7f46eb76dab1025 Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Mon, 22 Feb 2016 18:26:02 -0500
Subject: [PATCH 2/2] [dictionaries] Removing Rue from English street types
 (addresses using Rue as the street type are actually in French, which is a
 valid, detectable, regional language for the US in libpostal). Some of the
 abbreviations also belong in the synonyms or place names dictionaries.

---
 resources/dictionaries/en/place_names.txt  |  8 +++--
 resources/dictionaries/en/street_types.txt | 35 ++--------------------
 resources/dictionaries/en/synonyms.txt     | 10 +++++++
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/resources/dictionaries/en/place_names.txt b/resources/dictionaries/en/place_names.txt
index 25fd94c4..ece49132 100644
--- a/resources/dictionaries/en/place_names.txt
+++ b/resources/dictionaries/en/place_names.txt
@@ -127,6 +127,7 @@ lounge
 mall|mll
 maison
 manor|mnr
+manors|mnrs
 market|mkt|mrkt
 marketplace|mktpl|mktplc
 mansion
@@ -176,6 +177,7 @@ penitentiary
 performing arts centre
 performing arts center
 pharmacy
+pier
 playhouse
 police department|pd|p d
 police station
@@ -209,7 +211,7 @@ 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 centre|shopping 
+shopping center|shoppingcenter|shoppingcentre|shopping|shoppingtown|shopping town|shopping centre|shctr|sh ctr
 shop|shp
 sisters
 social club
@@ -233,6 +235,7 @@ tower|twr
 town hall
 townhouse|town house
 townhouses|town houses
+trailer park|tlpk
 university|uni|univ|univers|unvrsty
 units
 urgent care
@@ -243,7 +246,8 @@ veterinarians
 vets
 villa|vll|vla
 villas|vlls|vlas
-village|vil|vge|vill|villag|villg|vlg|vlge|vllg|villages|vlgs
+village|vil|vge|vill|villag|villg|vlg|vlge|vllg
+villages|vlgs
 wine bar|winebar
 winery
 yoga
diff --git a/resources/dictionaries/en/street_types.txt b/resources/dictionaries/en/street_types.txt
index b65171a4..f6b676cf 100644
--- a/resources/dictionaries/en/street_types.txt
+++ b/resources/dictionaries/en/street_types.txt
@@ -61,7 +61,6 @@ claim|clm
 cliff|clf
 cliffs|clfs
 close|cl|cls|clse
-club|clb
 cluster|clr|clstr
 colonnade|clde|clnde
 common|cmmn|comm|cmn
@@ -143,15 +142,8 @@ field|fd
 follow|folw
 footway|ftwy|foot way
 ford|frd
-fords|frds
-fork|frk
-forks|frks
 foreshore|fshr|fore shore
-forest|frst
-forge|frg
-forges|frgs
 formation|form|fmtn
-fort|ft
 freeway|frwy|fw|fwy|fway
 front|frnt
 frontage|frtg|fr
@@ -163,15 +155,12 @@ gates|gtes
 gateway|gwy|gway|gtwy|gtway
 glade|gl|gld|glde
 glen|gln
-glens|glns
 grand boulevard|gbd|grbd|grdbd|gdbd|g bd|gr bd|grd bd|gd bd|g blvd|gr blvd|grd blvd|gd blvd|g bde|gr bde|grd bde|gd bde|g blvrd|gr blvrd|grd blvrd|gd blvrd|g boul|gr boul|grd boul|gd boul|g bvd|gr bvd|grd bvd|gd bvd|g bld|gr bld|grd bld|gd bld
 grange|gra
 green|grn|gn
-greens|grns
 ground|grnd
 grounds|grnds
 grove|gr|grv|grve|gro
-groves|grvs
 gulch
 gully|gly
 hanger|hngr
@@ -215,9 +204,6 @@ limits|lmts
 line|ln
 link|lnk|lk
 little|lit|ltl|lt
-lock|lck
-locks|lcks
-lodge|ldg
 loaf|lf
 lookout|lkt|look out
 loop|lp
@@ -226,7 +212,6 @@ lot
 lynne|lynn
 mall|ml
 manor|mnr
-manors|mnrs
 maze
 meadow|mdw
 meadows|mdws
@@ -237,17 +222,12 @@ mews|mws
 mile|mi
 mill|ml
 mills|mls
-mission|msn
 moor
-mountain|mt|mtn
-mountains|mts|mtns
 motorway|mway|mwy|mtwy
 neaves|nvs
-neck|nck
 nook|nk
 number|#|nbr|num|no|nmbr|nr
 oaks
-orchard|orch
 outlet|otlt
 outlook|out|otlk
 oval
@@ -314,7 +294,6 @@ ridgeway|rgwy|rdgwy|ridge way
 right of way|rowy|rightofway|rofw|row|r o w|r of w
 ring
 rise|ri
-river|riv
 riverway|rvwy
 riviera|rvra
 road|raod|rd
@@ -328,13 +307,11 @@ round|rnd
 roundabout
 route|rt|rte
 row|rw
-rue
 run|rn
 service road|svc rd|svc road|service rd
 serviceway|swy|svwy|svcwy
 shoal|shl
 shoals|shls
-shopping center|shctr
 shore|shor|shr
 shores|shors|shrs
 shunt|shun|shnt
@@ -353,11 +330,9 @@ 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
-station|sta
 strand|stra|strnd|strd
 strands|strnds|strds
 stravenue|stra|strav
-stream|strm
 street|st|str
 streets|sts
 strip|strp
@@ -369,8 +344,7 @@ 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|thruway|trwy
 tollway|tlwy|twy
 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
@@ -384,7 +358,6 @@ track|tr|trk|trak
 trafficway|trfy
 trail|tr|trl
 trailer|trlr
-trailer park|tlpk
 tram
 tramway|tmwy
 trees|trs
@@ -407,9 +380,6 @@ vennel
 viaduct|via|viad|vdct|viadct
 view|vw
 views|vws
-village|vlg
-villages|vlgs
-ville|vl
 vista|vst|vsta|vis
 vue
 wade
@@ -421,6 +391,5 @@ ways|wys
 well|wl
 wells|wls
 wharf|whrf|whf
-woods|wds
 wynd|wyn
-yard|yd|yrd
+yard|yd|yrd
\ No newline at end of file
diff --git a/resources/dictionaries/en/synonyms.txt b/resources/dictionaries/en/synonyms.txt
index 7d4e7dda..db9312b4 100644
--- a/resources/dictionaries/en/synonyms.txt
+++ b/resources/dictionaries/en/synonyms.txt
@@ -7,8 +7,16 @@ downs|downes|dwns
 flats|flts
 forest|frst|fst
 fort|ft
+fords|frds
+fork|frk
+forks|frks
+forge|frg
+forges|frgs
+glens|glns
 great|grt|gt
 greater|grtr|gtr
+greens|grns
+groves|grvs
 heights|hghts|hgts|hieghts|ht|hts|hgths
 international|intl|int'l
 lake|lk
@@ -36,6 +44,8 @@ slope|slpe|slp
 stream|strm|stm
 triangle|tri
 upper|up|upr|uppr
+village|vlg
+ville|vl
 villages|vlgs
 wood|wd
 woods|wds
\ No newline at end of file