docs: replace table name 'vehicle_net' with 'ways'

Author: prashsti29

docs/scripts/basic/graphs/images.sql

@@ -4,7 +4,7 @@ SELECT row_number() over() as gid, ST_makeline(v1.geom, v2.geom) AS geom,
 '('||start_vid||', '||end_vid||') t= ' || round(agg_cost::NUMERIC, 2) AS name
 INTO costMatrix_png
 FROM pgr_dijkstraCostMatrix(
-  'SELECT * FROM vehicle_net',
+  'SELECT * FROM ways',
   ARRAY[@ID_1@, @ID_2@, @ID_3@, @ID_4@, @ID_5@])
 JOIN ways_vertices_pgr v1 ON (start_vid=v1.id)
 JOIN ways_vertices_pgr v2 ON (end_vid=v2.id);

docs/scripts/basic/sql_function/images.sql

@@ -1,9 +1,9 @@
 
 CREATE OR REPLACE VIEW using_vehicle AS
 SELECT *
-FROM wrk_dijkstra('vehicle_net',  @CH7_ID_1@, @CH7_ID_2@);
+FROM wrk_dijkstra('ways',  @CH7_ID_1@, @CH7_ID_2@);
 
 CREATE OR REPLACE VIEW sql_route_geom AS
 SELECT seq, id, geom
-FROM wrk_dijkstra('vehicle_net',  @CH7_ID_1@, @CH7_ID_2@)
-JOIN vehicle_net USING (id);
+FROM wrk_dijkstra('ways',  @CH7_ID_1@, @CH7_ID_2@)
+JOIN ways USING (id);

docs/scripts/basic/sql_function/sql_function.sql

@@ -20,12 +20,12 @@ FROM (
     'SELECT * FROM ' || $1,
     source, target)
 ) AS results
-LEFT JOIN vehicle_net USING (id)
+LEFT JOIN ways USING (id)
 ORDER BY seq;
 $BODY$
 LANGUAGE SQL;
 
-SELECT * FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@);
+SELECT * FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@);
 
 \o get_read_geom.txt
 
@@ -49,12 +49,12 @@ SELECT
   seq, id, seconds, name, length,
   ST_AsText(geom)
 FROM results
-LEFT JOIN vehicle_net USING (id)
+LEFT JOIN ways USING (id)
 ORDER BY seq;
 $BODY$
 LANGUAGE SQL;
 
-SELECT seq, route_readable FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@);
+SELECT seq, route_readable FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@);
 
 \o get_geom.txt
 
@@ -80,19 +80,19 @@ SELECT
   ST_AsText(geom),
   geom
 FROM results
-LEFT JOIN vehicle_net USING (id)
+LEFT JOIN ways USING (id)
 ORDER BY seq;
 $BODY$
 LANGUAGE SQL;
 
-SELECT seq, route_geom FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@);
+SELECT seq, route_geom FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@);
 
 \o wrong_directionality.txt
 
 WITH
 results AS (
   SELECT seq, id, route_geom
-  FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@)
+  FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@)
 ),
 compare AS (
   SELECT seq, id, lead(seq) over(ORDER BY seq) AS next_seq,
@@ -134,19 +134,19 @@ SELECT
       ELSE ST_Reverse(geom)
   END
 FROM results
-LEFT JOIN vehicle_net USING (id)
+LEFT JOIN ways USING (id)
 ORDER BY seq;
 $BODY$
 LANGUAGE SQL;
 
-SELECT seq, route_readable FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@);
+SELECT seq, route_readable FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@);
 
 \o good_directionality.txt
 
 WITH
 results AS (
   SELECT seq, id, seconds, route_geom
-  FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@)
+  FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@)
 ),
 compare AS (
   SELECT seq, id, lead(route_geom) over(ORDER BY seq) AS next_id,
@@ -188,7 +188,7 @@ additional AS (
         ELSE ST_Reverse(geom)
   END AS geom
   FROM results
-  LEFT JOIN vehicle_net USING (id)
+  LEFT JOIN ways USING (id)
   ORDER BY seq)
 
 SELECT *,
@@ -197,11 +197,11 @@ FROM additional ORDER BY seq;
 $BODY$
 LANGUAGE SQL;
 
-SELECT seq, azimuth FROM wrk_dijkstra('vehicle_net', @CH7_ID_1@, @CH7_ID_2@);
+SELECT seq, azimuth FROM wrk_dijkstra('ways', @CH7_ID_1@, @CH7_ID_2@);
 
 \o using_fn1.txt
 SELECT DISTINCT name
-FROM wrk_dijkstra('vehicle_net',  @CH7_ID_1@, @CH7_ID_2@);
+FROM wrk_dijkstra('ways',  @CH7_ID_1@, @CH7_ID_2@);
 
 \o using_fn2.txt
 SELECT name, sum(seconds)

docs/scripts/basic/vehicles/images.sql

@@ -3,22 +3,22 @@ CREATE OR REPLACE VIEW vehicle_route_going_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
-   FROM vehicle_net',
+   FROM ways',
   @ID_1@, @ID_3@,
   directed := true)
 )
-SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id);
+SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN ways ON(edge = id);
 
 
 CREATE OR REPLACE VIEW vehicle_route_coming_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
-  FROM vehicle_net',
+  FROM ways',
   @ID_3@, @ID_1@,
   directed := true)
 )
-SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id);
+SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN ways ON(edge = id);
 
 CREATE OR REPLACE VIEW vehicle_time_is_money_png AS
 WITH dijkstra AS (
@@ -39,11 +39,11 @@ SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
      CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
      CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-   FROM vehicle_net AS v JOIN configuration
+   FROM ways AS v JOIN configuration
    USING (tag_id)',
   @ID_3@, @ID_1@)
 )
-SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id);
+SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN ways ON(edge = id);
 
 -- Not including cycleways
 UPDATE configuration SET penalty=-1.0
@@ -67,11 +67,11 @@ SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
      CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
      CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-   FROM vehicle_net AS v JOIN configuration
+   FROM ways AS v JOIN configuration
    USING (tag_id)',
   @ID_3@, @ID_1@)
 )
-SELECT seq, geom AS geom FROM dijkstra JOIN vehicle_net ON(edge = id);
+SELECT seq, geom AS geom FROM dijkstra JOIN ways ON(edge = id);
 
 CREATE OR REPLACE VIEW vehicle_penalty_routes AS
 WITH dijkstra AS (

docs/scripts/basic/vehicles/vehicles.sql

@@ -1,28 +1,28 @@
 \o oneway_cost.txt
 
-SELECT count(*) FROM vehicle_net
+SELECT count(*) FROM ways
 WHERE cost < 0;
 
 \o oneway_revc.txt
 
 
-SELECT count(*) FROM vehicle_net
+SELECT count(*) FROM ways
 WHERE reverse_cost < 0;
 
 
 \o route_going.txt
 
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
-   FROM vehicle_net',
+   FROM ways',
   @ID_1@, @ID_3@,
   directed := true);
 
 \o route_coming.txt
 
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
-  FROM vehicle_net',
+  FROM ways',
   @ID_3@, @ID_1@,
   directed := true);
 
@@ -46,7 +46,7 @@ SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
      CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
      CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-   FROM vehicle_net AS v JOIN configuration
+   FROM ways AS v JOIN configuration
    USING (tag_id)',
    @ID_3@, @ID_1@);
 
@@ -74,7 +74,7 @@ SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
      CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
      CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-   FROM vehicle_net AS v JOIN configuration
+   FROM ways AS v JOIN configuration
    USING (tag_id)',
    @ID_3@, @ID_1@);
 
@@ -89,10 +89,10 @@ SELECT * FROM pgr_dijkstra(
       'SELECT v.id, source, target,
          CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
          CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-       FROM vehicle_net AS v JOIN configuration
+       FROM ways AS v JOIN configuration
        USING (tag_id)',
       @ID_3@, @ID_1@) ) AS edges_in_route
-  JOIN vehicle_net USING (id)
+  JOIN ways USING (id)
   $$,
   @ID_3@, @ID_1@);
 
@@ -103,7 +103,7 @@ SELECT
   v.id, source, target,
   CASE WHEN cost <= 0 THEN -1 ELSE cost * penalty END AS cost,
   CASE WHEN reverse_cost <= 0 THEN -1 ELSE reverse_cost * penalty END AS reverse_cost
-FROM vehicle_net AS v JOIN configuration
+FROM ways AS v JOIN configuration
 USING (tag_id);
 
 \o using_view.txt
@@ -117,7 +117,7 @@ SELECT * FROM pgr_dijkstra(
       'SELECT id, source, target, cost, reverse_cost
        FROM penalized',
       @ID_3@, @ID_1@) ) AS edges_in_route
-  JOIN vehicle_net USING (id)
+  JOIN ways USING (id)
   $$,
   @ID_3@, @ID_1@);
 

docs/scripts/basic/withPoints/images.sql

@@ -24,7 +24,7 @@ SELECT * INTO closest_walk FROM the_closest;
 
 CREATE OR REPLACE VIEW using_vehicle AS
 SELECT * FROM wrk_withPoints(
-  'vehicle_net',
+  'ways',
   @POINT1_LAT@, @POINT1_LON@,
   @POINT2_LAT@, @POINT2_LON@);
 

docs/scripts/basic/withPoints/withPoints.sql

@@ -1,27 +1,27 @@
 \o closestedges.txt
 
 SELECT 1 AS pid, * from pgr_findCloseEdges(
-  'SELECT id, geom from vehicle_net',
+  'SELECT id, geom from ways',
    ST_SetSRID(ST_Point(@POINT1_LON@, @POINT1_LAT@), 4326) , 0.5)
 
 UNION
 
 SELECT 2 AS pid, * from pgr_findCloseEdges(
-  'SELECT id, geom from vehicle_net',
+  'SELECT id, geom from ways',
   ST_SetSRID(ST_Point(@POINT2_LON@, @POINT2_LAT@), 4326) , 0.5);
 
 
 \o route_withPoints.txt
 
 SELECT * FROM pgr_withPoints(
-  'SELECT id, source, target, cost, reverse_cost from vehicle_net',
+  'SELECT id, source, target, cost, reverse_cost from ways',
   $$
   SELECT 2 AS pid, * from pgr_findCloseEdges(
-    'SELECT id, geom from vehicle_net',
+    'SELECT id, geom from ways',
     ST_SetSRID(ST_Point(@POINT1_LON@,  @POINT1_LAT@), 4326), 0.5)
   UNION
   SELECT 1 AS pid, * from pgr_findCloseEdges(
-    'SELECT id, geom from vehicle_net',
+    'SELECT id, geom from ways',
      ST_SetSRID(ST_Point(@POINT2_LON@,  @POINT2_LAT@), 4326), 0.5)
   $$,
   -1, -2);
@@ -118,7 +118,7 @@ LANGUAGE plpgsql;
 
 SELECT DISTINCT name
 FROM wrk_withPoints(
-  'vehicle_net',
+  'ways',
   @POINT1_LAT@, @POINT1_LON@,
   @POINT2_LAT@, @POINT2_LON@);