more work on tiger topology loader -- revised to use temp table.

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

diff --git a/extras/tiger_geocoder/tiger_2010/topology/README b/extras/tiger_geocoder/tiger_2010/topology/README
index f9f07214cba19d8a074fed9c01eaf47ec09eb0fd..28dcdb7469ff1399bd0c4891f9e0d4912d1e32cc 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/topology/README
+++ b/extras/tiger_geocoder/tiger_2010/topology/README
@@ -1,4 +1,4 @@
 $Id$
-This folder is will contain functions for converting tiger data to 
+This folder will contain functions for converting tiger data to 
 PostGIS topology format. It assumes tiger data has already been loaded using
 the tiger loader.
\ No newline at end of file

diff --git a/extras/tiger_geocoder/tiger_2010/topology/tiger_topology_loader.sql b/extras/tiger_geocoder/tiger_2010/topology/tiger_topology_loader.sql
index 1313b0a1d89011877042525873ff9d42faafb6f6..b88ca90f74ee92c51e4759597b9ecceb1a9219cc 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/topology/tiger_topology_loader.sql
+++ b/extras/tiger_geocoder/tiger_2010/topology/tiger_topology_loader.sql
@@ -43,14 +43,46 @@ BEGIN
                ELSE
                        RAISE EXCEPTION 'Region type % IS NOT SUPPORTED', region_type;
        END CASE;
+       
+       var_sql := '
+       CREATE TEMPORARY TABLE tmp_edge
+                               AS 
+       WITH te AS 
+                       (SELECT tlid,  ST_GeometryN(the_geom,1) As the_geom, tnidf, tnidt, tfidl, tfidr 
+                                                                       FROM tiger.edges 
+                                                                       WHERE statefp = $1 AND ST_Intersects(the_geom, $2)
+                                                                               )
+                                       SELECT DISTINCT ON (t.tlid) t.tlid As edge_id,t.the_geom As geom, t.tnidf As start_node, t.tnidt As end_node, t.tfidl As left_face, t.tfidr As right_face, tl.tlid AS next_left_edge,  tr.tlid As next_right_egdge
+                                               FROM 
+                                                       te AS t INNER JOIN te As tl ON (t.tnidf = tl.tnidt) 
+                                                        INNER JOIN te As tr ON (t.tnidt = tr.tnidf)                            
+                                               ';
+       EXECUTE var_sql USING var_statefp, var_rgeom;
+       GET DIAGNOSTICS var_rcnt = ROW_COUNT;
+       var_result := var_rcnt::text || ' edges holding in temporary. ';
+       var_sql := 'ALTER TABLE tmp_edge ADD CONSTRAINT pk_tmp_edge PRIMARY KEY(edge_id );';
+       EXECUTE var_sql;
+       -- CREATE node indexes on temporary edges
+       var_sql := 'CREATE INDEX idx_tmp_edge_start_node ON tmp_edge USING btree (start_node ); CREATE INDEX idx_tmp_edge_start_node ON tmp_edge USING btree (end_node );';
+
+       EXECUTE var_sql;
+
+       -- CREATE face indexes on temporary edges
+       var_sql := 'CREATE INDEX idx_tmp_edge_left_face ON tmp_edge USING btree (left_face ); CREATE INDEX idx_tmp_edge_right_face ON tmp_edge USING btree (right_face );';
+
+       EXECUTE var_sql;
        -- start load in faces
        var_sql := 'INSERT INTO ' || quote_ident(toponame) || '.face(face_id, mbr) 
-                                               SELECT tfid, ST_Envelope(the_geom) As mbr 
-                                                       FROM tiger.faces WHERE statefp = $1 AND ST_Intersects(the_geom, $2) 
+                                               SELECT f.tfid, ST_Envelope(f.the_geom) As mbr 
+                                                       FROM tiger.faces AS f
+                                                               WHERE statefp = $1 AND 
+                                                               ( ST_Intersects(the_geom, $2) 
+                                                                       OR tfid IN(SELECT left_face FROM tmp_edge)
+                                                                       OR tfid IN(SELECT right_face FROM tmp_edge) )
                                                        AND tfid NOT IN(SELECT face_id FROM ' || quote_ident(toponame) || '.face) ';
        EXECUTE var_sql USING var_statefp, var_rgeom;
        GET DIAGNOSTICS var_rcnt = ROW_COUNT;
-       var_result := var_rcnt::text || ' faces added. ';
+       var_result := var_result || var_rcnt::text || ' faces added. ';
    -- end load in faces
    
        -- start load in nodes
@@ -58,17 +90,17 @@ BEGIN
                                        SELECT DISTINCT ON(tnid) tnid, geom
                                                FROM 
                                                ( 
-                                                       SELECT tnidf AS tnid, ST_StartPoint(ST_GeometryN(the_geom,1)) As geom 
-                                                               FROM tiger.edges WHERE statefp = $1 AND ST_Intersects(the_geom, $2) 
-                                                                       AND tnidf NOT IN(SELECT node_id FROM ' || quote_ident(toponame) || '.node)
+                                                       SELECT start_node AS tnid, ST_StartPoint(geom) As geom 
+                                                               FROM tmp_edges As e LEFT JOIN ' || quote_ident(toponame) || '.node AS n ON e.start_node = n.node_id
                                                UNION ALL 
-                                                       SELECT tnidt AS tnid, ST_EndPoint(ST_GeometryN(the_geom,1)) As geom 
-                                                       FROM tiger.edges WHERE statefp = $1 AND ST_Intersects(the_geom, $2) 
-                                                                       AND tnidt NOT IN(SELECT node_id FROM ' || quote_ident(toponame) || '.node) 
-                                       ) As n ';
+                                                       SELECT end_node AS tnid, ST_EndPoint(geom) As geom 
+                                                       FROM tmp_edges As e LEFT JOIN ' || quote_ident(toponame) || '.node AS n ON e.end_node = n.node_id 
+                                                       WHERE n.node_id IS NULL) As f
+                                        ';
        EXECUTE var_sql USING var_statefp, var_rgeom;
        GET DIAGNOSTICS var_rcnt = ROW_COUNT;
        var_result := var_result || ' ' || var_rcnt::text || ' nodes added. ';
+
    -- end load in nodes
    -- start Mark which nodes are contained in faces
        var_sql := 'UPDATE ' || quote_ident(toponame) || '.node AS n
@@ -83,8 +115,19 @@ BEGIN
    -- end Mark nodes contained in faces
    
    -- TODO: Load in edges --
+   var_sql := '
+       INSERT INTO ' || quote_ident(toponame) || '.edge(edge_id, geom, start_node, end_node, left_face, right_face, next_left_edge, next_right_edge)
+                                       SELECT edge_id, geom, start_node, end_node, left_face, right_face, next_left_edge, next_right_edge
+                                               FROM 
+                                                       tmp_edge
+                                                       WHERE edge_id NOT IN(SELECT edge_id FROM ' || quote_ident(toponame) || '.edge)                          
+                                               ';
+       EXECUTE var_sql USING var_statefp, var_rgeom;
+       var_sql = 'DROP TABLE tmp_edge;';
+       EXECUTE var_sql;
        RETURN var_result;
 END
 $$
   LANGUAGE plpgsql VOLATILE
   COST 1000;
+