reviewed chapters 1-8 on OSGeo Live and fixed small issues

Author: dkastl

docs/chapters/installation.rst

@@ -114,14 +114,14 @@ If these requirements are met, then open a terminal window and execute the follo
 	# login as user "user" 
 	psql -U user
 
-	# create routing database
+	-- create routing database
 	CREATE DATABASE routing;
 	\c routing
 
-	# add PostGIS functions 
+	-- add PostGIS functions 
 	CREATE EXTENSION postgis;
 
-	# add pgRouting core functions
+	-- add pgRouting core functions
 	CREATE EXTENSION pgrouting;
 	
 

docs/chapters/osm2pgrouting.rst

@@ -92,6 +92,7 @@ Then run the converter:
 				  -conf "/usr/share/osm2pgrouting/mapconfig.xml" \
 				  -dbname pgrouting-workshop \
 				  -user user \
+          -host localhost \
 				  -clean
 					
 List of all possible parameters:
@@ -144,15 +145,6 @@ List of all possible parameters:
      - drop peviously created tables
      - no
 
-.. note::
-
-  * There might be an updated version of osm2pgrouting available. To update the package run:
-
-  .. code-block:: bash
-
-    sudo apt-get update
-    sudo apt-get install --only-upgrade osm2pgrouting
-
 
 Depending on the size of your network the calculation and import may take a while. After it's finished connect to your database and check the tables that should have been created:
 

docs/chapters/topology.rst

@@ -132,12 +132,12 @@ First we have to add source and target column, then we run the ``pgr_createTopol
 Add indices
 -------------------------------------------------------------------------------
 
-Fortunately we didn't need to wait too long because the data is small. But your network data might be very large, so it's a good idea to add an index to ``source`` and ``target`` column.
+Make sure that your network table has an index for ``source`` and ``target`` columns.
 
 .. code-block:: sql
 
-	CREATE INDEX source_idx ON ways("source");
-	CREATE INDEX target_idx ON ways("target");
+	CREATE INDEX ways_source_idx ON ways("source");
+	CREATE INDEX ways_target_idx ON ways("target");
 
 After these steps our routing database looks like this:
 
@@ -146,20 +146,20 @@ After these steps our routing database looks like this:
 .. code-block:: sql
 
 	                 List of relations
-	 Schema |        Name         |   Type   |  Owner   
-	--------+---------------------+----------+----------
-	 public | geography_columns   | view     | user
-	 public | geometry_columns    | view     | user
-	 public | raster_columns      | view     | user
-	 public | raster_overviews    | view     | user
-	 public | spatial_ref_sys     | table    | user
-	 public | vertices_tmp        | table    | user
-	 public | vertices_tmp_id_seq | sequence | user
-	 public | ways                | table    | user
+	 Schema |           Name           |   Type   |  Owner   
+	--------+--------------------------+----------+----------
+	 public | geography_columns        | view     | user
+	 public | geometry_columns         | view     | user
+	 public | raster_columns           | view     | user
+	 public | raster_overviews         | view     | user
+	 public | spatial_ref_sys          | table    | user
+	 public | ways_vertices_pgr        | table    | user
+	 public | ways_vertices_pgr_id_seq | sequence | user
+	 public | ways                     | table    | user
 	(9 rows)
 
 * ``geography_columns`` should contain a record for each table with "geometry" attribute and its SRID.
-* ``vertices_tmp`` contains a list of all network nodes.
+* ``ways_vertices_pgr`` contains a list of all network nodes.
 
 
 .. rubric:: Run: ``\d ways``
@@ -180,8 +180,8 @@ After these steps our routing database looks like this:
 	Indexes:
 	    "ways_gid_idx" UNIQUE, btree (gid)
 	    "geom_idx" gist (the_geom)
-	    "source_idx" btree (source)
-	    "target_idx" btree (target)
+	    "ways_source_idx" btree (source)
+	    "ways_target_idx" btree (target)
 
 * ``source`` and ``target`` columns are now updated with node IDs.
 * ``name`` may contain the street name or be empty.

docs/chapters/wrapper.rst

@@ -202,4 +202,4 @@ We can now install this function into the database:
 
 .. code-block:: bash
 
-	psql -U user -d pgrouting-workshop ~/Desktop/pgrouting-workshop/data/fromAtoB.sql
+	psql -U user -d pgrouting-workshop -f ~/Desktop/pgrouting-workshop/data/fromAtoB.sql