From 5dcb71e9c362813b1f5354eedc00fb6803857f73 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 3 Jul 2011 10:45:46 +0000 Subject: [PATCH] Add more tests, minor cleanup git-svn-id: http://svn.osgeo.org/postgis/trunk@7564 b70326c6-7e19-0410-871a-916f4a2858ee --- .../tiger_2010/regress/geocode_regress | 90 ++++++++----------- .../tiger_2010/regress/geocode_regress.sql | 4 +- .../regress/normalize_address_regress | 1 + .../regress/normalize_address_regress.sql | 4 +- 4 files changed, 43 insertions(+), 56 deletions(-) diff --git a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress index de46774c8..c1c2d148f 100644 --- a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress +++ b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress @@ -1,53 +1,37 @@ - 529 Main St, Boston, MA 02129 | POINT(-71.0718721304348 42.3835137826087) | 0 - - 75 State St, Boston, MA 02109 | POINT(-71.0556974285714 42.3590795714286) | 0 - - 100 Federal St, Boston, MA 02110 | POINT(-71.056314 42.354769) | 0 - - 529 Main St, Boston, MA 02129 | POINT(-71.0718721304348 42.3835137826087) | 0 - - 75 State St, Boston, MA 02109 | POINT(-71.0556974285714 42.3590795714286) | 0 - - - 529 Main St, Boston, MA 02129 | POINT(-71.0718721304348 42.3835137826087) | 0 - - 75 State St, Boston, MA 02109 | POINT(-71.0556974285714 42.3590795714286) | 0 - - 100 Federal St, Boston, MA 02110 | POINT(-71.056314 42.354769) | 0 - - 530 Main St, Boston, MA 02129 | POINT(-71.071734 42.38345) | 0 - - 76 State St, Boston, MA 02109 | POINT(-71.0561527692308 42.3589996153846) | 0 - - 101 Federal St, Boston, MA 02110 | POINT(-71.0563038 42.3546946) | 0 - - - - 101 Federal St, Boston, MA 02110 | POINT(-71.0563038 42.3546946) | 10 - - 101 Federal St, Boston, MA 02110 | POINT(-71.0563038 42.3546946) | 10 - 101 Federal St, Blackstone, MA 01504 | POINT(-71.5246987130121 42.0288604697987) | 15 - 101 Federal St, Lynn, MA 01905 | POINT(-70.9678344129808 42.4659009057427) | 15 - 101 Federal St, Lawrence, MA 01810 | POINT(-71.2012528459153 42.6901540310566) | 17 - 101 Federal St, Andover, MA 01810 | POINT(-71.2012528459153 42.6901540310566) | 17 - 101 Federal St, Northampton, MA 01062 | POINT(-72.655372 42.32273) | 17 - 101 Federal St, Belchertown, MA 01007 | POINT(-72.4120567596665 42.2944575040247) | 17 - 101 Federal St, Agawam Town, MA 01001 | POINT(-72.622305017362 42.0837072292948) | 18 - 101 Federal St, Millers Falls, MA 01349 | POINT(-72.4993935958437 42.5680170002944) | 22 - 101 Federal St, Greenfield Town, MA 01301 | POINT(-72.5990944761905 42.5900632380952) | 22 - Federal Ct, Boston, MA 02110 | POINT(-71.0567205 42.354134) | 24 - Federal Ln, Dedham, MA 02026 | POINT(-71.183565 42.238295) | 33 - - 212 3rd Ave N, Minneapolis, MN 55401 | POINT(-93.2718114 44.9850188) | 1 - 212 3rd Ave S, Minneapolis, MN 55404 | POINT(-93.2635498396584 44.9806201397408) | 3 - 212 3rd Ave S, Minneapolis, MN 55401 | POINT(-93.2633388442551 44.9808723431463) | 3 - 212 3rd Ave NE, Minneapolis, MN 55413 | POINT(-93.2592025 44.990786) | 4 - 212 3rd Ave S, Minneapolis, MN 55415 | POINT(-93.2641725306122 44.9798755102041) | 4 - 212 3rd Ave SE, Minneapolis, MN 55414 | POINT(-93.2526539591837 44.9848287755102) | 5 - 212 3rd Ave N, Biwabik, MN 55708 | POINT(-92.3450754489796 47.5343256938775) | 8 - 212 3rd Ave N, Lakefield, MN 56150 | POINT(-95.1733443061224 43.6785488163265) | 9 - 212 3rd Ave N, Bayport, MN 55003 | POINT(-92.7789324000695 45.019825623949) | 9 - 212 3rd Ave N, Long Prairie, MN 56347 | POINT(-94.8618907833944 45.977553389256) | 10 - - Plymouth, MN 55340 | POINT(-93.5757500937089 45.076212213583) | 100 - +529 Main St, Boston, MA 02129|POINT(-71.0718721304348 42.3835137826087)|0 +75 State St, Boston, MA 02109|POINT(-71.0556974285714 42.3590795714286)|0 +100 Federal St, Boston, MA 02110|POINT(-71.056314 42.354769)|0 +529 Main St, Boston, MA 02129|POINT(-71.0718721304348 42.3835137826087)|0 +75 State St, Boston, MA 02109|POINT(-71.0556974285714 42.3590795714286)|0 +100 Federal St, Boston, MA 02110|POINT(-71.056314 42.354769)|0 +529 Main St, Boston, MA 02129|POINT(-71.0718721304348 42.3835137826087)|0 +75 State St, Boston, MA 02109|POINT(-71.0556974285714 42.3590795714286)|0 +100 Federal St, Boston, MA 02110|POINT(-71.056314 42.354769)|0 +530 Main St, Boston, MA 02129|POINT(-71.071734 42.38345)|0 +76 State St, Boston, MA 02109|POINT(-71.0561527692308 42.3589996153846)|0 +101 Federal St, Boston, MA 02110|POINT(-71.0563038 42.3546946)|0 +101 Federal St, Boston, MA 02110|POINT(-71.0563038 42.3546946)|0 +101 Federal St, Boston, MA 02110|POINT(-71.0563038 42.3546946)|0 +101 Federal St, Boston, MA 02110|POINT(-71.0563038 42.3546946)|10 +101 Federal St, Boston, MA 02110|POINT(-71.0563038 42.3546946)|10 +101 Federal St, Blackstone, MA 01504|POINT(-71.5246987130121 42.0288604697987)|15 +101 Federal St, Lynn, MA 01905|POINT(-70.9678344129807 42.4659009057427)|15 +101 Federal St, Lawrence, MA 01810|POINT(-71.2012528459153 42.6901540310566)|17 +101 Federal St, Andover, MA 01810|POINT(-71.2012528459153 42.6901540310566)|17 +101 Federal St, Northampton, MA 01062|POINT(-72.655372 42.32273)|17 +101 Federal St, Belchertown, MA 01007|POINT(-72.4120567596665 42.2944575040247)|17 +101 Federal St, Agawam Town, MA 01001|POINT(-72.622305017362 42.0837072292948)|18 +101 Federal St, Millers Falls, MA 01349|POINT(-72.4993935958437 42.5680170002944)|22 +101 Federal St, Greenfield Town, MA 01301|POINT(-72.5990944761905 42.5900632380952)|22 +Federal Ct, Boston, MA 02110|POINT(-71.0567205 42.354134)|24 +Federal Ln, Dedham, MA 02026|POINT(-71.183565 42.238295)|33 +#1073|212 3rd Ave N, Minneapolis, MN 55401|POINT(-93.2718114 44.9850188)|1 +#1073|212 3rd Ave S, Minneapolis, MN 55404|POINT(-93.2635498396584 44.9806201397408)|3 +#1073|212 3rd Ave S, Minneapolis, MN 55401|POINT(-93.2633388442551 44.9808723431463)|3 +#1073|212 3rd Ave S, Minneapolis, MN 55415|POINT(-93.2641725306122 44.9798755102041)|4 +#1073|212 3rd Ave NE, Minneapolis, MN 55413|POINT(-93.2592025 44.990786)|4 +#1073|212 3rd Ave N, Minneapolis, MN 55401|POINT(-93.2718114 44.9850188)|1 +#1073|212 3rd Ave S, Minneapolis, MN 55404|POINT(-93.2635498396584 44.9806201397408)|3 +#1073|212 3rd Ave S, Minneapolis, MN 55401|POINT(-93.2633388442551 44.9808723431463)|3 +#1073|212 3rd Ave S, Minneapolis, MN 55415|POINT(-93.2641725306122 44.9798755102041)|4 +#1073|212 3rd Ave NE, Minneapolis, MN 55413|POINT(-93.2592025 44.990786)|4 diff --git a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql index 1c3cde0af..1051e8c7e 100644 --- a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql +++ b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql @@ -28,6 +28,6 @@ SELECT pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geoco SELECT pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geocode('101 Fedaral Street, Boston, MA',50); --Geocoding mangled zipcodes -SELECT pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geocode('212 3rd Ave N, MINNEAPOLIS, MN 553404'); -SELECT pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geocode('212 3rd Ave N, MINNEAPOLIS, MN 55340-'); +SELECT '#1073' As ticket, pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geocode('212 3rd Ave N, MINNEAPOLIS, MN 553404',5); +SELECT '#1073' As ticket, pprint_addy(addy) As address, ST_AsText(geomout) As pt, rating FROM geocode('212 3rd Ave N, MINNEAPOLIS, MN 55340-',5); \timing diff --git a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress index 211f91e4d..1204f55d6 100644 --- a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress +++ b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress @@ -2,6 +2,7 @@ #1051|212||3rd|Ave|N|Suite 560|Minneapolis|MN|55401|t #1051|3937||43RD|Ave|S||MINNEAPOLIS|MN|55406|t #1051|212|N|3rd|Ave|||Minneapolis|MN|55401|t +#1051|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 diff --git a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql index ba34e39ca..d7aa6079a 100644 --- a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql +++ b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql @@ -3,7 +3,9 @@ SELECT '#887' As ticket, * FROM normalize_address('2450 N COLORADO ST, PHILADELPHIA, PA, 19132'); SELECT '#1051' As ticket, * FROM normalize_address('212 3rd Ave N Suite 560, Minneapolis, MN 55401'); SELECT '#1051' As ticket, * FROM normalize_address('3937 43RD AVE S, MINNEAPOLIS, MN 55406'); -SELECT '#1051' As ticket, * from normalize_address('212 N 3rd Ave, Minneapolis, MN 55401'); +SELECT '#1051' 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 +SELECT '#1051' 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 -- 2.50.1