#1125 have highway designations print in front of streetname instead of after

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

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql b/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
index b09605e6a4e870cbf324bee3d7bbf94338c9e305..558d27ffa8a784ff5b4589581ddfe9032926eb7b 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
@@ -1,3 +1,14 @@
+-- helper function to determine if street type 
+-- should be put before or after the street name
+-- note in streettype lookup this is misnamed as is_hw
+-- because I originally thought only highways had that behavior
+-- it applies to foreign influenced roads like Camino (for road)
+CREATE OR REPLACE FUNCTION is_pretype(text) RETURNS boolean AS
+$$
+    SELECT EXISTS(SELECT name FROM street_type_lookup WHERE name = upper($1) AND is_hw );
+$$
+LANGUAGE sql IMMUTABLE STRICT; /** I know this should be stable but it's practically immutable :) **/
+
 CREATE OR REPLACE FUNCTION pprint_addy(
     input NORM_ADDY
 ) RETURNS VARCHAR
@@ -10,14 +21,11 @@ BEGIN
   END IF;
 
   result := cull_null(input.address::text)
-         || CASE WHEN input.preDirAbbrev IS NOT NULL THEN ' ' ELSE '' END
-         || cull_null(input.preDirAbbrev)
-         || CASE WHEN input.streetName IS NOT NULL THEN ' ' ELSE '' END
-         || cull_null(input.streetName)
-         || CASE WHEN input.streetTypeAbbrev IS NOT NULL THEN ' ' ELSE '' END
-         || cull_null(input.streetTypeAbbrev)
-         || CASE WHEN input.postDirAbbrev IS NOT NULL THEN ' ' ELSE '' END
-         || cull_null(input.postDirAbbrev)
+         || COALESCE(' ' || input.preDirAbbrev, '')
+         || CASE WHEN is_pretype(input.streetTypeAbbrev) THEN ' ' || input.streetTypeAbbrev  ELSE '' END
+         || COALESCE(' ' || input.streetName, '')
+         || CASE WHEN NOT is_pretype(input.streetTypeAbbrev) THEN ' ' || input.streetTypeAbbrev  ELSE '' END
+         || COALESCE(' ' || input.postDirAbbrev, '')
          || CASE WHEN
               input.address IS NOT NULL OR
               input.streetName IS NOT NULL
@@ -26,8 +34,7 @@ BEGIN
          || CASE WHEN input.internal IS NOT NULL THEN ', ' ELSE '' END
          || cull_null(input.location)
          || CASE WHEN input.location IS NOT NULL THEN ', ' ELSE '' END
-         || cull_null(input.stateAbbrev)
-         || CASE WHEN input.stateAbbrev IS NOT NULL THEN ' ' ELSE '' END
+         || COALESCE(input.stateAbbrev || ' ' , '')
          || cull_null(input.zip);
 
   RETURN trim(result);

diff --git a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress
index 93c1d77f18dbbbb96df1432d4335569bb7e89aa3..cfb4a94cf70bc2a04fe4b0e2e8bbc75da982917f 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress
+++ b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress
@@ -27,4 +27,15 @@
 #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
\ No newline at end of file
+#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|||I-90||||Boston|MA||t
+#1125f|I- 90, Boston, MA|||90|I-|||Boston|MA||t
\ No newline at end of file

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 657f66aca7db67b5f4ce442a1f0eb2b5880a1a39..c19f750f1b62ae49a46d6d644f477e5468e79f70 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql
+++ b/extras/tiger_geocoder/tiger_2010/regress/normalize_address_regress.sql
@@ -73,4 +73,16 @@ SELECT '#1112c' As ticket, * FROM normalize_address('8401 35W West, Blaine, MN 5
 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;
 \timing

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 cd877265fddf257f73cb2e697ed841586b5a04b9..f7564d02baac1400b42f0e67ea05219910200348 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql
+++ b/extras/tiger_geocoder/tiger_2010/tables/lookup_tables_2010.sql
@@ -284,12 +284,12 @@ INSERT INTO street_type_lookup (name, abbrev) VALUES ('EST', 'Est');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('ESTATE', 'Est');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('ESTATES', 'Ests');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('ESTS', 'Ests');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXP', 'Expy');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPR', 'Expy');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPRESS', 'Expy');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPRESSWAY', 'Expy');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPW', 'Expy');
-INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPY', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXP', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPR', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPRESS', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPRESSWAY', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPW', 'Expy');
+--INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXPY', 'Expy');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXT', 'Ext');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXTENSION', 'Ext');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('EXTN', 'Ext');
@@ -702,11 +702,16 @@ INSERT INTO street_type_lookup (name, abbrev) VALUES ('UPAS', 'Upas');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('UNS', 'Uns');
 INSERT INTO street_type_lookup (name, abbrev) VALUES ('WL', 'Wl');
 
--- prefix and suffix street names for highways and roads 
+-- prefix and suffix street names for highways and foreign named roads 
+-- where street type is at front of streetname instead of after
 -- these usually have numbers for street names and often have spaces in type
 INSERT INTO street_type_lookup (name, abbrev, is_hw) 
 SELECT name, abbrev, true
-    FROM (VALUES 
+    FROM (VALUES
+        ('CAM', 'Cam'),
+        ('CAM.', 'Cam'),
+        ('CAMINO', 'Cam'),
+        ('CO HWY', 'Co Hwy'),
         ('COUNTY HWY', 'Co Hwy'),
         ('COUNTY HIGHWAY', 'Co Hwy'),
         ('COUNTY HIGH WAY', 'Co Hwy'),
@@ -716,6 +721,12 @@ SELECT name, abbrev, true
         ('CO RTE', 'Co Rte'),
         ('COUNTY ROUTE', 'Co Rte'),
         ('CO ST AID HWY', 'Co St Aid Hwy'),
+        ('EXP', 'Expy'),
+        ('EXPR', 'Expy'),
+        ('EXPRESS', 'Expy'),
+        ('EXPRESSWAY', 'Expy'),
+        ('EXPW', 'Expy'),
+        ('EXPY', 'Expy'),
         ('FARM RD', 'Farm Rd'),
         ('FIRE RD', 'Fire Rd'),
         ('FOREST RD', 'Forest Rd'),
@@ -733,6 +744,14 @@ SELECT name, abbrev, true
         ('HIWY', 'Hwy'),
         ('HWAY', 'Hwy'),
         ('HWY', 'Hwy'),
+        ('I', 'I-'),
+        ('I-', 'I-'),
+        ('INTERSTATE', 'I-'),
+        ('INTERSTATE ROUTE', 'I-'),
+        ('INTERSTATE RTE', 'I-'),
+        ('INTERSTATE RTE.', 'I-'),
+        ('INTERSTATE RT', 'I-'),
+        ('LOOP', 'Loop'),
         ('ROUTE', 'Rte'),
         ('RTE', 'Rte'),
         ('RT', 'Rte'),

diff --git a/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql b/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
index 889f92e9b6a30736fe746b935ec5e427bc14e8a2..cbcab6d2a4ede0d6ad67427b4201f54a9664cc68 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
+++ b/extras/tiger_geocoder/tiger_2010/upgrade_geocode.sql
@@ -80,7 +80,11 @@ CREATE TYPE norm_addy AS (
 -- prefix and suffix street names for numbered highways
 CREATE TEMPORARY TABLE temp_types AS
 SELECT name, abbrev
-    FROM (VALUES 
+    FROM  ( VALUES
+        ('CAM', 'Cam'),
+        ('CAM.', 'Cam'),
+        ('CAMINO', 'Cam'),
+        ('CO HWY', 'Co Hwy'),
         ('COUNTY HWY', 'Co Hwy'),
         ('COUNTY HIGHWAY', 'Co Hwy'),
         ('COUNTY HIGH WAY', 'Co Hwy'),
@@ -90,6 +94,12 @@ SELECT name, abbrev
         ('CO RTE', 'Co Rte'),
         ('COUNTY ROUTE', 'Co Rte'),
         ('CO ST AID HWY', 'Co St Aid Hwy'),
+        ('EXP', 'Expy'),
+        ('EXPR', 'Expy'),
+        ('EXPRESS', 'Expy'),
+        ('EXPRESSWAY', 'Expy'),
+        ('EXPW', 'Expy'),
+        ('EXPY', 'Expy'),
         ('FARM RD', 'Farm Rd'),
         ('FIRE RD', 'Fire Rd'),
         ('FOREST RD', 'Forest Rd'),
@@ -107,9 +117,13 @@ SELECT name, abbrev
         ('HIWY', 'Hwy'),
         ('HWAY', 'Hwy'),
         ('HWY', 'Hwy'),
-        ('RT', 'Rte'),
+        ('I', 'I-'),
+        ('I-', 'I-'),
+        ('INTERSTATE', 'I-'),
+        ('LOOP', 'Loop'),
         ('ROUTE', 'Rte'),
         ('RTE', 'Rte'),
+        ('RT', 'Rte'),
         ('STATE HWY', 'State Hwy'),
         ('STATE HIGHWAY', 'State Hwy'),
         ('STATE HIGH WAY', 'State Hwy'),