summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/binfile.rst4
-rw-r--r--docs/configuration/advanced.rst6
-rw-r--r--docs/configuration/display.rst4
-rw-r--r--docs/configuration/general.rst2
-rw-r--r--docs/osm.rst2
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/binfile.rst b/docs/binfile.rst
index 16ffd3a4c..95fdae2e5 100644
--- a/docs/binfile.rst
+++ b/docs/binfile.rst
@@ -107,7 +107,7 @@ An object is placed inside of a tile using the following approach
* If the object can fit into one of the 4 top most tiles it is placed in that tile
* The 4 sub-tiles are then checked to see if the object will fit inside of any of the four tiles that are contained inside of the sub-tile. If so, it is moved down a tile. This step is repeated until the object spans 2 or more tiles (or the lowest tile level is reached)
-
+
* If the object can't fit inside of any of the 4 top sub-tiles it is placed inside of the top-most tile
An object 'fits' inside of a tile if the coordinates of the object (min lat, min lon, max lat, max lon) lie inside of the coordinates of the tile (tile_min_lat, tile_min_lon, tile_max_lat, tile_max_lon)
@@ -119,4 +119,4 @@ Some important objects are placed into upper level tiles despite of their length
BTW, "order" (zoom level) values used to query map and referred in <itemgra> and route_depth are equal to (tile_name_length-4).
.. __: https://github.com/navit-gps/navit/blob/trunk/navit/map/binfile/binfile.c
-.. __: https://github.com/navit-gps/navit/blob/trunk/navit/maptool/misc.c \ No newline at end of file
+.. __: https://github.com/navit-gps/navit/blob/trunk/navit/maptool/misc.c
diff --git a/docs/configuration/advanced.rst b/docs/configuration/advanced.rst
index 5f6555585..278632333 100644
--- a/docs/configuration/advanced.rst
+++ b/docs/configuration/advanced.rst
@@ -4,7 +4,7 @@ The rest of this webpage is meant for advanced/power users who'd like to fiddle
Speech
------
-Navit can announce driving directions with voice. Navit can use different mechanisms to play these announcements.
+Navit can announce driving directions with voice. Navit can use different mechanisms to play these announcements.
Note that not all tools are available on all platforms.
Prerecorded samples
@@ -13,9 +13,9 @@ Navit is able to compose phrases if you give it a set of prerecorded **samples**
.. code-block:: xml
- <speech type="cmdline" data="aplay -q %s"
+ <speech type="cmdline" data="aplay -q %s"
sample_dir="/path/to/sampledir" sample_suffix=".wav" flags="1"
- vocabulary_name="0" vocabulary_name_systematic="0" vocabulary_distances="0"/>
+ vocabulary_name="0" vocabulary_name_systematic="0" vocabulary_distances="0"/>
The directory ''sample_dir'' should contain audio files. ''sample_suffix'' is the common file type suffix of those files. The names of the files (without the suffix) must correspond to the text they contain. For each text it wants to speak, Navit will look for one or more sample files with corresponding names (ignoring upper/lower case). So for "turn right in 300 meters" you could use turn.wav, right.wav, in.wav, 300.wav, meters.wav. Navit will prefer files that contain multiple words: If file "turn right.wav" is present, it will be used even if you have turn.wav and right.wav.
diff --git a/docs/configuration/display.rst b/docs/configuration/display.rst
index 927caf838..b998f4318 100644
--- a/docs/configuration/display.rst
+++ b/docs/configuration/display.rst
@@ -16,8 +16,8 @@ The current list of available graphics drivers:
* **android**, for the Android port
* **cocoa**, for the iPhone port
* **gtk_drawing_area**, usually most appropriate on Linux desktop systems
-* **sdl**, render inside an X window, or direct to the Linux framebuffer, with min dependencies on external libraries.
-* **qt5**, render using Qt5 library, either using QWidgets or QML. On top of any Qt5 supported display technology.
+* **sdl**, render inside an X window, or direct to the Linux framebuffer, with min dependencies on external libraries.
+* **qt5**, render using Qt5 library, either using QWidgets or QML. On top of any Qt5 supported display technology.
* **win32** - useable with <tt>gtk</tt> or <tt>internal</tt> GUIs for Windows systems only.
Experimental/less maintained drivers:
diff --git a/docs/configuration/general.rst b/docs/configuration/general.rst
index 70d275d6b..ed43ed4a3 100644
--- a/docs/configuration/general.rst
+++ b/docs/configuration/general.rst
@@ -40,7 +40,7 @@ or to orient North:
Orienting the map North whilst in [[3D]] mode will provide visually confusing results, and is not recommended. When in 3D mode, it's best to have the map oriented in the direction of travel.
===Autozoom===
-Navit has the ability to **autozoom** the map in or out dependent upon your speed.
+Navit has the ability to **autozoom** the map in or out dependent upon your speed.
autozoom_active="1"
diff --git a/docs/osm.rst b/docs/osm.rst
index 2cdfc9c6c..12766d0d2 100644
--- a/docs/osm.rst
+++ b/docs/osm.rst
@@ -102,7 +102,7 @@ The OpenStreetMap wiki [http://wiki.openstreetmap.org/index.php/Planet.osm Plane
In case you want the whole planet.osm (24GB in December 2012), it is even possible to process planet.osm. It will take about 7 hours , requires > 1GB of main memory and about 30 GB disk space for result and temp files - planet.bin is currently (as of December 2012) 9.6GB:
.. code-block:: bash
-
+
bzcat planet.osm.bz2 | maptool -6 my_Navit_map.bin
Please note -6 option (long name --64bit) used above. It should be used always if output bin file grows above 4GB, or generated file will not work at all. Using that option on smaller files slightly increases their size and makes them unreadable by some unzip versions.