Fixing issues reported by rabbit

Author: cvvergara

docs/basic/vehicle.rst

@@ -185,7 +185,7 @@ Exercise 4: Vehicle routing without penalization
 
 * From the "|place_3|" to "|place_1|"
 
-.. image:: images/vehicle/vehicle_route_going.png
+.. image:: images/vehicle/vehicle_route_coming.png
   :scale: 25%
   :alt: From |place_3| to |place_1|
 
@@ -227,7 +227,7 @@ Exercise 5: Vehicle routing with penalization
 
 Change the cost values for the :code:`configuration` table, in such a way, that the
 
-* Bicycle roads roads are not used.
+* Bicycle roads are not used.
 
   * ``penalty < 0`` makes the road not to be included in the graph.
 

docs/scripts/basic/graphs/graphs.sql

@@ -79,7 +79,7 @@ SELECT component FROM all_components WHERE count = (SELECT max FROM max_componen
 \o create_vehicle_net1.txt
 -- DROP VIEW vehicle_net CASCADE;
 
-CREATE VIEW vehicle_net AS
+CREATE OR REPLACE VIEW vehicle_net AS
 
 WITH
 all_components AS (SELECT component, count(*) FROM ways GROUP BY component), -- line 6
@@ -105,7 +105,7 @@ SELECT count(*) FROM vehicle_net;
 
 -- DROP VIEW taxi_net;
 
-CREATE VIEW taxi_net AS
+CREATE OR REPLACE VIEW taxi_net AS
     SELECT
       id,
       source, target,

docs/scripts/basic/pedestrian/images.sql

@@ -1,4 +1,4 @@
-CREATE VIEW stars AS
+CREATE OR REPLACE VIEW stars AS
 SELECT osm_id, id, geom,
 CASE
   WHEN osm_id = @OSMID_1@ THEN '@PLACE_1@'
@@ -11,7 +11,7 @@ FROM vertices
 WHERE osm_id IN (@OSMID_1@, @OSMID_2@, @OSMID_3@, @OSMID_4@, @OSMID_5@)
 ORDER BY osm_id;
 
-CREATE VIEW pedestrian_one_to_one AS
+CREATE OR REPLACE VIEW pedestrian_one_to_one AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -23,7 +23,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, start_vid, end_vid, geom AS geom FROM dijkstra JOIN walk_net ON(edge = id);
 
-CREATE VIEW pedestrian_many_to_one AS
+CREATE OR REPLACE VIEW pedestrian_many_to_one AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -35,7 +35,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, start_vid, end_vid, geom AS geom FROM dijkstra JOIN walk_net ON(edge = id);
 
-CREATE VIEW pedestrian_one_to_many AS
+CREATE OR REPLACE VIEW pedestrian_one_to_many AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -47,7 +47,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, start_vid, end_vid, geom AS geom FROM dijkstra JOIN walk_net ON(edge = id);
 
-CREATE VIEW pedestrian_many_to_many AS
+CREATE OR REPLACE VIEW pedestrian_many_to_many AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -59,7 +59,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, start_vid, end_vid, geom AS geom FROM dijkstra JOIN walk_net ON(edge = id);
 
-CREATE VIEW pedestrian_combinations AS
+CREATE OR REPLACE VIEW pedestrian_combinations AS
 WITH dijkstra AS (
  SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -73,7 +73,7 @@ WITH dijkstra AS (
 )
 SELECT seq, start_vid, end_vid, geom AS geom FROM dijkstra JOIN walk_net ON(edge = id);
 
-CREATE VIEW pedestrian_dijkstraCost AS
+CREATE OR REPLACE VIEW pedestrian_dijkstraCost AS
 WITH dijkstra AS (
 SELECT start_vid, end_vid, round(agg_cost::numeric,2) AS agg_cost
 FROM pgr_dijkstraCost(

docs/scripts/basic/plpgsql_function/plpgsql_function.sql

@@ -187,19 +187,19 @@ SELECT 1 AS id, ST_MakePoint(@POINT2_LON@, @POINT2_LAT@)
 SELECT * INTO points_on_the_fly
 FROM the_points;
 
-CREATE VIEW ch8_using_vehicle AS
+CREATE OR REPLACE VIEW ch8_using_vehicle AS
 SELECT *  FROM wrk_fromAtoB(
   'vehicle_net',
   @POINT1_LAT@, @POINT1_LON@,
   @POINT2_LAT@, @POINT2_LON@);
 
-CREATE VIEW ch8_using_taxi AS
+CREATE OR REPLACE VIEW ch8_using_taxi AS
 SELECT *  FROM wrk_fromAtoB(
   'taxi_net',
   @POINT1_LAT@, @POINT1_LON@,
   @POINT2_LAT@, @POINT2_LON@);
 
-CREATE VIEW ch8_using_walk AS
+CREATE OR REPLACE VIEW ch8_using_walk AS
 SELECT *
 FROM wrk_fromAtoB(
   'walk_net',

docs/scripts/basic/sql_function/images.sql

@@ -56,14 +56,14 @@ ORDER BY seq;
 $BODY$
 LANGUAGE 'sql';
 
-CREATE VIEW using_vehicle AS
+CREATE OR REPLACE VIEW using_vehicle AS
 SELECT *
 FROM wrk_image('vehicle_net',  @CH7_OSMID_1@, @CH7_OSMID_2@);
 
-CREATE VIEW using_taxi AS
+CREATE OR REPLACE VIEW using_taxi AS
 SELECT *
 FROM wrk_image('taxi_net',  @CH7_OSMID_1@, @CH7_OSMID_2@);
 
-CREATE VIEW using_walk AS
+CREATE OR REPLACE VIEW using_walk AS
 SELECT *
 FROM wrk_image('walk_net',  @CH7_OSMID_1@, @CH7_OSMID_2@);

docs/scripts/basic/vehicles/images.sql

@@ -1,5 +1,5 @@
 
-CREATE VIEW vehicle_route_going_png AS
+CREATE OR REPLACE VIEW vehicle_route_going_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
@@ -10,7 +10,7 @@ SELECT * FROM pgr_dijkstra(
 SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id);
 
 
-CREATE VIEW vehicle_route_coming_png AS
+CREATE OR REPLACE VIEW vehicle_route_coming_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target, cost, reverse_cost
@@ -20,7 +20,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id);
 
-CREATE VIEW vehicle_time_is_money_png AS
+CREATE OR REPLACE VIEW vehicle_time_is_money_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT id, source, target,
@@ -33,7 +33,7 @@ SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN taxi_net ON(edge = id);
 
 UPDATE configuration SET penalty=1;
 
-CREATE VIEW vehicle_use_penalty_png AS
+CREATE OR REPLACE VIEW vehicle_use_penalty_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
@@ -47,7 +47,7 @@ SELECT seq, start_vid, end_vid, geom FROM dijkstra JOIN vehicle_net ON(edge = id
 
 -- Not including cycleways
 UPDATE configuration SET penalty=-1.0
-WHERE tag_key IN ('cycleway');
+WHERE tag_key IN ('cycleway') OR tag_value IN ('cycleway');
 
 -- Penalizing with 5 times the costs the unknown
 UPDATE configuration SET penalty=5 WHERE tag_value IN ('unclassified');
@@ -61,7 +61,7 @@ WHERE tag_value IN (
     'motorway','motorway_junction','motorway_link',
     'secondary');
 
-CREATE VIEW vehicle_get_penalized_route_png AS
+CREATE OR REPLACE VIEW vehicle_get_penalized_route_png AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   'SELECT v.id, source, target,
@@ -73,7 +73,7 @@ SELECT * FROM pgr_dijkstra(
 )
 SELECT seq, geom AS geom FROM dijkstra JOIN vehicle_net ON(edge = id);
 
-CREATE VIEW vehicle_penalty_routes AS
+CREATE OR REPLACE VIEW vehicle_penalty_routes AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   ' SELECT gid AS id, source, target, cost_s * penalty AS cost, reverse_cost_s * penalty AS reverse_cost
@@ -94,7 +94,7 @@ SELECT seq,
   start_vid, end_vid, the_geom AS geom
 FROM dijkstra JOIN ways ON(edge = gid);
 
-CREATE VIEW vehicle_no_penalty_routes AS
+CREATE OR REPLACE VIEW vehicle_no_penalty_routes AS
 WITH dijkstra AS (
 SELECT * FROM pgr_dijkstra(
   ' SELECT gid AS id, source, target, cost_s AS cost, reverse_cost_s AS reverse_cost FROM ways ',
@@ -113,5 +113,5 @@ SELECT seq,
   start_vid, end_vid, the_geom AS geom
 FROM dijkstra JOIN ways ON(edge = gid);
 
-CREATE VIEW pedestrian_only_roads AS
+CREATE OR REPLACE VIEW pedestrian_only_roads AS
 SELECT * FROM ways where tag_id in (119, 122, 114, 118);

docs/scripts/basic/vehicles/vehicles.sql

@@ -53,7 +53,7 @@ SELECT * FROM pgr_dijkstra(
 
 -- Not including cycleways
 UPDATE configuration SET penalty=-1.0
-WHERE tag_key IN ('cycleway');
+WHERE tag_key IN ('cycleway') OR tag_value IN ('cycleway');
 
 -- Penalizing with 5 times the costs the unknown
 UPDATE configuration SET penalty=5 WHERE tag_value IN ('unclassified');
@@ -99,7 +99,7 @@ SELECT * FROM pgr_dijkstra(
 
 \o penalized_view.txt
 
-CREATE VIEW penalized AS
+CREATE OR REPLACE VIEW penalized AS
 SELECT
   v.id, source, target,
   cost * penalty AS cost,

locale/en/LC_MESSAGES/basic/vehicle.po

@@ -318,7 +318,7 @@ msgid ""
 msgstr ""
 
 #: ../../build/docs/basic/vehicle.rst:230
-msgid "Bicycle roads roads are not used."
+msgid "Bicycle roads are not used."
 msgstr ""
 
 #: ../../build/docs/basic/vehicle.rst:232

locale/pot/basic/vehicle.pot

@@ -293,7 +293,7 @@ msgid "Change the cost values for the :code:`configuration` table, in such a way
 msgstr ""
 
 #: ../../build/docs/basic/vehicle.rst:230
-msgid "Bicycle roads roads are not used."
+msgid "Bicycle roads are not used."
 msgstr ""
 
 #: ../../build/docs/basic/vehicle.rst:232