Merge pull request #644 from nicolas-f/patchyu

Update Matsim_Tutorial.rst

Docs/Matsim_Tutorial.rst

@@ -73,7 +73,7 @@ Here, for our use case, the MAtsim scenario and it's agents were generated by us
 You can explore the other options by reading their descriptions. Here we are going to set them as follows:
 
 - Network CSV file: ``/path/to/your/scenario_matsim/network.csv``
-- Export additionnal traffic data ? : ``false``
+- Export additionnal traffic data ? : ``true``
 - Calculate All vehicles noise source ?: ``true``
 - Path of the matsim output folder: ``/path/to/your/scenario_matsim``
 - populationFactor: ``0.01``
@@ -87,7 +87,7 @@ You can explore the other options by reading their descriptions. Here we are goi
 .. figure:: images/matsim/traffic_events_wps.png
  :align: center
 
-You should end up with a ``MATSIM_ROADS`` table containing the links ids and their geometry and a ``MATSIM_ROADS_STATS`` table containing the noise power level of each link per 15 min time slice.
+You should end up with a ``MATSIM_ROADS`` table containing the links ids and their geometry and a ``MATSIM_ROADS_LW`` table containing the noise power level of each link per 15 min time slice.
 
 .. figure:: images/matsim/roads_table.png
  :align: center
@@ -214,20 +214,20 @@ We can see such a list for the receiver n°1 in the figure below:
 Step 6 : Calculate Noise Maps
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-We have noise power levels every 15 minutes in the ``MATSIM_ROADS_STATS`` table, and a source-receiver noise attenuation matrix in the ``LDAY_GEOM`` table.
+We have noise power levels every 15 minutes in the ``MATSIM_ROADS_LW`` table, and a source-receiver noise attenuation matrix in the ``LDAY_GEOM`` table.
 We just need to combine the two to get receivers noise levels, noise maps, every 15 minutes.
 
 This is the purpose of the ``Noise_From_Attenuation_Matrix`` WPS bloc.
 We just have set the right tables as input as follows :
 
 - Attenuation matrix table name: ``LDAY_GEOM``
 - Output table name: ``RESULT_GEOM``
-- Table name of the MATSIM table containing the roads LW stats per timeString: ``MATSIM_ROADS_STATS``
+- Table name of the MATSIM table containing the roads LW stats per timeBin: ``MATSIM_ROADS_LW``
 - Table name of the MATSIM table containing the roads geometries: ``MATSIM_ROADS``
 
 .. figure:: images/matsim/noise_map_wps.png
  :align: center
-
+S
 It takes some time but in the end you should get a noise spectrum for every receiver every 15 minutes in the table ``RESULT_GEOM``.
 
 We have our noise maps !
@@ -267,12 +267,12 @@ Let's go into QGIS. We are going to import 2 layers : an osm background and our
 
 You should see a lot of points all of the same color.
 
-We now need to choose a timeslice we want to visualize, let's pick ``10h00_10h15``.
+We now need to choose a timeslice we want to visualize, let's pick the timeBin of 10h (36000 seconds).
 If you right click on the receivers layer and click on ``Filter...`` you should see the filter dialog.
 
 To filter results for the 10h00_10h15 time period you can enter the following filter query :
 
- ``TIMESTRING = '10h00_10h15'``
+ ``TIME = 36000``
 
 The last step is to color the dots based on the LEQA field.
 Here is my configuration :