pgRouting

Changeset 202

Show
Ignore:
Timestamp:
08/29/08 14:50:51 (3 months ago)
Author:
anton
Message:

ST_ removed from function names

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/sql/routing_topology.sql

    r177 r202  
    2525    SELECT 
    2626 
    27         ST_Distance(the_geom,ST_GeomFromText( AsText?(p), _srid)) AS d, id, the_geom 
     27        Distance(the_geom,GeometryFromText( AsText(p), _srid)) AS d, id, the_geom 
    2828 
    2929    INTO _r FROM vertices_tmp WHERE 
    3030 
    31         the_geom && ST_Expand(ST_GeomFromText(AsText?(p), _srid), tolerance ) AND ST_Distance(the_geom, ST_GeomFromText(AsText?(p), _srid)) < tolerance 
     31        the_geom && Expand(GeometryFromText(AsText(p), _srid), tolerance ) AND Distance(the_geom, GeometryFromText(AsText(p), _srid)) < tolerance 
    3232 
    3333    ORDER BY d LIMIT 1; IF FOUND THEN 
    …… 
    3737    ELSE 
    3838 
    39         INSERT INTO vertices_tmp(the_geom) VALUES (ST_SetSRID(p,_srid)); _id:=lastval(); 
     39        INSERT INTO vertices_tmp(the_geom) VALUES (SetSRID(p,_srid)); _id:=lastval(); 
    4040 
    4141    END IF; 
    …… 
    7272    EXECUTE 'CREATE TABLE vertices_tmp (id serial)'; 
    7373 
    74     FOR _r IN EXECUTE 'SELECT srid FROM geometry_columns WHERE f_table_name='|| quote_ident(geom_table)||';' LOOP 
     74    FOR _r IN EXECUTE 'SELECT srid FROM geometry_columns WHERE f_table_name='''|| quote_ident(geom_table)||''';' LOOP 
    7575        srid := _r.srid; 
    7676    END LOOP; 
    …… 
    8080                         
    8181    FOR _r IN EXECUTE 'SELECT ' || quote_ident(gid_cname) || ' AS id,' 
    82             || ' ST_StartPoint('|| quote_ident(geo_cname) ||') AS source,' 
    83             || ' ST_EndPoint('|| quote_ident(geo_cname) ||') as target' 
     82            || ' StartPoint('|| quote_ident(geo_cname) ||') AS source,' 
     83            || ' EndPoint('|| quote_ident(geo_cname) ||') as target' 
    8484            || ' FROM ' || quote_ident(geom_table)  
    8585    LOOP