From 3c6924efec73c1cb23c25f9f0eb2ef826c49b340 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 23 Aug 2015 06:52:15 +0000 Subject: [PATCH] #3258 installcheck for tiger geocoder, update some regress so they reflect actual state of outputs, add new genrated folders to gitignore and svn ignore. Update the docs to describe new installcheck for (postgis_tiger_geocoder and address_standardizer extensions) git-svn-id: http://svn.osgeo.org/postgis/trunk@13982 b70326c6-7e19-0410-871a-916f4a2858ee --- .gitignore | 2 + doc/installation.xml | 27 +++++++++-- extensions/Makefile.in | 2 +- extensions/postgis_tiger_geocoder/Makefile.in | 38 ++++++++++++++- .../regress/normalize_address_desired_regress | 44 ++++++++++++++++++ .../regress/normalize_address_regress | 10 ++-- .../regress/normalize_address_regress.sql | 12 +++-- .../pagc_normalize_address_desired_regress | 46 +++++++++++++++++++ .../regress/pagc_normalize_address_regress | 46 +++++++++++++++++++ .../pagc_normalize_address_regress.sql | 10 ++-- 10 files changed, 218 insertions(+), 19 deletions(-) create mode 100644 extras/tiger_geocoder/regress/normalize_address_desired_regress create mode 100644 extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress create mode 100644 extras/tiger_geocoder/regress/pagc_normalize_address_regress diff --git a/.gitignore b/.gitignore index 5fa24f1a3..da6890e38 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ extensions/postgis_sfcgal/sql_bits/ extensions/postgis_tiger_geocoder/Makefile extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control extensions/postgis_tiger_geocoder/sql +extensions/postgis_tiger_geocoder/results +extensions/postgis_tiger_geocoder/expected extensions/postgis_tiger_geocoder/sql_bits/*.sql extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder.sql.in extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder_minor.sql.in diff --git a/doc/installation.xml b/doc/installation.xml index 948dcd784..e1ab84ded 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -673,8 +673,12 @@ in the extensions section of the database browser tree and wi If you have the extensions available, you can install postgis extension in your database of choice by either using pgAdmin extension interface or running these sql commands: CREATE EXTENSION postgis; -CREATE EXTENSION postgis_topology; -CREATE EXTENSION postgis_tiger_geocoder; +CREATE EXTENSION postgis_sfcgal; +CREATE EXTENSION fuzzystrmatch; --needed for postgis_tiger_geocoder +--optional used by postgis_tiger_geocoder, or can be used standalone +CREATE EXTENSION address_standardizer; +CREATE EXTENSION postgis_tiger_geocoder; +CREATE EXTENSION postgis_topology; In psql you can use to see what versions you have installed and also what schema they are installed. \connect mygisdb @@ -726,7 +730,7 @@ CREATE EXTENSION postgis_tiger_geocoder FROM unpackaged; make check - + The above command will run through various checks and regression tests using the generated library against an actual PostgreSQL database. @@ -1042,6 +1046,23 @@ Running tests uninstall .. ok (4112) Run tests: 90 + + The postgis_tiger_geocoder and address_standardizer extensions, currenlty only support the standard PostgreSQL installcheck. So to test these use the below. Note: the make install is not necessary if you already did make install at root of PostGIS code folder. + For address_standardizer + cd extensions/address_standardizer + make install + make installcheck + + + For tiger geocoder, make sure you have postgis and fuzzystrmatch extensions available in your PostgreSQL instance. The address_standardizer tests will also kick in if you built postgis with address_standardizer support + cd extensions/postgis_tiger_geocoder + make install + make installcheck + + output should look like: + + + diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 9c8256ea2..ea6c126e0 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -22,7 +22,7 @@ ifeq (@ADDRESS_STANDARDIZER@,address_standardizer) SUBDIRS += address_standardizer endif -all clean distclean install uninstall: +all clean distclean install uninstall installcheck: for DIR in $(SUBDIRS); do \ echo "---- Making $@ in $${DIR}"; \ $(MAKE) -C "$${DIR}" $@ || exit 1; \ diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in index 2c5de1cf2..d1785e4b0 100644 --- a/extensions/postgis_tiger_geocoder/Makefile.in +++ b/extensions/postgis_tiger_geocoder/Makefile.in @@ -19,6 +19,8 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \ sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/") DATA = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql)) +REGRESS = test-normalize_address +REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION) PG_CONFIG = @PG_CONFIG@ @@ -26,13 +28,38 @@ PG91 = $(shell $(PG_CONFIG) --version | $(GREP) -qE " 8\.| 9\.0" && echo SQL_BITS = $(wildcard sql_bits/*.sql) EXTRA_CLEAN += sql/*.sql ${SQL_BITS} +#test address standardizer if also built +ifeq (@ADDRESS_STANDARDIZER@,address_standardizer) + REGRESS += test-pagc_normalize_address + REGRESS_OPTS += --load-extension=address_standardizer +endif ifeq ($(PG91),yes) -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/test-normalize_address.sql sql/test-pagc_normalize_address.sql expected/test-normalize_address.out expected/test-pagc_normalize_address.out sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql mkdir -p sql + mkdir -p expected cp $< $@ + +## adding \t .. to force output to be the same as what get in regular regress in tiger folder + + +expected/test-normalize_address.out: ../../extras/tiger_geocoder/regress/normalize_address_regress + echo '\t on \a \set ECHO none' > $@ + cat $^ >> $@ + +expected/test-pagc_normalize_address.out: ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress + echo '\t on \a \set ECHO none' > $@ + cat $^ >> $@ + +sql/test-normalize_address.sql: ../../extras/tiger_geocoder/regress/normalize_address_regress.sql + echo '\t on \a \set ECHO none' > $@ + cat $^ >> $@ + +sql/test-pagc_normalize_address.sql: ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql + echo '\t on \a \set ECHO none' > $@ + cat $^ >> $@ sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql mkdir -p sql @@ -42,6 +69,11 @@ sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql sql_bits/mark_editable_object sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql mkdir -p sql cat $^ > $@ + +sql/test_normalize_address.sql: ../../extras/tiger_geocoder/regress/normalize_address_regress.sql + echo '\a' > $@ + cat $^ >> $@ + sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql mkdir -p sql cp $< $@ @@ -171,8 +203,10 @@ sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extensio for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \ cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \ done - + +#only extension files DATA = $(wildcard sql/*--*.sql) +EXTRA_CLEAN += $(wildcard expected/*--*.out) EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql endif diff --git a/extras/tiger_geocoder/regress/normalize_address_desired_regress b/extras/tiger_geocoder/regress/normalize_address_desired_regress new file mode 100644 index 000000000..c67c6f8d4 --- /dev/null +++ b/extras/tiger_geocoder/regress/normalize_address_desired_regress @@ -0,0 +1,44 @@ +#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|N||Minneapolis|MN|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||Apt 201|Boston|MA|02129|t +529||Main|St||Apt 201|Boston|MA|02129|t +529||Main|St||Apt 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|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||ST. LOUIS PARK|MN|55426|t +#1074b|26||Court|St|||Boston|MA|02109|t +#1112a|8401|W|35W|Svc Dr|NE||Blaine|MN|55449|t +#1112b|8401||35W||||Blaine|MN|55449|t +#1112c|8401||35W||W||Blaine|MN|55449|t +#1112d|8401|W|35W||||Blaine|MN|55449|t +#1112e|8401|W|35W||||Blaine|MN|55449|t +#1125a|19596 Co Rd 480, COLCORD, OK 74338 +#1125b|4345 Rte 353, SALAMANCA, NY 14779|4345||353|Rte|||SALAMANCA|NY|14779|t +#1125c|19799 State Rte O, COSBY, MO 64436|19799||O|State Rte|||COSBY|MO|64436|t +#1125d|I- 90, Boston, MA|||90|I-|||Boston|MA||t +#1125e|I- 90, Boston, MA|||90|I-|||Boston|MA||t +#1125f|I- 90, Boston, MA|||90|I-|||Boston|MA||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 Hwy 52, Rochester, MN 55901|3208||52|US Hwy|||Rochester|MN|55901|t diff --git a/extras/tiger_geocoder/regress/normalize_address_regress b/extras/tiger_geocoder/regress/normalize_address_regress index 5d1791f2c..747701e11 100644 --- a/extras/tiger_geocoder/regress/normalize_address_regress +++ b/extras/tiger_geocoder/regress/normalize_address_regress @@ -34,11 +34,11 @@ #1112d|8401|W|35W||||Blaine|MN|55449|t #1112e|8401|W|35W||||Blaine|MN|55449|t #1125a|19596 Co Rd 480, COLCORD, OK 74338 -#1125b|4345 Rte 353, SALAMANCA, NY 14779|4345||353|Rte|||SALAMANCA|NY|14779|t +#1125b|4345 353 Rte, SALAMANCA, NY 14779|4345||353|Rte|||SALAMANCA|NY|14779|t #1125c|19799 State Rte O, COSBY, MO 64436|19799||O|State Rte|||COSBY|MO|64436|t -#1125d|I- 90, Boston, MA|||90|I-|||Boston|MA||t -#1125e|I-90, Boston, MA|||I-90||||Boston|MA||t -#1125f|I- 90, Boston, MA|||90|I-|||Boston|MA||t +#1125d|Interstate 90, Boston, MA|||Interstate 90||||Boston|MA||t +#1125e|I-90,Boston, MA|||I-90,Boston|||||MA||t +#1125f|I 90, Boston, MA|||I 90||||Boston|MA||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 Hwy 52, Rochester, MN 55901|3208||52|US Hwy|||Rochester|MN|55901|t \ No newline at end of file +#1614b|3208 US Hwy 52, Rochester, MN 55901|3208||52|US Hwy|||Rochester|MN|55901|t diff --git a/extras/tiger_geocoder/regress/normalize_address_regress.sql b/extras/tiger_geocoder/regress/normalize_address_regress.sql index 8ce2322fa..76baa9345 100644 --- a/extras/tiger_geocoder/regress/normalize_address_regress.sql +++ b/extras/tiger_geocoder/regress/normalize_address_regress.sql @@ -1,4 +1,4 @@ -\timing +--\timing SELECT '#887' As ticket, * FROM normalize_address('2450 N COLORADO ST, PHILADELPHIA, PA, 19132'); SELECT '#1051a' As ticket, * FROM normalize_address('212 3rd Ave N Suite 560, Minneapolis, MN 55401'); SELECT '#1051b' As ticket, * FROM normalize_address('3937 43RD AVE S, MINNEAPOLIS, MN 55406'); @@ -73,16 +73,18 @@ SELECT '#1112d' As ticket, * FROM normalize_address('8401 West 35W, Blaine, MN 5 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 +-- 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; +--(somehow broke #1125b +SELECT '#1125b' As ticket, pprint_addy(addy), addy.* FROM normalize_address('4345 ROUTE 353, 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 +-- some more to test interstate permutations - currently fails 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; +--broke this one too 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 @@ -91,4 +93,4 @@ SELECT '#1310a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('111 -- #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; -\timing +--\timing diff --git a/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress b/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress new file mode 100644 index 000000000..966c415da --- /dev/null +++ b/extras/tiger_geocoder/regress/pagc_normalize_address_desired_regress @@ -0,0 +1,46 @@ +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 new file mode 100644 index 000000000..8ad51e6f4 --- /dev/null +++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress @@ -0,0 +1,46 @@ +true +#887|2450|N|COLORADO|ST|||PHILADELPHIA|PA|19132|t +#1051a|212||3|AVE|N|SUITE 560|MINNEAPOLIS|MN|55401|t +#1051b|3937||43|AVE|S||MINNEAPOLIS|MN|55406|t +#1051c|212|N|3|AVE|||MINNEAPOLIS|MN|55401|t +#1051d|212||3|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||3|AVE|N|# MINNEAPOLIS|MINNESOTA||553404|t +#1073b|212||3|AVE|N||MINNEAPOLIS|MN|55401|t +#1073c|529||MAIN|ST||# BOSTON|MASSACHUSETTS||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.sql b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql index 9d72059c4..734c2562b 100644 --- a/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql +++ b/extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql @@ -1,10 +1,13 @@ SELECT set_geocode_setting('use_pagc_address_parser', 'true'); -\timing +--\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'); --- City missing , -- NOTE this one won't normalize right if you don't have MN data loaded +-- 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'); @@ -23,6 +26,7 @@ SELECT * FROM normalize_address('529 Main Street, Apt 201, Boston, MA'); 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'); @@ -92,5 +96,5 @@ SELECT '#1310a' As ticket, pprint_addy(addy), addy.* FROM normalize_address('111 -- #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; -\timing +--\timing SELECT set_geocode_setting('use_pagc_address_parser', 'false'); -- 2.50.1