Add in common abbreviation RT to map to Rte and test case to regress to test

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

diff --git a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress
index 68ee747ed7a2c62d116853994b8d32c50acf9c2a..326a4751e900c9c62e77f09c7d81c16ec3102b71 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress
+++ b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress
@@ -87,6 +87,7 @@ T16|Federal Ln, Dedham, MA 02026|POINT(-71.18356 42.23829)|39
 #1076f|1940 C W, Roseville, MN 55113|1940 County Road C W, Roseville, MN 55113|POINT(-93.18492 45.02058)|25
 #1076f|1940 W C, Roseville, MN 55113|1940 County Road C W, Roseville, MN 55113|POINT(-93.18492 45.02058)|29
 #1076g|15709 Rockford Rd, Plymouth, MN 55447|15709 Rockford Road, Plymouth, MN 55447|POINT(-93.47898 45.02726)|0
+#1076h|300 3, Hingham, MA 02043|300 Rt 3A, Hingham, MA|POINT(-70.91448 42.24915)|18
 #1074a|8525 Cottagewood Ter NE, Blaine, MN 55434|8525 COTTAGE WOOD TERR, Blaine, MN 55434|POINT(-93.24462 45.12481)|14
 #1074a|Cottage Wood Dr SW, Lake Shore, MN 56468|8525 COTTAGE WOOD TERR, Blaine, MN 55434|POINT(-94.39339 46.43663)|32
 #1074a|Cottage Wood Dr SW, Merrifield, MN 56468|8525 COTTAGE WOOD TERR, Blaine, MN 55434|POINT(-94.39339 46.43663)|32

diff --git a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql
index 18219fdf4869f97d6b041635bc4ba964425c9910..d54382afb104b097ec548defb8e6cf5c205fc892 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql
+++ b/extras/tiger_geocoder/tiger_2010/regress/geocode_regress.sql
@@ -46,13 +46,16 @@ SELECT '#1076b' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(S
 SELECT '#1076c' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target,1) As g, target FROM (SELECT '13800 County Hwy 9, Andover, MN 55304'::text As target) AS f) As foo; 
 SELECT '#1076d' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target,1) As g, target FROM (SELECT '13800 9, Andover, MN 55304'::text As target) AS f) As foo; 
 SELECT '#1076e' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target,4) As g, target FROM (SELECT '3900 Route 6, Eastham, Massachusetts 02642'::text As target) AS f) As foo; 
+
 -- country road that starts with a letter
 SELECT '#1076f' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target,3) As g, target FROM (SELECT '1940 County Road C W, Roseville, MN 55113'::text As target) AS f) As foo; 
 
-
 -- ad road that in some sections no street range recorded --
 SELECT '#1076g' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target) As g, target FROM (SELECT '15709 Rockford Road, Plymouth, MN 55447'::text As target) As f) AS foo;
 
+-- testing RT common abbreviation for route --
+SELECT '#1076h' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target,1) As g, target FROM (SELECT '300 Rt 3A, Hingham, MA'::text As target) As f) As foo;
+
 -- alternate spellings
 SELECT '#1074a' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target) As g, target FROM (SELECT '8525 COTTAGE WOOD TERR, Blaine, MN 55434'::text As target) As f) AS foo;
 SELECT '#1074b' As ticket, pprint_addy((g).addy) As address, target, ST_AsText(ST_SnapToGrid((g).geomout, 0.00001)) As pt, (g).rating FROM (SELECT geocode(target) As g, target FROM (SELECT '8525 COTTAGEWOOD TERR, Blaine, MN 55434'::text As target) As f) AS foo;

diff --git a/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql b/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql
index 20631250066f09ef684cce50b1d8521928c85dab..cd877265fddf257f73cb2e697ed841586b5a04b9 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql
+++ b/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql
@@ -735,6 +735,7 @@ SELECT name, abbrev, true
         ('HWY', 'Hwy'),
         ('ROUTE', 'Rte'),
         ('RTE', 'Rte'),
+        ('RT', 'Rte'),
         ('STATE HWY', 'State Hwy'),
         ('STATE HIGHWAY', 'State Hwy'),
         ('STATE HIGH WAY', 'State Hwy'),

diff --git a/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql b/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
index 4745e08b7591989e3cb1d42d9789a78903750b35..889f92e9b6a30736fe746b935ec5e427bc14e8a2 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
+++ b/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
@@ -107,6 +107,7 @@ SELECT name, abbrev
         ('HIWY', 'Hwy'),
         ('HWAY', 'Hwy'),
         ('HWY', 'Hwy'),
+        ('RT', 'Rte'),
         ('ROUTE', 'Rte'),
         ('RTE', 'Rte'),
         ('STATE HWY', 'State Hwy'),