more revisions to cross streets logic -- don't rely on start point working with multi...

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

diff --git a/extras/tiger_geocoder/tiger_2010/geocode/geocode_intersection.sql b/extras/tiger_geocoder/tiger_2010/geocode/geocode_intersection.sql
index 9190337599880b10592a1a174a36eb924147397b..b31cce6e79f1f9d7a740014574b8404ff73b72ec 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/geocode/geocode_intersection.sql
+++ b/extras/tiger_geocoder/tiger_2010/geocode/geocode_intersection.sql
@@ -47,20 +47,18 @@ BEGIN
     END IF;
     var_sql := '
     WITH 
-       f1 AS (SELECT * FROM featnames 
+       a1 AS (SELECT f.*, addr.fromhn, addr.tohn, addr.side , addr.zip
+                               FROM addr INNER JOIN (SELECT * FROM featnames 
                                                        WHERE statefp = $1 AND ( lower(name) = $2  ' ||
                                                        CASE WHEN length(var_na_road.streetName) > 5 THEN ' or   lower(fullname) LIKE $6 || ''%'' ' ELSE '' END || ')' 
-                                                       || ') ,
-       f2 AS (SELECT * FROM featnames 
-                                                       WHERE statefp = $1 AND ( lower(name) = $4 ' || 
-                                                       CASE WHEN length(var_na_inter1.streetName) > 5 THEN ' or lower(fullname) LIKE $7 || ''%'' ' ELSE '' END || ')' 
-                                                       || ' ) ,
-       a1 AS (SELECT f.*, addr.fromhn, addr.tohn, addr.side , addr.zip
-                               FROM addr INNER JOIN f1 AS f ON addr.tlid = f.tlid
+                                                       || ')  AS f ON (addr.tlid = f.tlid AND addr.statefp = f.statefp)
                                        WHERE addr.statefp = $1 AND addr.zip = ANY($5::text[]) 
                          ),
         a2 AS (SELECT f.*, addr.fromhn, addr.tohn, addr.side , addr.zip
-                               FROM addr INNER JOIN f2 AS f ON addr.tlid = f.tlid
+                               FROM addr INNER JOIN (SELECT * FROM featnames 
+                                                       WHERE statefp = $1 AND ( lower(name) = $4 ' || 
+                                                       CASE WHEN length(var_na_inter1.streetName) > 5 THEN ' or lower(fullname) LIKE $7 || ''%'' ' ELSE '' END || ')' 
+                                                       || ' )  AS f ON (addr.tlid = f.tlid AND addr.statefp = f.statefp)
                                        WHERE addr.statefp = $1 AND addr.zip = ANY($5::text[]) 
                          ),
         e1 AS (SELECT e.the_geom, e.tnidf, e.tnidt, a.*,
@@ -82,16 +80,13 @@ BEGIN
                                 e1.tohn END As address, e1.predirabrv As fedirp, COALESCE(e1.prequalabr || '' '','''' ) || e1.name As fename, 
                              COALESCE(e1.suftypabrv,e1.pretypabrv)  As fetype, e1.sufdirabrv AS fedirs, 
                                p.name As place, e1.zip,
-                             CASE WHEN ST_Intersects(ST_StartPoint(e1.the_geom), e2.the_geom) THEN
-                                ST_StartPoint(e1.the_geom)
-                            WHEN ST_Intersects(ST_EndPoint(e1.the_geom), e2.the_geom) THEN
-                                ST_EndPoint(e1.the_geom)
-                             ELSE ST_EndPoint(e1.the_geom) END AS geom ,   
+                             CASE WHEN e1.tnidf = e2.tnidf OR e1.tnidf = e2.tnidt THEN
+                                ST_StartPoint(ST_GeometryN(ST_Multi(e1.the_geom),1))
+                             ELSE ST_EndPoint(ST_GeometryN(ST_Multi(e1.the_geom),1)) END AS geom ,   
                                 CASE WHEN lower(p.name) = $3 THEN 0 ELSE 1 END 
                                 + levenshtein_ignore_case(e1.name || COALESCE('' '' || e1.sufqualabr, ''''),$2) +
                                 CASE WHEN e1.fullname = $6 THEN 0 ELSE levenshtein_ignore_case(e1.fullname, $6) END +
                                 + levenshtein_ignore_case(e2.name || COALESCE('' '' || e2.sufqualabr, ''''),$4)
-                                + CASE WHEN e2.tfid = e1.tfid THEN 0 ELSE 3 END
                                 AS a_rating  
                     FROM e1 
                             INNER JOIN e2 ON (

diff --git a/extras/tiger_geocoder/tiger_2010/geocode/other_helper_functions.sql b/extras/tiger_geocoder/tiger_2010/geocode/other_helper_functions.sql
index ef7a882f5176fd21fd6a1002d19b099d0e128e9d..6eeb8cf6b4305ac4c630f1c79601de5709ed9fc9 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/geocode/other_helper_functions.sql
+++ b/extras/tiger_geocoder/tiger_2010/geocode/other_helper_functions.sql
@@ -62,6 +62,17 @@ CREATE OR REPLACE FUNCTION missing_indexes_generate_script()
 RETURNS text AS
 $$
 SELECT array_to_string(ARRAY(
+-- create unique index on faces for tfid seems to perform better --
+SELECT 'CREATE UNIQUE INDEX uidx_' || c.table_schema || '_' || c.table_name || '_' || c.column_name || ' ON ' || c.table_schema || '.' || c.table_name || ' USING btree(' || c.column_name || ');' As index
+FROM (SELECT table_name, table_schema  FROM 
+       information_schema.tables WHERE table_type = 'BASE TABLE') As t  INNER JOIN
+       (SELECT * FROM information_schema.columns WHERE column_name IN('tfid') ) AS c  
+               ON (t.table_name = c.table_name AND t.table_schema = c.table_schema)
+               LEFT JOIN pg_catalog.pg_indexes i ON 
+                       (i.tablename = c.table_name AND i.schemaname = c.table_schema 
+                               AND  indexname LIKE 'uidx%' || c.column_name || '%' ) 
+WHERE i.tablename IS NULL AND c.table_schema IN('tiger','tiger_data') AND c.table_name LIKE '%faces'
+UNION ALL
 -- basic btree regular indexes
 SELECT 'CREATE INDEX idx_' || c.table_schema || '_' || c.table_name || '_' || c.column_name || ' ON ' || c.table_schema || '.' || c.table_name || ' USING btree(' || c.column_name || ');' As index
 FROM (SELECT table_name, table_schema  FROM 
@@ -70,8 +81,8 @@ FROM (SELECT table_name, table_schema  FROM
                ON (t.table_name = c.table_name AND t.table_schema = c.table_schema)
                LEFT JOIN pg_catalog.pg_indexes i ON 
                        (i.tablename = c.table_name AND i.schemaname = c.table_schema 
-                               AND  indexdef LIKE '%' || c.column_name || '%') 
-WHERE i.tablename IS NULL AND c.table_schema IN('tiger','tiger_data')
+                               AND  indexdef LIKE '%' || c.column_name || '%' ) 
+WHERE i.tablename IS NULL AND c.table_schema IN('tiger','tiger_data')  AND (NOT c.table_name LIKE '%faces')
 -- Gist spatial indexes --
 UNION ALL
 SELECT 'CREATE INDEX idx_' || c.table_schema || '_' || c.table_name || '_' || c.column_name || '_gist ON ' || c.table_schema || '.' || c.table_name || ' USING gist(' || c.column_name || ');' As index