Merge pull request #6044 from APriestman/6491_geo

6491 geolocation doc

docs/doxygen-user/geolocation.dox

@@ -8,15 +8,17 @@ The Geolocation window shows artifacts that have longitude and latitude attribut
 
 \section geo_usage Usage
 
-To open the Geolocation window, go to "Tools" and then select "Geolocation".
+To open the Geolocation window, click on the "Geolocation" button near the top of the main window, or go to "Tools" and then select "Geolocation".
 
 \subsection geo_navigation General Usage
 
-You can move the map by clicking and dragging, and zoom using either the mouse wheel or the slider in the bottom left of the map. If a map tile is not available the tile will appear grey but the waypoints will still be displayed. This is more likely to happen when changing the default \ref geo_map_options.
+You can move the map by clicking and dragging, and zoom using either the mouse wheel or the slider in the bottom left of the map. If a map tile is not available, the tile will appear grey but the waypoints will still be displayed. This is more likely to happen when changing the default \ref geo_map_options. Different types of waypoint will be displayed in different colors. You can use the key in the lower left to easily identify the type of each waypoint. Some types will also use different icons on the map. For example, individual track points will be displayed as smaller circles. The entire track will be highlighted when selecting an individual track point. 
 
-You can left click on a waypoint to highlight that waypoint and show a details pop-up in the upper right corner of the map. The details pop-up will be updated as you click on different waypoints. The data displayed will vary depending on the type of waypoint. For example, this is the endpoint of a GPS Route:
+\image html geo_track_points.png
 
-\image html geo_details_route.png
+You can left click on a waypoint to highlight that waypoint and show a details pop-up in the upper right corner of the map. The details pop-up will be updated as you click on different waypoints. The data displayed will vary depending on the type of waypoint. For example, this is a GPS bookmark:
+
+\image html geo_details_bookmark.png
 
 While this is an image with GPS coordinates found by the \ref EXIF_parser_page :
 
@@ -28,7 +30,7 @@ You can also right click on a waypoint to bring up a similar menu to what you'd
 
 \subsection geo_filter Filtering
 
-The filters are displayed on the left side of the screen. The top filter lets you filter the waypoints based on timestamp. If enabled, you will only see waypoints with a timestamp within N days of the most recent waypoint (not the current date). When using this filter you can also choose whether you want to see waypoints with no timestamp.
+The filters are displayed on the left side of the screen. The top filter lets you filter the waypoints based on timestamp. If enabled, you will only see waypoints with a timestamp within N days of the most recent waypoint (not the current date). When using this filter, you can also choose whether you want to see waypoints with no timestamp.
 
 \image html geo_filter_time.png
 
@@ -63,7 +65,7 @@ on the Geolocation panel in the Options dialog. There are four options for geolo
 </ul>
 <li><b>OpenStreetMap server</b>
 <ul>
-<li>You can specify the address of a OSM tile server. A list of online tile servers can be found here: https://wiki.openstreetmap.org/wiki/Tile_servers. 
+<li>You can specify the address of an OSM tile server. A list of online tile servers can be found here: https://wiki.openstreetmap.org/wiki/Tile_servers. 
 Tile servers may have restrictions on them that prevent Autopsy from accessing their tiles. If the tiles URL is something of the form "http://tiles.example.org/${z}/${x}/${y}.png", 
 then you'll need to enter "http://tiles.example.org" in the options panel.
 
@@ -71,7 +73,7 @@ then you'll need to enter "http://tiles.example.org" in the options panel.
 </ul>
 <li><b>OpenStreetMap zip file</b>
 <ul>
-<li>Allows offline use of zip file of OSM tile images
+<li>Allows offline use of a zip file of OSM tile images
 <li>Details on how to generate tile zip files are \ref geo_generate_zip "below".
 </ul>
 <li><b>MBTiles file</b>
@@ -86,7 +88,7 @@ not the "Vector Tiles".
 
 \subsection geo_generate_zip Using Maperative to Generate Tile Image Zip Files
 
-Maperative is a tool for drawing maps, however it can also be used to create tile images. Maperative download and documentations can be found at http://maperitive.net/ .
+Maperative is a tool for drawing maps, however it can also be used to create tile images. Maperative downloads and documentations can be found at http://maperitive.net/ .
 
 By default Maperative uses an online tile server to generate the map.  For offline use, users can supply an OpenStreetMap raw data extract. 
 
@@ -94,8 +96,8 @@ By default Maperative uses an online tile server to generate the map.  For offli
 \subsubsection geo_generate_tile_image Generating tile image zip files using any map data source:
 <ol>
 <li>Download and run Maperative.
-<li>Center and zoom in on area of interest.  The larger the area, the more tiles that will be generated.  Tiles will be generated for the area visible in the map panel.
-<li>Choose whether you want to use the default zoom levels or custom ones. Zoom levels in Mapertive start at 1.  As the zoom level increases so will the quantity of tiles generated as well as the detail of each tile. Generating tiles, especially for heavily populated areas, may take time, please be patient with either method.
+<li>Center and zoom in on an area of interest.  The larger the area, the more tiles that will be generated.  Tiles will be generated for the area visible in the map panel.
+<li>Choose whether you want to use the default zoom levels or custom ones. Zoom levels in Mapertive start at 1.  As the zoom level increases, so will the quantity of tiles generated as well as the detail of each tile. Generating tiles, especially for heavily populated areas, may take time. Please be patient with either method.
 <ul>
 <li>To generate tiles using the default zoom levels, select Tools->Generate Tiles
 
@@ -103,13 +105,13 @@ By default Maperative uses an online tile server to generate the map.  For offli
 
 Maperative will generate tiles for zoom levels depending on the area of interest and the zoom level. For example, if you start all the way zoomed out, you will likely see levels 1 through 10 generated. If you start zoomed in, you might see levels 10 through 14.
 
-<li>Maperative provides a command interface which allows you to generate tiles for specific zoom levels. Commands can be run in the Command prompt text field at the bottom of the Maperative window. For a full list of commands see the Maperative documentation or <a href="http://maperitive.net/docs/">http://maperitive.net/docs/</a>. The <tt>generate-tiles</tt> command can be used to generate tiles for the area visible in the map panel area.  For full details on generate-tiles see the documentation included with Maperative or <a href="http://maperitive.net/docs/Commands/GenerateTiles.html">http://maperitive.net/docs/Commands/GenerateTiles.html</a>. The following is a sample command to generate tiles for zoom level 2 to 3 into the folder Tiles: 
+<li>Maperative provides a command interface which allows you to generate tiles for specific zoom levels. Commands can be run in the Command prompt text field at the bottom of the Maperative window. For a full list of commands see the Maperative documentation or <a href="http://maperitive.net/docs/">http://maperitive.net/docs/</a>. The <tt>generate-tiles</tt> command can be used to generate tiles for the area visible in the map panel area.  For full details on <tt>generate-tiles</tt> see the documentation included with Maperative or <a href="http://maperitive.net/docs/Commands/GenerateTiles.html">http://maperitive.net/docs/Commands/GenerateTiles.html</a>. The following is a sample command to generate tiles for zoom levels 2 to 3 into the folder Tiles: 
 \verbatim generate-tiles minzoom=2 maxzoom=3 tilesdir=C:\Tiles \endverbatim
 
 \image html geo_command_line.png
 
 </ul>
-<li>For use in autopsy, the generated tile images need to be in a zip file. To create a zip of tiles for use in Autopsy, zip up all of the folders in the tile file output directory.  Do not include the parent directory, just the numbered folders contained within. If you use the menu bar option or did not specify a folder in your command the generated tiles will be located in &lt;Maperative Install Location&gt;\\Tiles.
+<li>For use in autopsy, the generated tile images need to be in a zip file. To create a zip of tiles for use in Autopsy, zip up all of the folders in the tile file output directory.  Do not include the parent directory, just the numbered folders contained within. If you use the menu bar option or did not specify a folder in your command, the generated tiles will be located in &lt;Maperative Install Location&gt;\\Tiles.
 
 \image html geo_tile_folder.png
 
@@ -135,7 +137,7 @@ To add a data source to Maperative:
 
 For ease of use, users may want to merge OSM raw data extracts. OSMConvert is a tool that can be used to merge OSM raw data extracts.  
 
-To merge two OSM raw data extracts country1.osm.pbf and country2.osm.pbf use the following commands.  Note that this assumes that osmcovert and the files are in the same directory; if they are not be sure to use full paths.
+To merge two OSM raw data extracts country1.osm.pbf and country2.osm.pbf use the following commands.  Note that this assumes that osmcovert and the files are in the same directory; if they are not, be sure to use full paths.
 \verbatim
 osmconvert country1.osm.pbf -o=country1.o5m
 osmconvert country2.osm.pbf -o=country2.o5m