Merge pull request #23 from ONSdigital/feature/classupdate

Update Classification list and apply spaces to hyphen town parser fix

Author: RichardSmithONS

parsers/src/main/resources/codelists/classificationList

@@ -179,6 +179,7 @@ CM03HP=Hospital
 CM04=Medical / Testing / Research Laboratory
 CM05=Professional Medical Service
 CM05ZS=Assessment / Development Services
+CM06=Pharmacy
 CN=Animal Centre
 CN01=Cattery / Kennel
 CN02=Animal Services
@@ -200,17 +201,25 @@ CO02=Broadcasting (TV / Radio)
 CR=Retail
 CR01=Bank / Financial Service
 CR02=Retail Service Agent
+CR02EV=Electric Car Charging Station
 CR02PO=Post Office
 CR04=Market (Indoor / Outdoor)
 CR04FK=Fish Market
 CR04FV=Fruit / Vegetable Market
 CR04LV=Livestock Market
 CR05=Petrol Filling Station
 CR06=Public House / Bar / Nightclub
+CR06BA=Bar
+CR06NC=Nightclub
+CR06PH=Public House
 CR07=Restaurant / Cafeteria
 CR08=Shop / Showroom
+CR08CS=Convenience
 CR08GC=Garden Centre
-CR09=Other Licensed Premise / Vendor
+CR08SM=Supermarket
+CR09=Other Licensed Premise /
+CR09BS=Betting Shop
+CR09OL=Off-licence
 CR10=Fast Food Outlet / Takeaway (Hot / Cold)
 CR11=Automated Teller Machine (ATM)
 CS=Storage Land
@@ -251,7 +260,14 @@ CT10BG=Boat Storage
 CT10BU=Bus / Coach Depot
 CT11=Transport Related Infrastructure
 CT11AD=Aqueduct
+CT11CA=Road Bridge Over Canal
 CT11LK=Lock
+CT11MU=Road Bridge Over Multiple
+CT11NN=Road Bridge Over No Network
+CT11PA=Road Bridge Over Path
+CT11RA=Road Bridge Over Railway
+CT11RO=Road Bridge Over Road
+CT11WA=Road Bridge Over Wate
 CT11WE=Weir
 CT11WG=Weighbridge / Load Gauge
 CT12=Overnight Lorry Park
@@ -555,9 +571,9 @@ ZW99CH=Church
 ZW99CP=Chapel
 ZW99GU=Gurdwara
 ZW99KH=Kingdom Hall
+ZW99LG=Lych Gate
 ZW99MQ=Mosque
 ZW99MT=Minster
 ZW99SU=Stupa
 ZW99SY=Synagogue
-ZW99TP=Temple
-ZW99LG=Lych Gate
+ZW99TP=Temple

parsers/src/main/resources/input_pre_post_processing/spacedsynonym

@@ -0,0 +1,309 @@
+APPLEBY IN WESTMORLAND,APPLEBY-IN-WESTMORLAND
+APPLETON LE MOORS,APPLETON-LE-MOORS
+APPLETON LE STREET,APPLETON-LE-STREET
+ASCOTT UNDER WYCHWOOD,ASCOTT-UNDER-WYCHWOOD
+ASHBY DE LA ZOUCH,ASHBY-DE-LA-ZOUCH
+ASHTON IN MAKERFIELD,ASHTON-IN-MAKERFIELD
+ASHTON UNDER LYNE,ASHTON-UNDER-LYNE
+ASTON BY STONE,ASTON-BY-STONE
+BANC Y FFORDD,BANC-Y-FFORDD
+BANCHORY DEVENICK,BANCHORY-DEVENICK
+BARKESTONE LE VALE,BARKESTONE-LE-VALE
+BARROW IN FURNESS,BARROW-IN-FURNESS
+BARTON LE CLAY,BARTON-LE-CLAY
+BARTON LE STREET,BARTON-LE-STREET
+BARTON LE WILLOWS,BARTON-LE-WILLOWS
+BARTON ON THE HEATH,BARTON-ON-THE-HEATH
+BARTON UNDER NEEDWOOD,BARTON-UNDER-NEEDWOOD
+BARTON UPON HUMBER,BARTON-UPON-HUMBER
+BERWICK UPON TWEED,BERWICK-UPON-TWEED
+BETWS YN RHOS,BETWS-YN-RHOS
+BIDFORD ON AVON,BIDFORD-ON-AVON
+BIGBURY ON SEA,BIGBURY-ON-SEA
+BOLTON LE SANDS,BOLTON-LE-SANDS
+BOLTON ON SWALE,BOLTON-ON-SWALE
+BORTH Y GEST,BORTH-Y-GEST
+BOURTON ON THE HILL,BOURTON-ON-THE-HILL
+BOURTON ON THE WATER,BOURTON-ON-THE-WATER
+BOWNESS ON SOLWAY,BOWNESS-ON-SOLWAY
+BOWNESS ON WINDERMERE,BOWNESS-ON-WINDERMERE
+BRADFORD ON AVON,BRADFORD-ON-AVON
+BRADFORD ON TONE,BRADFORD-ON-TONE
+BRADWELL ON SEA,BRADWELL-ON-SEA
+BRAFIELD ON THE GREEN,BRAFIELD-ON-THE-GREEN
+BRON Y GAER,BRON-Y-GAER
+BRYN COCH,BRYN-COCH
+BUCKLAND TOUT SAINTS,BUCKLAND-TOUT-SAINTS
+BURNHAM ON CROUCH,BURNHAM-ON-CROUCH
+BURNHAM ON SEA,BURNHAM-ON-SEA
+BURTON IN KENDAL,BURTON-IN-KENDAL
+CAER LAN,CAER-LAN
+CAISTER ON SEA,CAISTER-ON-SEA
+CARLTON LE MOORLAND,CARLTON-LE-MOORLAND
+CARLTON ON TRENT,CARLTON-ON-TRENT
+CEFN CAER FERCH,CEFN-CAER-FERCH
+CHAPEL EN LE FRITH,CHAPEL-EN-LE-FRITH
+CHAPEL LE DALE,CHAPEL-LE-DALE
+CHARLTON ALL SAINTS,CHARLTON-ALL-SAINTS
+CHARLTON ON OTMOOR,CHARLTON-ON-OTMOOR
+CHESTER LE STREET,CHESTER-LE-STREET
+CHORLTON CUM HARDY,CHORLTON-CUM-HARDY
+CILIAU AERON,CILIAU-AERON
+CLACHAN SEIL,CLACHAN-SEIL
+CLACTON ON SEA,CLACTON-ON-SEA
+CLAPTON IN GORDANO,CLAPTON-IN-GORDANO
+CLAPTON ON THE HILL,CLAPTON-ON-THE-HILL
+CLAYTON LE MOORS,CLAYTON-LE-MOORS
+CLAYTON LE WOODS,CLAYTON-LE-WOODS
+NEWALL WITH CLIFTON,NEWALL-WITH-CLIFTON
+CLIPSTON ON THE WOLDS,CLIPSTON-ON-THE-WOLDS
+CORNHILL ON TWEED,CORNHILL-ON-TWEED
+COURT AT STREET,COURT-AT-STREET
+CROES IAN,CROES-IAN
+CROFT ON TEES,CROFT-ON-TEES
+CROSS AT HAND,CROSS-AT-HAND
+CROWS AN WRA,CROWS-AN-WRA
+CWM CEWYDD,CWM-CEWYDD
+CWM LLINAU,CWM-LLINAU
+CWM MORGAN,CWM-MORGAN
+DALTON IN FURNESS,DALTON-IN-FURNESS
+DALTON LE DALE,DALTON-LE-DALE
+DALTON ON TEES,DALTON-ON-TEES
+DINAS MAWDDWY,DINAS-MAWDDWY
+DUNHAM ON THE HILL,DUNHAM-ON-THE-HILL
+EAST THE WATER,EAST-THE-WATER
+EASTON IN GORDANO,EASTON-IN-GORDANO
+EGLWYS BREWIS,EGLWYS-BREWIS
+FFAIR RHOS,FFAIR-RHOS
+FOREST IN TEESDALE,FOREST-IN-TEESDALE
+FRINTON ON SEA,FRINTON-ON-SEA
+GARN DOLBENMAEN,GARN-DOLBENMAEN
+GARTON ON THE WOLDS,GARTON-ON-THE-WOLDS
+GLAN CONWY,GLAN-CONWY
+GLAND WYFACH,GLAN-DWYFACH
+GLYN CYWARCH,GLYN-CYWARCH
+GLYN NEATH,GLYN-NEATH
+GORING BY SEA,GORING-BY-SEA
+GRANGE OVER SANDS,GRANGE-OVER-SANDS
+GRANTOWN ON SPEY,GRANTOWN-ON-SPEY
+GREATSTONE ON SEA,GREATSTONE-ON-SEA
+GWAUN CAE GURWEN,GWAUN-CAE-GURWEN
+HAFOD DINBYCH,HAFOD-DINBYCH
+HAMBL LE RICE,HAMBLE-LE-RICE
+HAY ON WYE,HAY-ON-WYE
+HEDDON ON THE WALL,HEDDON-ON-THE-WALL
+HENLEY IN ARDEN,HENLEY-IN-ARDEN
+HENLEY ON THAMES,HENLEY-ON-THAMES
+HEOL Y CYW,HEOL-Y-CYW
+HETTON LE HOLE,HETTON-LE-HOLE
+HINTON IN THE HEDGES,HINTON-IN-THE-HEDGES
+HOLE IN THE WALL,HOLE-IN-THE-WALL
+HOLLAND ON SEA,HOLLAND-ON-SEA
+HOLME ON SPALDING MOOR,HOLME-ON-SPALDING-MOOR
+HOOK A GATE,HOOK-A-GATE
+HORTON CUM STUDLEY,HORTON-CUM-STUDLEY
+HOUGH ON THE HILL,HOUGH-ON-THE-HILL
+HOUGHTON LE SIDE,HOUGHTON-LE-SIDE
+HOWDENLEWEAR,HOWDEN-LE-WEAR
+HURWORTH ON TEES,HURWORTH-ON-TEES
+HUTTON LE HOLE,HUTTON-LE-HOLE
+INCE IN MAKERFIELD,INCE-IN-MAKERFIELD
+KIRKANDREWS UPON EDEN,KIRKANDREWS-UPON-EDEN
+KIRKPATRICK FLEMING,KIRKPATRICK-FLEMING
+LEE ON THE SOLENT,LEE-ON-THE-SOLENT
+LEIGH ON SEA,LEIGH-ON-SEA
+LEOCHEL CUSHNIE,LEOCHEL-CUSHNIE
+LEYSDOWN ON SEA,LEYSDOWN-ON-SEA
+LITTLESTONE ON SEA,LITTLESTONE-ON-SEA
+LITTLETON ON SEVERN,LITTLETON-ON-SEVERN
+LLANBEDR DYFFRYN CLWYD,LLANBEDR-DYFFRYN-CLWYD
+LLANDDEWI BREFI,LLANDDEWI-BREFI
+LLANDEILOR FAN,LLANDEILO'R-FAN
+LLANDRILLO YN RHOS,LLANDRILLO-YN-RHOS
+LLANELIAN YN RHOS,LLANELIAN-YN-RHOS
+LLANFAIRNANT GWYN,LLANFAIR-NANT-GWYN
+LLANFAIR ORLLWYN,LLANFAIR-ORLLWYN
+LLANFAIRYNNEUBWLL,LLANFAIR-YN-NEUBWLL
+LLANFIHANGEL AR ARTH,LLANFIHANGEL-AR-ARTH
+LLANFIHANGEL NANT MELAN,LLANFIHANGEL-NANT-MELAN
+LLANFIHANGEL TAL Y LLYN,LLANFIHANGEL-TAL-Y-LLYN
+LLANFIHANGEL Y CREUDDYN,LLANFIHANGEL-Y-CREUDDYN
+LLANFIHANGEL YNG NGWYNFA,LLANFIHANGEL-YNG-NGWYNFA
+LLANGASTY TALYLLYN,LLANGASTY-TALYLLYN
+LLANGATTOCK VIBON AVEL,LLANGATTOCK-VIBON-AVEL
+LLANGWM ISAF,LLANGWM-ISAF
+LLANNERCH Y MOR,LLANNERCH-Y-MOR
+LLANRHAEADR YM MOCHNANT,LLANRHAEADR-YM-MOCHNANT
+LLANSANTFFRAED CWMDEUDDWR,LLANSANTFFRAED-CWMDEUDDWR
+LLANSANTFFRAED IN ELVEL,LLANSANTFFRAED-IN-ELVEL
+LLANSANTFFRAID YM MECHAIN,LLANSANTFFRAID-YM-MECHAIN
+LLANVAIR DISCOED,LLANVAIR-DISCOED
+LLANVIHANGEL YSTERN LLEWERN,LLANVIHANGEL-YSTERN-LLEWERN
+LLWYN MADOC,LLWYN-MADOC
+NEWTON BY THE SEA,NEWTON-BY-THE-SEA
+LYDD ON SEA,LYDD-ON-SEA
+LYDFORD O NFOSSE,LYDFORD-ON-FOSSE
+MAES TREYLOW,MAES-TREYLOW
+MAES Y CWMMER,MAES-Y-CWMMER
+MARSKE BY THE SEA,MARSKE-BY-THE-SEA
+MARTON LE MOOR,MARTON-LE-MOOR
+MELIN Y WIG,MELIN-Y-WIG
+MICHAELCHURCH ON ARROW,MICHAELCHURCH-ON-ARROW
+MICHAELSTON LE PIT,MICHAELSTON-LE-PIT
+MICHAELSTON Y FEDW,MICHAELSTON-Y-FEDW
+MIDDLETON IN TEESDALE,MIDDLETON-IN-TEESDALE
+MIDDLETONONLEVEN,MIDDLETON-ON-LEVEN
+MIDDLETON ON SEA,MIDDLETON-ON-SEA
+MIDDLETON ON THE WOLDS,MIDDLETON-ON-THE-WOLDS
+MILTON UNDER WYCHWOOD,MILTON-UNDER-WYCHWOOD
+MORETON IN MARSH,MORETON-IN-MARSH
+MORTON ON SWALE,MORTON-ON-SWALE
+MYTON ON SWALE,MYTON-ON-SWALE
+NEWBIGGIN BY THE SEA,NEWBIGGIN-BY-THE-SEA
+NEWBIGGIN ON LUNE,NEWBIGGIN-ON-LUNE
+NEWBRIDGE ON USK,NEWBRIDGE-ON-USK
+NEWCASTLE UNDER LYME,NEWCASTLE-UNDER-LYME
+NEWPORT ON TAY,NEWPORT-ON-TAY
+NEWTON LE WILLOWS,NEWTON-LE-WILLOWS
+NEWTON ON OUSE,NEWTON-ON-OUSE
+NEWTON ON RAWCLIFFE,NEWTON-ON-RAWCLIFFE
+NEWTON ON THE MOOR,NEWTON-ON-THE-MOOR
+NORTONJ UXTA TWYCROSS,NORTON-JUXTA-TWYCROSS
+NORTON LE CLAY,NORTON-LE-CLAY
+OCHR Y MYNYDD,OCHR-Y-MYNYDD
+OGMORE BY SEA,OGMORE-BY-SEA
+OLDBURY ON SEVERN,OLDBURY-ON-SEVERN
+ORTON ON THE HILL,ORTON-ON-THE-HILL
+PEN Y PARK,PEN-Y-PARK
+PENTRER FELIN,PENTRE'R-FELIN
+PENTRE DOLAU HONDDU,PENTRE-DOLAU-HONDDU
+PENTRE DWR,PENTRE-DWR
+ENTRE LLWYN LLWYD,ENTRE-LLWYN-LLWYD
+PENTRE POETH,PENTRE-POETH
+PETERSTON SUPER ELY,PETERSTON-SUPER-ELY
+PLAS RHIW SAESON,PLAS-RHIW-SAESON
+PLAS Y NCEFN,PLAS-YN-CEFN
+PONT HENRI,PONT-HENRI
+PORTSLADE BY SEA,PORTSLADE-BY-SEA
+POULTON LE FYLDE,POULTON-LE-FYLDE
+PRAZE AN BEEBLE,PRAZE-AN-BEEBLE
+PRESTON UNDER SCAR,PRESTON-UNDER-SCAR
+RHOS ON SEA,RHOS-ON-SEA
+RHOS Y MEIRCH,RHOS-Y-MEIRCH
+RHYD DDU,RHYD-DDU
+ROSS ON WYE,ROSS-ON-WYE
+RUYTON XI TOWNS,RUYTON-XI-TOWNS
+RYTON ON DUNSMORE,RYTON-ON-DUNSMORE
+SALTBURN BY THE SEA,SALTBURN-BY-THE-SEA
+SANDFORD ON THAMES,SANDFORD-ON-THAMES
+SARN MEYLLTEYRN,SARN-MEYLLTEYRN
+SHIPTON ON CHERWELL,SHIPTON-ON-CHERWELL
+SHIPTON UNDER WYCHWOOD,SHIPTON-UNDER-WYCHWOOD
+SHOREHAM BY SEA,SHOREHAM-BY-SEA
+SKIPTON ON SWALE,SKIPTON-ON-SWALE
+SOUTHEND ON SEA,SOUTHEND-ON-SEA
+BRIDES SUPER ELY,BRIDE'S-SUPER-ELY
+STANFORD LE HOPE,STANFORD-LE-HOPE
+STANTON ON THE WOLDS,STANTON-ON-THE-WOLDS
+STAVELEY IN CARTMEL,STAVELEY-IN-CARTMEL
+STOCKTON ON TEES,STOCKTON-ON-TEES
+STOKE BY NAYLAND,STOKE-BY-NAYLAND
+STOKE ON TRENT,STOKE-ON-TRENT
+STOURPORT ON SEVERN,STOURPORT-ON-SEVERN
+STOW ON THE WOLD,STOW-ON-THE-WOLD
+STRATFORD UPON AVON,STRATFORD-UPON-AVON
+STRATTON ON THE FOSSE,STRATTON-ON-THE-FOSSE
+STRETTON ON DUNSMORE,STRETTON-ON-DUNSMORE
+STRETTON ON FOSSE,STRETTON-ON-FOSSE
+SUTTON IN CRAVEN,SUTTON-IN-CRAVEN
+SUTTON ON HULL,SUTTON-ON-HULL
+SUTTON ON THE FOREST,SUTTON-ON-THE-FOREST
+SUTTON UNDER BRAILES,SUTTON-UNDER-BRAILES
+SUTTON UNDER WHITESTONECLIFFE,SUTTON-UNDER-WHITESTONECLIFFE
+TAFARN Y GELYN,TAFARN-Y-GELYN
+TAL Y CAE,TAL-Y-CAE
+TALYBONT ON USK,TALYBONT-ON-USK
+THORNABY ON TEES,THORNABY-ON-TEES
+THORNTON IN CRAVEN,THORNTON-IN-CRAVEN
+THORNTON LE BEANS,THORNTON-LE-BEANS
+THORNTON LE CLAY,THORNTON-LE-CLAY
+THORNTON LE DALE,THORNTON-LE-DALE
+THORNTON LE MOOR,THORNTON-LE-MOOR
+THORNTON LE MOORS,THORNTON-LE-MOORS
+THORNTON LE STREET,THORNTON-LE-STREET
+THORPE LE SOKEN,THORPE-LE-SOKEN
+TON PENTRE,TON-PENTRE
+TOUCHEN END,TOUCHEN-END
+TWYN Y SHERIFF,TWYN-Y-SHERIFF
+TYN Y CWM,TYN-Y-CWM
+WALTON IN GORDANO,WALTON-IN-GORDANO
+WALTON LE DALE,WALTON-LE-DALE
+WALTON ON THE NAZE,WALTON-ON-THE-NAZE
+WALTON ON THAMES,WALTON-ON-THAMES
+WALTON ON THE HILL,WALTON-ON-THE-HILL
+WALTON ON TRENT,WALTON-ON-TRENT
+WATTON AT STONE,WATTON-AT-STONE
+WELFORD ON AVON,WELFORD-ON-AVON
+WELLS NEXT THE SEA,WELLS-NEXT-THE-SEA
+WESTBURY ON SEVERN,WESTBURY-ON-SEVERN
+WESTBURY SUB MENDIP,WESTBURY-SUB-MENDIP
+WESTCLIFF ON SEA,WESTCLIFF-ON-SEA
+WESTON IN GORDANO,WESTON-IN-GORDANO
+WESTON ON THE GREEN,WESTON-ON-THE-GREEN
+WESTON ON TRENT,WESTON-ON-TRENT
+WESTON SUPER MARE,WESTON-SUPER-MARE
+WESTON UNDER LIZARD,WESTON-UNDER-LIZARD
+WHITTLE LE WOODS,WHITTLE-LE-WOODS
+WHITWELL ON THE HILL,WHITWELL-ON-THE-HILL
+WILLOUGHBY ON THE WOLDS,WILLOUGHBY-ON-THE-WOLDS
+WINTERTON ON SEA,WINTERTON-ON-SEA
+WITTON LE WEAR,WITTON-LE-WEAR
+WOTTON UNDER EDGE,WOTTON-UNDER-EDGE
+YSGUBOR Y COED,YSGUBOR-Y-COED
+KIRKBY IN FURNESS,KIRKBY-IN-FURNESS
+QUAY ON TYNE,QUAY-ON-TYNE
+TAN Y BWLCH,TAN-Y-BWLCH
+RHOS BAYVIL,RHOS-BAYVIL
+PORT IN SHERRICH,PORT-IN-SHERRICH
+PONT TYWELI,PONT-TYWELI
+PLASL LANRHYDD,PLAS-LLANRHYDD
+PENRHOS LLIGWY,PENRHOS-LLIGWY
+PENNANT MELANGELL,PENNANT-MELANGELL
+LLANFIHANGEL YSTRAD,LLANFIHANGEL-YSTRAD
+LLANFIHANGEL TYN SYLWY,LLANFIHANGEL-TY'N-SYLWY
+LLANFIHANGEL RHOS Y CORN,LLANFIHANGEL-RHOS-Y-CORN
+LLANFIHANGEL GENEUR GLYN,LLANFIHANGEL-GENEU'R-GLYN
+LLANFIHANGEL BRYN PABUAN,LLANFIHANGEL-BRYN-PABUAN
+LLANERCH AERON,LLANERCH-AERON
+LLANARMON MYNYDD MAWR,LLANARMON-MYNYDD-MAWR
+LANGLEY ON TYNE,LANGLEY-ON-TYNE
+KINGSNORTH ON MEDWAY,KINGSNORTH-ON-MEDWAY
+HENDRE FORGAN,HENDRE-FORGAN
+FFALD Y BRENIN,FFALD-Y-BRENIN
+EGLWYS CYMMYN,EGLWYS-CYMMYN
+DRUMSHANBO GLEBE,DRUMSHANBO-GLEBE
+COED TALON,COED-TALON
+CUMBER LADY,CUMBER-LADY
+CERRIG Y DRUIDION,CERRIG-Y-DRUIDION
+CARN NA CUIMHNE,CARN-NA-CUIMHNE
+CAPEL IFAN,CAPEL-IFAN
+CANVEY ON SEA,CANVEY-ON-SEA
+ABER BRAN,ABER-BRAN
+HAVERING ATTE BOWER,HAVERING-ATTE-BOWER
+MONTFORT SUR RISLE,MONTFORT-SUR-RISLE
+HAYEDUPUITS,HAYE-DU-PUITS
+ASHTON ON RIBBLE,ASHTON-ON-RIBBLE
+H IOLAIRE,H-IOLAIRE
+AINSDALE ON SEA,AINSDALE-ON-SEA
+FOUR WAYS,FOUR-WAYS
+NORTON LE MOORS,NORTON-LE-MOORS
+BORTH Y GAST,BORTH-Y-GAST
+THOLT E WILL,THOLT-E-WILL
+CREG NY BAA,CREG-NY-BAA
+KNOCK E DOONEY,KNOCK-E-DOONEY
+LAG NA KEIL,LAG-NA-KEIL
+WHITCHURCH ON THAMES,WHITCHURCH-ON-THAMES
+NEWTON BY TATTENHALL,NEWTON-BY-TATTENHALL
+BASSINGBOURN CUM KNEESWORTH,BASSINGBOURN-CUM-KNEESWORTH
+WAILLY BEAUCAMP,WAILLY-BEAUCAMP
+PENTRE MORGAN,PENTRE-MORGAN