get rid of all windows line breaks and enforce Unix line breaks

git-svn-id: http://svn.osgeo.org/postgis/trunk@14047 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress b/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress
index 966c415dad47ee9cdfcde83a9705c001b48a9688..c5907a3550e903b95e0f5d737e90d646963c99b5 100644 (file)
--- a/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress
+++ b/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress
@@ -1,46 +1,46 @@
-true\r
-#887|2450|N|COLORADO|ST|||PHILADELPHIA|PA|19132|t\r
-#1051a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t\r
-#1051b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t\r
-#1051c|212|N|3RD|AVE|||MINNEAPOLIS|MN|55401|t\r
-#1051d|212||3RD|AVE|||MINNEAPOLIS|MN|N 55401|t\r
-529||MAIN|ST|||BOSTON|MA|02129|t\r
-529||MAIN|ST|||BOSTON|MA|02129|t\r
-529||MAIN|ST|||BOSTON|MA||t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA||t\r
-#1108a|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t\r
-#1073a|212||3RD|AVE|N||MINNEAPOLIS|MN|553404|t\r
-#1073b|212||3RD|AVE|N||MINNEAPOLIS|MN|55401|t\r
-#1073c|529||MAIN|ST|||BOSTON|MA|021|t\r
-#1086a|949|N|3|ST|||NEW HYDE PARK|NY|11040|t\r
-#1086b|949|N|3|ST|||NEW HYDE PARK|NY|11040|t\r
-#1076a|16725||24|CO RD|||PLYMOUTH|MN|55447|t\r
-#1076b|16725||24|CO RD|||PLYMOUTH|MN|55447|t\r
-#1076c|13800||9|CO HWY|||ANDOVER|MN|55304|t\r
-#1076d|13800||9||||ANDOVER|MN|55304|t\r
-#1076e|14||FOREST|RD|||ACTON|MA||t\r
-#1076f|1940||C|CO RD|W||ROSEVILLE|MN|55113|t\r
-#1076g|3900||6|RTE|||EASTHAM|MA|02642|t\r
-#1076h|4533||PARK|AVE|S||MINNEAPOLIS|MN|55407|t\r
-#1076i|4533||33|CO RD|||MINNEAPOLIS|MN|55407|t\r
-#1109a|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t\r
-#1109b|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t\r
-#1074a|3420||RHODE ISLAND|AVE|S||SAINT LOUIS PARK|MN|55426|t\r
-#1074b|26||COURT|ST|||BOSTON|MA|02109|t\r
-#1112a|8401|W|35 W|SVC DR|NE||BLAINE|MN|55449|t\r
-#1112b|8401||35 W||||BLAINE|MN|55449|t\r
-#1112c|8401||35 W||W||BLAINE|MN|55449|t\r
-#1112d|8401|W|35||W||BLAINE|MN|55449|t\r
-#1112e|8401|W|35||W||BLAINE|MN|55449|t\r
-#1125a|19596 CO RD 480, COLCORD, OK 74338\r
-#1125b|4345 353 RTE, SALAMANCA, NY 14779|4345||353|RTE|||SALAMANCA|NY|14779|t\r
-#1125c|19799 STATE RTE 0, COSBY, MO 64436|19799||0|STATE RTE|||COSBY|MO|64436|t\r
-#1125d|||||||||||t\r
-#1125e|||||||||||t\r
-#1125f|||||||||||t\r
-#1310a|1110 W CAPITOL AVE, WEST SACRAMENTO, CA|1110|W|CAPITOL|AVE|||WEST SACRAMENTO|CA||t\r
-#1614a|8435 CO RD 20 SE, ROCHESTER, MN 55904|8435||20|CO RD|SE||ROCHESTER|MN|55904|t\r
-#1614b|3208 US RTE 52, ROCHESTER, MN 55901|3208||52|US RTE|||ROCHESTER|MN|55901|t\r
-false\r
+true
+#887|2450|N|COLORADO|ST|||PHILADELPHIA|PA|19132|t
+#1051a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t
+#1051b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t
+#1051c|212|N|3RD|AVE|||MINNEAPOLIS|MN|55401|t
+#1051d|212||3RD|AVE|||MINNEAPOLIS|MN|N 55401|t
+529||MAIN|ST|||BOSTON|MA|02129|t
+529||MAIN|ST|||BOSTON|MA|02129|t
+529||MAIN|ST|||BOSTON|MA||t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA||t
+#1108a|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t
+#1073a|212||3RD|AVE|N||MINNEAPOLIS|MN|553404|t
+#1073b|212||3RD|AVE|N||MINNEAPOLIS|MN|55401|t
+#1073c|529||MAIN|ST|||BOSTON|MA|021|t
+#1086a|949|N|3|ST|||NEW HYDE PARK|NY|11040|t
+#1086b|949|N|3|ST|||NEW HYDE PARK|NY|11040|t
+#1076a|16725||24|CO RD|||PLYMOUTH|MN|55447|t
+#1076b|16725||24|CO RD|||PLYMOUTH|MN|55447|t
+#1076c|13800||9|CO HWY|||ANDOVER|MN|55304|t
+#1076d|13800||9||||ANDOVER|MN|55304|t
+#1076e|14||FOREST|RD|||ACTON|MA||t
+#1076f|1940||C|CO RD|W||ROSEVILLE|MN|55113|t
+#1076g|3900||6|RTE|||EASTHAM|MA|02642|t
+#1076h|4533||PARK|AVE|S||MINNEAPOLIS|MN|55407|t
+#1076i|4533||33|CO RD|||MINNEAPOLIS|MN|55407|t
+#1109a|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t
+#1109b|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t
+#1074a|3420||RHODE ISLAND|AVE|S||SAINT LOUIS PARK|MN|55426|t
+#1074b|26||COURT|ST|||BOSTON|MA|02109|t
+#1112a|8401|W|35 W|SVC DR|NE||BLAINE|MN|55449|t
+#1112b|8401||35 W||||BLAINE|MN|55449|t
+#1112c|8401||35 W||W||BLAINE|MN|55449|t
+#1112d|8401|W|35||W||BLAINE|MN|55449|t
+#1112e|8401|W|35||W||BLAINE|MN|55449|t
+#1125a|19596 CO RD 480, COLCORD, OK 74338
+#1125b|4345 353 RTE, SALAMANCA, NY 14779|4345||353|RTE|||SALAMANCA|NY|14779|t
+#1125c|19799 STATE RTE 0, COSBY, MO 64436|19799||0|STATE RTE|||COSBY|MO|64436|t
+#1125d|||||||||||t
+#1125e|||||||||||t
+#1125f|||||||||||t
+#1310a|1110 W CAPITOL AVE, WEST SACRAMENTO, CA|1110|W|CAPITOL|AVE|||WEST SACRAMENTO|CA||t
+#1614a|8435 CO RD 20 SE, ROCHESTER, MN 55904|8435||20|CO RD|SE||ROCHESTER|MN|55904|t
+#1614b|3208 US RTE 52, ROCHESTER, MN 55901|3208||52|US RTE|||ROCHESTER|MN|55901|t
+false

diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_regress b/extras/tiger_geocoder/regress/pagc_normalize_address_regress
index 04d46cc68fff2e3fd837336116ff546107d9d7dd..9f7179395962741ca29a7bc2717b930ca82202b2 100644 (file)
--- a/extras/tiger_geocoder/regress/pagc_normalize_address_regress
+++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress
@@ -1,49 +1,49 @@
-true\r
-#887|2450|N|COLORADO|ST|||PHILADELPHIA|PA|19132|t\r
-#1051a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t\r
-#1051b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t\r
-#1051c|212|N|3RD|AVE|||MINNEAPOLIS|MN|55401|t\r
-#1051d|212||3RD|AVE|||MINNEAPOLIS|MN|N 55401|t\r
-529||MAIN|ST|||BOSTON|MA|02129|t\r
-529||MAIN|ST|||BOSTON|MA|02129|t\r
-529||MAIN|ST|||BOSTON|MA||t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t\r
-529||MAIN|ST||APARTMENT 201|BOSTON|MA||t\r
-#1108a|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t\r
-#1073a|212||3RD|AVE|N||MINNEAPOLIS|MN|55340|t\r
-#1073b|212||3RD|AVE|N||MINNEAPOLIS|MN|55401|t\r
-#1073c|529||MAIN|ST||# BOSTON|MASSACHUSETTS||021|t\r
-#1086a|949|N|3RD|ST|||NEW HYDE PARK|NY|11040|t\r
-#1086b|949|N|3RD|ST|||NEW HYDE PARK|NY|11040|t\r
-#1076a|16725||24|CO RD|||PLYMOUTH|MN|55447|t\r
-#1076b|16725||24|CO RD|||PLYMOUTH|MN|55447|t\r
-#1076c|13800||9|CO HWY|||ANDOVER|MN|55304|t\r
-#1076d|13800||9||||ANDOVER|MN|55304|t\r
-#1076e|14||FOREST|RD|||ACTON|MA||t\r
-#1076f|1940||C|CO RD|W||ROSEVILLE|MN|55113|t\r
-#1076g|3900||6|RTE|||EASTHAM|MA|02642|t\r
-#1076h|4533||PARK|AVE|S||MINNEAPOLIS|MN|55407|t\r
-#1076i|4533||33|CO RD|||MINNEAPOLIS|MN|55407|t\r
-#1109a|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t\r
-#1109b|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t\r
-#1074a|3420||RHODE ISLAND|AVE|S||SAINT LOUIS PARK|MN|55426|t\r
-#1074b|26||COURT|ST|||BOSTON|MA|02109|t\r
-#1112a|8401|W|35 W|SVC DR|NE||BLAINE|MN|55449|t\r
-#1112b|8401||35 W||||BLAINE|MN|55449|t\r
-#1112c|8401||35 W||W||BLAINE|MN|55449|t\r
-#1112d|8401|W|35||W||BLAINE|MN|55449|t\r
-#1112e|8401|W|35||W||BLAINE|MN|55449|t\r
-#1125a|19596 CO RD 480, COLCORD, OK 74338\r
-#1125b|4345 353 RTE, SALAMANCA, NY 14779|4345||353|RTE|||SALAMANCA|NY|14779|t\r
-#1125c|19799 STATE RTE 0, COSBY, MO 64436|19799||0|STATE RTE|||COSBY|MO|64436|t\r
-#1125d|||||||||||t\r
-#1125e|||||||||||t\r
-#1125f|||||||||||t\r
-#1310a|1110 W CAPITOL AVE, WEST SACRAMENTO, CA|1110|W|CAPITOL|AVE|||WEST SACRAMENTO|CA||t\r
-#1614a|8435 CO RD 20 SE, ROCHESTER, MN 55904|8435||20|CO RD|SE||ROCHESTER|MN|55904|t\r
-#1614b|3208 US RTE 52, ROCHESTER, MN 55901|3208||52|US RTE|||ROCHESTER|MN|55901|t\r
-#1108a|529 MAIN ST, SUITE 201, BOSTON, MA 02129|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t\r
-#3259a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t\r
-#3259b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t\r
-false\r
+true
+#887|2450|N|COLORADO|ST|||PHILADELPHIA|PA|19132|t
+#1051a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t
+#1051b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t
+#1051c|212|N|3RD|AVE|||MINNEAPOLIS|MN|55401|t
+#1051d|212||3RD|AVE|||MINNEAPOLIS|MN|N 55401|t
+529||MAIN|ST|||BOSTON|MA|02129|t
+529||MAIN|ST|||BOSTON|MA|02129|t
+529||MAIN|ST|||BOSTON|MA||t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA|02129|t
+529||MAIN|ST||APARTMENT 201|BOSTON|MA||t
+#1108a|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t
+#1073a|212||3RD|AVE|N||MINNEAPOLIS|MN|55340|t
+#1073b|212||3RD|AVE|N||MINNEAPOLIS|MN|55401|t
+#1073c|529||MAIN|ST||# BOSTON|MASSACHUSETTS||021|t
+#1086a|949|N|3RD|ST|||NEW HYDE PARK|NY|11040|t
+#1086b|949|N|3RD|ST|||NEW HYDE PARK|NY|11040|t
+#1076a|16725||24|CO RD|||PLYMOUTH|MN|55447|t
+#1076b|16725||24|CO RD|||PLYMOUTH|MN|55447|t
+#1076c|13800||9|CO HWY|||ANDOVER|MN|55304|t
+#1076d|13800||9||||ANDOVER|MN|55304|t
+#1076e|14||FOREST|RD|||ACTON|MA||t
+#1076f|1940||C|CO RD|W||ROSEVILLE|MN|55113|t
+#1076g|3900||6|RTE|||EASTHAM|MA|02642|t
+#1076h|4533||PARK|AVE|S||MINNEAPOLIS|MN|55407|t
+#1076i|4533||33|CO RD|||MINNEAPOLIS|MN|55407|t
+#1109a|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t
+#1109b|4373||LAKE|DR|||ROBBINSDALE|MN|55422|t
+#1074a|3420||RHODE ISLAND|AVE|S||SAINT LOUIS PARK|MN|55426|t
+#1074b|26||COURT|ST|||BOSTON|MA|02109|t
+#1112a|8401|W|35 W|SVC DR|NE||BLAINE|MN|55449|t
+#1112b|8401||35 W||||BLAINE|MN|55449|t
+#1112c|8401||35 W||W||BLAINE|MN|55449|t
+#1112d|8401|W|35||W||BLAINE|MN|55449|t
+#1112e|8401|W|35||W||BLAINE|MN|55449|t
+#1125a|19596 CO RD 480, COLCORD, OK 74338
+#1125b|4345 353 RTE, SALAMANCA, NY 14779|4345||353|RTE|||SALAMANCA|NY|14779|t
+#1125c|19799 STATE RTE 0, COSBY, MO 64436|19799||0|STATE RTE|||COSBY|MO|64436|t
+#1125d|||||||||||t
+#1125e|||||||||||t
+#1125f|||||||||||t
+#1310a|1110 W CAPITOL AVE, WEST SACRAMENTO, CA|1110|W|CAPITOL|AVE|||WEST SACRAMENTO|CA||t
+#1614a|8435 CO RD 20 SE, ROCHESTER, MN 55904|8435||20|CO RD|SE||ROCHESTER|MN|55904|t
+#1614b|3208 US RTE 52, ROCHESTER, MN 55901|3208||52|US RTE|||ROCHESTER|MN|55901|t
+#1108a|529 MAIN ST, SUITE 201, BOSTON, MA 02129|529||MAIN|ST||SUITE 201|BOSTON|MA|02129|t
+#3259a|212||3RD|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t
+#3259b|3937||43RD|AVE|S||MINNEAPOLIS|MN|55406|t
+false

diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
index f20bcfdf7090aad4ef54b4448d92f143f33701b2..a17f934926bee8e1647e3cc89d4e197029504f4a 100644 (file)
--- a/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
@@ -1,107 +1,107 @@
-SELECT set_geocode_setting('use_pagc_address_parser', 'true');\r
---\timing\r
-SELECT '#887' As ticket, * FROM normalize_address('2450 N COLORADO ST, PHILADELPHIA, PA, 19132');\r
--- this currently turns 3rd to 3, we want to fix to keep 3rd as is\r
-SELECT '#1051a' As ticket, * FROM normalize_address('212 3rd Ave N Suite 560, Minneapolis, MN 55401');\r
--- this currently turns 43rd to 43, we want to fix to keep 43rd as is\r
-SELECT '#1051b' As ticket, * FROM normalize_address('3937 43RD AVE S, MINNEAPOLIS, MN 55406');\r
--- this currently turns 3rd to 3, we want to fix to keep 3rd as is\r
-SELECT '#1051c' As ticket, * FROM normalize_address('212 N 3rd Ave, Minneapolis, MN 55401');\r
--- this currently turns 3rd to 3, we want to fix to keep 3rd as is\r
-SELECT '#1051d' As ticket, * FROM normalize_address('212 3rd Ave N Minneapolis, MN 55401'); \r
--- comma in wrong spot\r
-SELECT * FROM normalize_address('529 Main Street, Boston MA, 02129');\r
--- comma in right spot\r
-SELECT * FROM normalize_address('529 Main Street, Boston,MA 02129');\r
--- partial address\r
-SELECT * FROM normalize_address('529 Main Street, Boston, MA');\r
--- Full address with suite using ,\r
-SELECT * FROM normalize_address('529 Main Street, Apt 201, Boston, MA 02129');\r
--- Full address with apart using space\r
-SELECT * FROM normalize_address('529 Main Street Apt 201, Boston, MA 02129');\r
--- Partial address with apartment\r
-SELECT * FROM normalize_address('529 Main Street, Apt 201, Boston, MA');\r
-\r
---This one fails so lead out for now\r
-SELECT '#1108a' As ticket, * FROM normalize_address('529 Main Street, Suite 201, Boston, MA 02129');\r
-\r
--- Partial and Mangled zipcodes\r
--- this currently fails and puts MINNEAPOLIS inside internal (seems to be a bug in parse address)\r
-SELECT '#1073a' As ticket, * FROM normalize_address('212 3rd Ave N, MINNEAPOLIS, MN 553404');\r
-SELECT '#1073b' As ticket, * FROM normalize_address('212 3rd Ave N, MINNEAPOLIS, MN 55401-');\r
-SELECT '#1073c' As ticket, * FROM normalize_address('529 Main Street, Boston, MA 021');\r
-\r
--- comma in wrong position\r
-SELECT '#1086a' As ticket, * FROM normalize_address('949 N 3rd St, New Hyde Park, NY, 11040');\r
-\r
--- comma in right position --\r
-SELECT '#1086b' As ticket, * FROM normalize_address('949 N 3rd St, New Hyde Park, NY 11040');\r
-\r
--- country roads and highways with spaces in street type\r
-SELECT '#1076a' As ticket, * FROM normalize_address('16725 Co Rd 24, Plymouth, MN 55447'); \r
-SELECT '#1076b' As ticket, * FROM normalize_address('16725 County Road 24, Plymouth, MN 55447'); \r
-SELECT '#1076c' As ticket, * FROM normalize_address('13800 County Hwy 9, Andover, MN 55304');\r
-SELECT '#1076d' As ticket, * FROM normalize_address('13800 9, Andover, MN 55304');\r
--- this one is a regular street that happens to have a street type as the name\r
-SELECT '#1076e' As ticket, * FROM normalize_address('14 Forest Road, Acton, MA');\r
-\r
--- A country road with a letter name and direction \r
--- NOTE this doesn't completely normalize right since the direction W is being cut off --\r
-SELECT '#1076f' As ticket, * FROM normalize_address('1940 County Road C W, Roseville, MN 55113'); \r
-\r
--- Route with a name that sounds like a direction --\r
-SELECT '#1076g' As ticket, * FROM normalize_address('3900 Route 6, Eastham, Massachusetts 02642');\r
-\r
--- Street that has same name as type  --\r
-SELECT '#1076h' As ticket, * FROM normalize_address('4533 PARK AVE S, MINNEAPOLIS, MN 55407');\r
--- same street with alternate county name\r
-SELECT '#1076i' As ticket, * FROM normalize_address('4533 County Road 33, MINNEAPOLIS, MN 55407'); \r
-\r
--- Same case of street type that has name as a type --\r
--- this matches -\r
-SELECT '#1109a' As ticket, * from normalize_address('4373 LAKE DRIVE, ROBBINSDALE, MN 55422');\r
-\r
--- this failed --\r
-SELECT '#1109b' As ticket, * from normalize_address('4373 LAKE DR, ROBBINSDALE, MN 55422');\r
-\r
--- another type (Is) that is part of street name but a compound street name\r
-SELECT '#1074a' As ticket, * FROM normalize_address('3420 RHODE ISLAND AVE S, ST. LOUIS PARK, MN 55426');\r
-\r
--- another type that is part of street name --\r
-SELECT '#1074b' As ticket, * FROM normalize_address('26 Court Street, Boston,MA 02109');\r
-\r
--- service roads and interstates\r
-SELECT '#1112a' As ticket, * FROM normalize_address('8401 W 35W Service Dr NE, Blaine, MN 55449');\r
-SELECT '#1112b' As ticket, * FROM normalize_address('8401 35W, Blaine, MN 55449');\r
-SELECT '#1112c' As ticket, * FROM normalize_address('8401 35W West, Blaine, MN 55449');\r
-SELECT '#1112d' As ticket, * FROM normalize_address('8401 West 35W, Blaine, MN 55449');\r
-SELECT '#1112e' As ticket, * FROM normalize_address('8401 W 35W, Blaine, MN 55449');\r
-\r
--- Testing pretty print of highway addresses\r
--- These tests excerpted from Brian Hamlin's CASS failures\r
--- in #1077\r
-SELECT '#1125a' As ticket, pprint_addy(normalize_address('19596 COUNTY ROAD 480, COLCORD, OK 74338'));\r
-SELECT '#1125b' As ticket, pprint_addy(addy), addy.* FROM normalize_address('4345 353 Rte, SALAMANCA, NY 14779') AS addy;\r
-SELECT '#1125c' As ticket, pprint_addy(addy), addy.* FROM normalize_address('19799 STATE ROUTE O, COSBY, MO 64436') AS addy;\r
-\r
--- some more to test interstate permutations\r
-SELECT '#1125d' As ticket, pprint_addy(addy), addy.* FROM normalize_address('Interstate 90,Boston, MA') As addy;\r
--- this one is wrong (because the lack of space trips it up) but will fix later\r
-SELECT '#1125e' As ticket, pprint_addy(addy), addy.* FROM normalize_address('I-90,Boston, MA') As addy;\r
-SELECT '#1125f' As ticket, pprint_addy(addy), addy.* FROM normalize_address('I 90,Boston, MA') As addy;\r
-\r
--- location with prefixes getting caught in post prefix\r
-SELECT '#1310a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('1110 W CAPITOL AVE, WEST SACRAMENTO, CA') As addy;\r
-\r
--- #1614 County Rd\r
-SELECT '#1614a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('8435 COUNTY RD 20 SE, ROCHESTER, MN 55904') As addy;\r
-SELECT '#1614b' As ticket, pprint_addy(addy), addy.* FROM normalize_address('3208 U.S. 52, Rochester, MN 55901') As addy;\r
-\r
--- #1108 suite gets stuck in post dir\r
-SELECT '#1108a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('529 Main Street, Suite 201, Boston, MA 02129') AS addy;\r
-\r
--- #3259 numbered streets\r
-SELECT '#3259a' As ticket, * FROM normalize_address('212 Third Ave N Suite 560, Minneapolis, MN 55401');\r
-SELECT '#3259b' As ticket, * FROM normalize_address('3937 Forty Third AVE S, MINNEAPOLIS, MN 55406');\r
---\timing\r
-SELECT set_geocode_setting('use_pagc_address_parser', 'false');\r
+SELECT set_geocode_setting('use_pagc_address_parser', 'true');
+--\timing
+SELECT '#887' As ticket, * FROM normalize_address('2450 N COLORADO ST, PHILADELPHIA, PA, 19132');
+-- this currently turns 3rd to 3, we want to fix to keep 3rd as is
+SELECT '#1051a' As ticket, * FROM normalize_address('212 3rd Ave N Suite 560, Minneapolis, MN 55401');
+-- this currently turns 43rd to 43, we want to fix to keep 43rd as is
+SELECT '#1051b' As ticket, * FROM normalize_address('3937 43RD AVE S, MINNEAPOLIS, MN 55406');
+-- this currently turns 3rd to 3, we want to fix to keep 3rd as is
+SELECT '#1051c' As ticket, * FROM normalize_address('212 N 3rd Ave, Minneapolis, MN 55401');
+-- this currently turns 3rd to 3, we want to fix to keep 3rd as is
+SELECT '#1051d' As ticket, * FROM normalize_address('212 3rd Ave N Minneapolis, MN 55401'); 
+-- comma in wrong spot
+SELECT * FROM normalize_address('529 Main Street, Boston MA, 02129');
+-- comma in right spot
+SELECT * FROM normalize_address('529 Main Street, Boston,MA 02129');
+-- partial address
+SELECT * FROM normalize_address('529 Main Street, Boston, MA');
+-- Full address with suite using ,
+SELECT * FROM normalize_address('529 Main Street, Apt 201, Boston, MA 02129');
+-- Full address with apart using space
+SELECT * FROM normalize_address('529 Main Street Apt 201, Boston, MA 02129');
+-- Partial address with apartment
+SELECT * FROM normalize_address('529 Main Street, Apt 201, Boston, MA');
+
+--This one fails so lead out for now
+SELECT '#1108a' As ticket, * FROM normalize_address('529 Main Street, Suite 201, Boston, MA 02129');
+
+-- Partial and Mangled zipcodes
+-- this currently fails and puts MINNEAPOLIS inside internal (seems to be a bug in parse address)
+SELECT '#1073a' As ticket, * FROM normalize_address('212 3rd Ave N, MINNEAPOLIS, MN 553404');
+SELECT '#1073b' As ticket, * FROM normalize_address('212 3rd Ave N, MINNEAPOLIS, MN 55401-');
+SELECT '#1073c' As ticket, * FROM normalize_address('529 Main Street, Boston, MA 021');
+
+-- comma in wrong position
+SELECT '#1086a' As ticket, * FROM normalize_address('949 N 3rd St, New Hyde Park, NY, 11040');
+
+-- comma in right position --
+SELECT '#1086b' As ticket, * FROM normalize_address('949 N 3rd St, New Hyde Park, NY 11040');
+
+-- country roads and highways with spaces in street type
+SELECT '#1076a' As ticket, * FROM normalize_address('16725 Co Rd 24, Plymouth, MN 55447'); 
+SELECT '#1076b' As ticket, * FROM normalize_address('16725 County Road 24, Plymouth, MN 55447'); 
+SELECT '#1076c' As ticket, * FROM normalize_address('13800 County Hwy 9, Andover, MN 55304');
+SELECT '#1076d' As ticket, * FROM normalize_address('13800 9, Andover, MN 55304');
+-- this one is a regular street that happens to have a street type as the name
+SELECT '#1076e' As ticket, * FROM normalize_address('14 Forest Road, Acton, MA');
+
+-- A country road with a letter name and direction 
+-- NOTE this doesn't completely normalize right since the direction W is being cut off --
+SELECT '#1076f' As ticket, * FROM normalize_address('1940 County Road C W, Roseville, MN 55113'); 
+
+-- Route with a name that sounds like a direction --
+SELECT '#1076g' As ticket, * FROM normalize_address('3900 Route 6, Eastham, Massachusetts 02642');
+
+-- Street that has same name as type  --
+SELECT '#1076h' As ticket, * FROM normalize_address('4533 PARK AVE S, MINNEAPOLIS, MN 55407');
+-- same street with alternate county name
+SELECT '#1076i' As ticket, * FROM normalize_address('4533 County Road 33, MINNEAPOLIS, MN 55407'); 
+
+-- Same case of street type that has name as a type --
+-- this matches -
+SELECT '#1109a' As ticket, * from normalize_address('4373 LAKE DRIVE, ROBBINSDALE, MN 55422');
+
+-- this failed --
+SELECT '#1109b' As ticket, * from normalize_address('4373 LAKE DR, ROBBINSDALE, MN 55422');
+
+-- another type (Is) that is part of street name but a compound street name
+SELECT '#1074a' As ticket, * FROM normalize_address('3420 RHODE ISLAND AVE S, ST. LOUIS PARK, MN 55426');
+
+-- another type that is part of street name --
+SELECT '#1074b' As ticket, * FROM normalize_address('26 Court Street, Boston,MA 02109');
+
+-- service roads and interstates
+SELECT '#1112a' As ticket, * FROM normalize_address('8401 W 35W Service Dr NE, Blaine, MN 55449');
+SELECT '#1112b' As ticket, * FROM normalize_address('8401 35W, Blaine, MN 55449');
+SELECT '#1112c' As ticket, * FROM normalize_address('8401 35W West, Blaine, MN 55449');
+SELECT '#1112d' As ticket, * FROM normalize_address('8401 West 35W, Blaine, MN 55449');
+SELECT '#1112e' As ticket, * FROM normalize_address('8401 W 35W, Blaine, MN 55449');
+
+-- Testing pretty print of highway addresses
+-- These tests excerpted from Brian Hamlin's CASS failures
+-- in #1077
+SELECT '#1125a' As ticket, pprint_addy(normalize_address('19596 COUNTY ROAD 480, COLCORD, OK 74338'));
+SELECT '#1125b' As ticket, pprint_addy(addy), addy.* FROM normalize_address('4345 353 Rte, SALAMANCA, NY 14779') AS addy;
+SELECT '#1125c' As ticket, pprint_addy(addy), addy.* FROM normalize_address('19799 STATE ROUTE O, COSBY, MO 64436') AS addy;
+
+-- some more to test interstate permutations
+SELECT '#1125d' As ticket, pprint_addy(addy), addy.* FROM normalize_address('Interstate 90,Boston, MA') As addy;
+-- this one is wrong (because the lack of space trips it up) but will fix later
+SELECT '#1125e' As ticket, pprint_addy(addy), addy.* FROM normalize_address('I-90,Boston, MA') As addy;
+SELECT '#1125f' As ticket, pprint_addy(addy), addy.* FROM normalize_address('I 90,Boston, MA') As addy;
+
+-- location with prefixes getting caught in post prefix
+SELECT '#1310a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('1110 W CAPITOL AVE, WEST SACRAMENTO, CA') As addy;
+
+-- #1614 County Rd
+SELECT '#1614a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('8435 COUNTY RD 20 SE, ROCHESTER, MN 55904') As addy;
+SELECT '#1614b' As ticket, pprint_addy(addy), addy.* FROM normalize_address('3208 U.S. 52, Rochester, MN 55901') As addy;
+
+-- #1108 suite gets stuck in post dir
+SELECT '#1108a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('529 Main Street, Suite 201, Boston, MA 02129') AS addy;
+
+-- #3259 numbered streets
+SELECT '#3259a' As ticket, * FROM normalize_address('212 Third Ave N Suite 560, Minneapolis, MN 55401');
+SELECT '#3259b' As ticket, * FROM normalize_address('3937 Forty Third AVE S, MINNEAPOLIS, MN 55406');
+--\timing
+SELECT set_geocode_setting('use_pagc_address_parser', 'false');