diff --git a/Docs/img/ue_crosswalks.png b/Docs/img/ue_crosswalks.png
new file mode 100644
index 000000000..b203fc6aa
Binary files /dev/null and b/Docs/img/ue_crosswalks.png differ
diff --git a/Docs/img/ue_meshes.png b/Docs/img/ue_meshes.png
new file mode 100644
index 000000000..bcf720018
Binary files /dev/null and b/Docs/img/ue_meshes.png differ
diff --git a/Docs/img/ue_noexport.png b/Docs/img/ue_noexport.png
new file mode 100644
index 000000000..f2a693ba0
Binary files /dev/null and b/Docs/img/ue_noexport.png differ
diff --git a/Docs/tuto_A_map_creation.md b/Docs/tuto_A_map_creation.md
index d805da0b6..ad60e45d1 100644
--- a/Docs/tuto_A_map_creation.md
+++ b/Docs/tuto_A_map_creation.md
@@ -1,221 +1,233 @@
-# How to create and import a new map
-
----
-## 1 Create a new map
+# Create and import a map
-Files needed:
-
-* Binaries `.fbx` - All meshes you need to build the map, i.e., roads, lanemarking, sidewalk, ect.
-* OpenDRIVE `.xodr` - Road network information that cars need to circulate on the map.
-
-It is possible to modify an existing CARLA map, check out the [map customization](tuto_A_map_customization.md)
-tutorial.
-
-The following steps will introduce the RoadRunner software for map creation. If the map is
-created by other software, go to this [section](#3-importing-into-unreal).
+* [__Introduction__](#introduction)
+* [__Map creation with RoadRunner__](#map-creation-with-roadrunner)
+ * [Export the map](#export-the-map)
+* [__Import a map into CARLA__](#import-a-map-into-carla)
+* [__Final tips__](#final-tips)
+* [__Previous ways to import a map__](#previous-ways-to-import-a-map)
---
-## 2 Create a new map with RoadRunner
+## Introduction
-RoadRunner is a powerful software from Vector Zero to create 3D scenes. Using RoadRunner is easy,
-in a few steps you will be able to create an impressive scene. You can download
-a trial of RoadRunner at VectorZero's web page.
+In order to create a CARLA map, two elements are needed. This tutorial explains how to properly import them to CARLA.
-
-
-
+* __`.fbx` binaries.__ The meshes needed to build the map, such as roads, lanemarkings, sidewalks, ect.
+* __`.xodr` OpenDRIVE file.__ Contains the road network information necessary for vehicles to navigate the map.
-Read VectorZero's RoadRunner [documentation][rr_docs] to install it and get started.
+In order to create them, RoadRunner is the recommended software. It is quite easy to use, and it provides plugins that make the import process much simpler. Some basic steps are provided below.
-They also have very useful [tutorials][rr_tutorials] on how to use RoadRunner, check them out!
+The process to import a map into CARLA is now out-of-the-box. A Docker image of Unreal Engine is used so that the user does not have neither to compile anything nor manually set the assets to fit into CARLA.
+
+!!! Note
+ This tutorial creates a new map from scratch. Check these other tutorials to [customize a town](tuto_A_map_customization.md) or [import other assets](tuto_A_import_assets.md) to CARLA.
+
+---
+## Map creation with RoadRunner
+
+RoadRunner is an accessible and powerful software from Vector Zero to create 3D scenes. There is a trial version available at their [site](https://www.vectorzero.io/), and an [installation guide][rr_docs].
[rr_docs]: https://tracetransit.atlassian.net/wiki/spaces/VS/pages/740622413/Getting+Started
-[rr_tutorials]: https://www.youtube.com/channel/UCAIXf4TT8zFbzcFdozuFEDg/playlists
+The process is quite straightforward, but there are some things to take into account.
-!!! important
- Create the map centered arround (0, 0).
-
-#### 2.1 Validate the map
-
-* Check that all connections and geometries seem correct.
+* Center the map in (0,0).
+* Create the map definition. Take a look at the [official tutorials](https://www.youtube.com/channel/UCAIXf4TT8zFbzcFdozuFEDg/playlists).
+* Check the map validation. Take a close look at all connections and geometries.
-* Visualize the OpenDRIVE road network by clicking on the `OpenDRIVE Preview Tool`
-button and export.
+Once the map is ready, click on the `OpenDRIVE Preview Tool` button to visualize the OpenDRIVE road network. Give one last check to everything. Once the map is exported, it cannot be modified.
!!! note
- The _OpenDrive Preview Tool_ button lets you test the integrity of the current map.
- If there is any error with map junctions, click on `Maneuver Tool`
- and `Rebuild Maneuver Roads` buttons.
+ _OpenDrive Preview Tool_ makes it easier to test the integrity of the map. If there is any error with junctions, click on `Maneuver Tool`, and `Rebuild Maneuver Roads`.
-#### 2.2 Export the map
+### Export the map
-After verifying that everything is correct, it is time to export the map to CARLA.
+__1. Export the scene using the CARLA option.__ `File/Export/CARLA(.fbx+.xml+.xodr)`
- 1. Export the scene using the CARLA option in the main menu:
- `File > Export > CARLA (.fbx + .xml + .xodr)`.
+__2. Leave `Export individual Tiles` unchecked.__ This will generate only one _.fbx_ with all the pieces. It makes easier to keep track of the map.
- 2. Leave `Export individual Tiles` _unchecked_, this will generate only one fbx
- file with all the pieces making it easier to keep track of the map.
+__3. Click `Export`.__
- 
-
-
-
- 3. Click `Export`.
-
-This will generate a `mapname.fbx` and `mapname.xodr` files within others.
-
-_For a more in-depth guide on how to use the exportation option,_
-_check VectorZeros's [documentation][exportlink]._
+This will generate a `mapname.fbx` and `mapname.xodr` files within others. There is more detailed information about how to export to CARLA in [VectorZero's documentation][exportlink].
[exportlink]: https://tracetransit.atlassian.net/wiki/spaces/VS/pages/752779356/Exporting+to+CARLA
+!!! Warning
+ Make sure that the .xodr and the .fbx files have the same name.
+
---
-## 3 Importing into Unreal
+## Import a map into CARLA
-This section is divided into two. The first part shows how to import a map from RoadRunner
-and the second part shows how to import a map from other software that generates `.fbx` and `.xodr` files.
+This process will cook the map automatically from start to finish. Using only the .fbx and .xodr, the output will provide a fully usable CARLA map with traffic behaviour, and pedestrian navigation already implemented.
-!!! important
- The `.xodr` OpenDRIVE file should have the same name as the binary file `.fbx`
- i.e. `mapname.fbx` `mapname.xodr`.
+__1. Build a Docker image of Unreal Engine.__ Follow [these instructions](https://github.com/carla-simulator/carla/tree/master/Util/Docker). The process takes quite a lot of time and disk space. Around 4h and 400GB to build the Docker image. However, this is only needed the first time. Then, the process of importing a new map is out-of-the-box.
-We have also created a new way to import assets into Unreal,
-check this [`guide`](tuto_A_import_assets.md)!
+__2. Run the script to cook the map.__ In the folder `~/carla/Util/Docker` there is a script that connects with the Docker image previously created, and cooks the map automatically. It only needs the path for the input and output files.
+```sh
+python docker_tools.py --input ~/path_to_input_assets --output ~/path_for_output_assets
+```
-#### 3.1 Importing from RoadRunner
+__3. Move the output files__ to `Content/Carla/Maps` in case they are not already there.
-##### 3.1.1 Plugin Installation
+---
+## Final tips
-RoadRunner provides a series of plugins that make the importing simpler.
+* __Add and test traffic light timing.__ This are not set automatically, and will need trial and error to fit perfectly with the city.
-1. Locate the plugins under RoadRunner's installation folder:
- `/usr/bin/VectorZero/Tools/Unreal/Plugins`.
+
-2. Copy those folders to the CarlaUE4 plugins directory: `/carla/Unreal/CarlaUE4/Plugins/`.
+> _Example: Traffic Signs, Traffic lights and Turn based stop._
-3. Rebuild the plugin.
-###### Rebuild on Windows
+* __Place vehicle spawn points__ 2 to 3 meters above a Route Planner's trigger box, and oriented in the same direction. When the vehicle falls into the trigger box, the autopilot takes control of it.
-1. Generate project files.
+ 
- * Right-click the `.uproject` file and `Generate Visual Studio project files`.
+* __Show individual route planners.__ `Generate Routes` in Open Drive Actor generates the road network but it does not show these. In order to do so, do the following.
-2. Open the project and build the plugins.
+ 1. Select all `RoutePlanner` actors.
+ 2. Move them.
+ 3. Press `ctr + z`. They will show up on the map.
+ 
-###### Rebuild on Linux
+* __Modify OpenDRIVE routes.__ This can be done manually.
+ 
+
+* __Add the map to the Unreal packaging system.__ Go to the following path and add the level.
+`Edit > Project Settings > Project > Packaging > Show Advanced > List of maps to include...`
+
+ 
+
+* __Use CARLA materials__ contained in `Content/Carla/Static/GenericMaterials`.
+ * Go to the material. `Right-click on the Asset > Browse to Asset`.
+ * Set the actors. `Right-click on Material > Asset Actions > Select Actors Using This Asset`
+
+
+---
+## Previous ways to import a map
+
+There are other ways to import a map used in previous CARLA releases. These required to manually cook the map and prepare everything, so they became deprecated when the Docker method was developed. However, they are explained below in case they are needed.
+
+* __A) RoadRunner plugin import.__ This software provides specific plugins for CARLA. Get those and follow some simple steps to get the map.
+* __B) Manual import.__ This process requires to go through all the process manually. From importing _.fbx_ and _.xodr_ to setting the static meshes.
+
+
+
+ Deprecated tutorials to import a map
+
+
+!!! Warning
+ These importing tutorials are deprecated. The best way to import a map into CARLA is to use the Docker as explained above.
+
+## A- RoadRunner plugin import
+
+### Plugin installation
+
+These plugins will set everything ready to be used in CARLA. It makes the import process more simple.
+
+__1. Locate the plugins__ in RoadRunner's installation folder
+`/usr/bin/VectorZero/Tools/Unreal/Plugins`.
+
+__2. Copy those folders__ to the CarlaUE4 plugins directory `/carla/Unreal/CarlaUE4/Plugins/`.
+
+__3. Rebuild the plugin__ following the instructions below.
+
+* __a) Rebuild on Windows.__
+ * Right-click the `.uproject` file and `Generate Visual Studio project files`.
+ * Open the project and build the plugins.
+
+* __b) Rebuild on Linux.__
+ * Run the following command.
```sh
> UE4_ROOT/GenerateProjectFiles.sh -project="carla/Unreal/CarlaUE4/CarlaUE4.uproject" -game -engine
```
-Finally, restart Unreal Engine and make sure the checkbox is on for both plugins `Edit > Plugins`.
+__4. Restart Unreal Engine.__ Make sure the checkbox is on for both plugins `Edit > Plugins`.
-##### 3.1.2 Importing
+### Import map
- 1. Import the _mapname.fbx_ file to a new folder under `/Content/Carla/Maps`
- with the `Import` button.
+__1. Import the _mapname.fbx_ file__ to a new folder under `/Content/Carla/Maps` with the `Import` button.
- 
+
-
+__2. Set `Scene > Hierarchy Type`__ to _Create One Blueprint Asset_ (selected by default).
+__3. Set `Static Meshes > Normal Import Method`__ to _Import Normals_.
- 2. Set `Scene > Hierarchy Type` to _Create One Blueprint Asset_ (selected by default).
- 3. Set `Static Meshes > Normal Import Method` to _Import Normals_.
+
- 
-
-
-
- 4. Click `Import`.
-
- 5. Save the current level `File > Save Current As...` > _mapname_.
+__4. Click `Import`.__
+__5. Save the current level__ `File > Save Current As...` > _mapname_.
The new map should now appear next to the others in the Unreal Engine _Content Browser_.
-And that's it! The map is ready!
+---
+## B- Manual import from files
-#### 3.2 Importing from the files
+This is the generic way to import maps into Unreal Engine using any _.fbx_ and _.xodr_ files. As there is no plugin to ease the process, there are many settings to be done before the map is available in CARLA.
-This is the generic way to import maps into Unreal.
-
-1. Create a new level with the **Map** name in Unreal `Add New > Level` under `Content/Carla/Maps`.
-2. Copy the Illumination folder and its content from the BaseMap `Content/Carla/Maps/BaseMap`
-and paste it in the new level, otherwise, the map will be in the dark.
+__1. Create a new level__ with the **Map** name in Unreal `Add New > Level` under `Content/Carla/Maps`.
+__2. Copy the illumination folder and its content__ from the BaseMap `Content/Carla/Maps/BaseMap`, and paste it in the new level. Otherwise, the map will be in the dark.
-##### 3.2.1 Binaries (.fbx)
+### Import binaries
-1. Import the _mapname.fbx_ file to a new folder under `/Content/Carla/Maps`
- with the `Import` button. Make sure the following options are unchecked:
+__1. Import the _mapname.fbx_ file__ to a new folder under `/Content/Carla/Maps` with the `Import` button. __Make sure the following options are unchecked.__
- * Auto Generate Collision
- * Combine Meshes
- * Force Front xAxis
- * Normal Import Method - _Import Normals_
+* Auto Generate Collision
+* Combine Meshes
+* Force Front xAxis
+* Normal Import Method - _To import normals_
-
+__2. Check the following options.__
-2. Check the following options:
+* Convert Scene Unit
+* _To import materials and textures._
+ * Material Import Method - _To create new materials_
+ * Import Textures
- * Convert Scene Unit
- * _If you want to import materials and textures:_
- * Material Import Method - _Create new materials_
- * Import Textures
+
- 
+__3. Check that the static meshes have appeared__ in the chosen folder.
-
+__4. Drag the meshes__ into the level.
- Once everything is loaded up, you should end with several static Meshes in the folder
- you have selected.
+
-3. Drag them all into the level.
+__5. Center the meshes at point (0,0,0)__ when Unreal finishes loading.
- 
+
-
+__6. Generate collisions__. Otherwise, pedestrians and vehicles will fall into the abyss.
-4. When Unreal Engine finishes loading, center the meshes at point (0, 0, 0) and you will have
- your map in Unreal! Congratulations!
+* Select the meshes meant to have colliders.
+* Right-click `Asset Actions > Bulk Edit via Property Matrix...`.
- 
+ 
-
+* Search for _collision_ in Property's Matrix search box.
+* Change `Collision complexity` from `Project Default` to `Use Complex Collision As Simple`.
-5. Generate collisions, so pedestrians and vehicles don't fall into the abyss.
+ 
- * Select the meshes that will have collision.
- * Right-click `Asset Actions > Bulk Edit via Property Matrix...`.
+* Go to `File > Save All`.
- 
+__7. Move the static meshes__ from `Content/Carla/Maps/mapfolder` to the corresponding `Carla/Static` subsequent folder. This will be meaningful for the semantic segmentation ground truth.
- * Search for _collision_ in Property's Matrix search box.
- * Change `Collision complexity` from `Project Default` to `Use Complex Collision As Simple`.
-
- 
-
- * Go to `File > Save All`.
-
-6. Lastly, for the **semantic segmentation ground truth**, move the static meshes imported
- under `Content/Carla/Maps/mapfolder` to `Carla/Static` subsequent folders:
-
- * `Terrain/mapname`
- * `Road/mapname`
- * `RoadLines/mapname`
+ * `Terrain/mapname`
+ * `Road/mapname`
+ * `RoadLines/mapname`
```sh
Content
@@ -234,149 +246,87 @@ Content
│ └── mapname
│ └── Static Meshes
│
- └── RoadLines
+ ├── RoadLines
+ | └── mapname
+ | └── Static Meshes
+ └── Sidewalks
└── mapname
└── Static Meshes
```
-##### 3.2.2 OpenDRIVE (.xodr)
+### Import OpenDRIVE files
-1. Copy the `.xodr` file inside the `Content/Carla/Maps/OpenDrive` folder.
-2. Open the Unreal level and drag the _Open Drive Actor_ inside the level.
-It will read the level's name, search the Opendrive file with the same name and load it.
+__1. Copy the `.xodr` file__ inside the `Content/Carla/Maps/OpenDrive` folder.
+__2. Open the Unreal level.__ Drag the _Open Drive Actor_ inside the level. It will read the level's name. Search the Opendrive file with the same name and load it.
-And that's it! Now the road network information is loaded into the map.
-
---
-## 4. Setting up traffic behavior
+## Set traffic behavior
-Once everything is loaded into the level, it is time to create traffic behavior.
+Once everything is loaded into the level, it is time to create traffic behavior.
-1. Click on the _Open Drive Actor_.
-2. Check the following boxes in the same order:
- * Add Spawners
- * (Optional) On Intersections (For more spawn points)
- * Generate Routes
+__1. Click on the _Open Drive Actor_.__
+__2. Check the following boxes in the same order.__
-This will generate a bunch of _RoutePlanner_ and _VehicleSpawnPoint_ actors that make
-it possible for vehicles to spawn and go in autopilot mode.
+* Add Spawners.
+* _(Optional for more spawn points)_ On Intersections.
+* Generate Routes.
-#### 4.1 Traffic lights and signs
+This will generate a series of _RoutePlanner_ and _VehicleSpawnPoint_ actors. These are used for vehicle spawning and navigation.
-To regulate the traffic, traffic lights and signs must be placed all over the map.
+### Traffic lights and signs
-1. Drag _traffic light / sign actors_ into the level and place them.
+Traffic lights and signs must be placed all over the map.
-2. Adjust the _[`trigger box`][triggerlink]_ of each traffic light / sign
- until it covers the road it affects.
+__1. Drag traffic light/sign actors__ into the level and place them.
+__2. Adjust the [`trigger volume`][triggerlink]__ for each of them. This will determine their area of influence.
[triggerlink]: python_api.md#carla.TrafficSign.trigger_volume
- 
+
-
+__3. In junctions, drag a traffic light group actor__ into the level. Assign to it all the traffic lights involved and configure their timing. Make sure to understand [how do traffic lights work](http://127.0.0.1:8000/core_actors/#traffic-signs-and-traffic-lights).
-3. For traffic lights in junctions, drag a _traffic light group actor_ into the level and assign
- all traffic lights involved.
+
- 
-
-These last steps may require some trial and error. _Traffic light timing_ and _traffic trigger boxes_
-might need some tweaking and testing to fit perfectly into the city.
+__4. Test traffic light timing and traffic trigger volumes.__ This may need trial and error to fit perfectly.
> _Example: Traffic Signs, Traffic lights and Turn based stop._
---
-## 5 Adding pedestrian navigation areas
+## Add pedestrian navigation
-To make a navigable mesh for pedestrians, we use the _Recast & Detour_ library.
-.
+In order to prepare the map for pedestrian navigation, there are some settings to be done before exporting it.
-1. Clone or download _Recast & Detour_.
+__1.__ Select the __Skybox object__ and add a tag `NoExport` to it. Otherwise, the map will not be exported, as the size would be too big.
-2. Before building RecastDemo you need to change `m_scale` variable from `1.0f` to `0.01f` in the
- _MeshLoaderObj contructor_ in `RecastDemo/Source/MeshLoaderObj.cpp`.
+
-```cpp
-rcMeshLoaderObj::rcMeshLoaderObj() :
- m_scale(0.01f),
- m_verts(0),
- m_tris(0),
- m_normals(0),
- m_vertCount(0),
- m_triCount(0)
-{
-}
-```
-Then build RecastDemo. Follow their [instructions][buildrecastlink] on how to build it.
+__2.__ Check the name of the meshes. By default, pedestrians will be able to walk over sidewalks, crosswalks, and grass (with minor influence over the rest).
-[buildrecastlink]: https://github.com/recastnavigation/recastnavigation#building-recastdemo
+
-**Back to Unreal Engine**
+__3.__ Crosswalks have to be manually created. For each of them, create a plane mesh that extends a bit over both sidewalks connected. __Place it overlapping the ground, and disable its physics and rendering__.
-1. Select the meshes you want the pedestrians to be able to spawn and walk on.
+
- 
+__4.__ Name these planes following the common format `Road_Crosswalk_mapname`.
-
+__5.__ Press `G` to deselect everything, and export the map. `File > Export CARLA...`.
+__6.__ Run RecastDemo `./RecastDemo`.
-2. Export and save them as a `mapname.obj` file. `File > Export Selected...`.
-3. Run RecastDemo `./RecastDemo`.
- * Select `Solo Mesh` from the `Sample` parameter's box.
- * Select the _mapname.obj_ file from the `Input Mesh` parameter's box.
+ * Select `Solo Mesh` from the `Sample` parameter's box.
+ * Select the _mapname.obj_ file from the `Input Mesh` parameter's box.
+
- 
+__7.__ Click on the `Build` button.
+__8.__ Once the build has finished, click on the `Save` button.
+__9.__ Change the **filename** of the binary file generated at `RecastDemo/Bin` to `mapname.bin`.
+__10.__ Drag the _mapname.bin_ file into the `Nav` folder under `Content/Carla/Maps`.
-
-
-4. First click on the `Build` button, then once the built has finished, click on the `Save` button.
-5. Change the **filename** of the binary file generated at `RecastDemo/Bin` to `mapname.bin`.
-6. Drag the _mapname.bin_ file into the `Nav` folder under `Content/Carla/Maps`.
-
-Now pedestrians will be able to spawn randomly and walk on the selected meshes!
-
----
-## Tips and Tricks
-
-* Traffic light group controls wich traffic light is active (green state) at each moment.
- You can configure the timing that the lights stay in green `GreenTime`, the time it stays yellow
- `YellowTime`, and the time it takes between one traffic light goes red and the next one
- goes green `ChangeTime`.
-
-
+
-
-* You can add a vehicle spawn point. This should be placed 2 to 3 meters above a Route Planner's
- trigger box and oriented as the route shows. When the vehicle falls, it will hit the trigger box
- and the autopilot will take control of the vehicle.
-
- 
-
-* When you check `Generate Routes` in Open Drive Actor, it generates the road network but it won't
- show individual planners. In order to show those points, please do the following:
-
- 1. Select all `RoutePlanner` actors.
- 2. Move them.
- 3. Press `ctr + z` and they will show up on the map.
- 
-
-* OpenDRIVE routes can be manually modified.
-
- 
-
-* In order to add the map to the Unreal packaging system, go to:
- `Edit > Project Settings > Project > Packaging > Show Advanced > List of maps to include...`
- Then add the level to the array.
-
- 
-
-* To change default materials and use the ones that come with CARLA at:
-`Content/Carla/Static/GenericMaterials`.
- * Unreal shortcuts to find materials and assets:
- * `Right-click on the Asset > Browse to Asset`
- * `Right-click on the Material > Asset Actions > Select Actors Using This Asset`
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 164571c4c..b71166154 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -45,7 +45,7 @@ nav:
- 'Control walker skeletons': "tuto_G_control_walker_skeletons.md"
- Tutorials (assets):
- 'Import new assets': 'tuto_A_import_assets.md'
- - 'Map creation': 'tuto_A_map_creation.md'
+ - 'Create and import a map': 'tuto_A_map_creation.md'
- 'Map customization': 'tuto_A_map_customization.md'
- 'Standalone asset packages': 'tuto_A_standalone_packages.md'
- "Use Epic's Automotive materials": 'tuto_A_epic_automotive_materials.md'
