X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/9cc138481bcf668c773d4f92f145393838af5f21..0e94c83db11d8e8f1bd52177374caa7950e42238:/help/C/viking.xml

diff --git a/help/C/viking.xml b/help/C/viking.xml
index e5fe0450..73ad9755 100644
--- a/help/C/viking.xml
+++ b/help/C/viking.xml
@@ -574,6 +574,21 @@ You need to select the type of the file that is going to be returned, since ther
 </note>
 </section>
 
+<section>
+<title>Import GeoJSON File</title>
+<para>
+<menuchoice><guimenu>File</guimenu><guimenuitem>Acquire</guimenuitem><guimenuitem>Import GeoJSON File</guimenuitem></menuchoice>
+</para>
+<para>
+This uses the program <ulink url="https://github.com/tyrasd/togpx">togpx</ulink> to load .geojson files.
+If the program is not detected on your system, then this option will not be available.
+See <ulink url="https://www.npmjs.org/package/togpx">here</ulink> for the installation method.
+</para>
+<para>
+The current version (1.4.4) of GPSBabel does not support the <ulink url="http://geojson.org/">GeoJSON</ulink> file format.
+</para>
+</section>
+
 </section> <!-- End Acquire -->
 
 <section><title>Print</title>
@@ -755,8 +770,30 @@ You are probably better off expanding the waypoint list and directly start typin
 
 <section><title>Export Layer</title>
 <para>
-The layer (all tracks, routes and waypoints) can be exported to a file GPX, GPSPoint, GPSMapper, Google's KML format or any other format supported by GPSbabel.
+The layer (all tracks, routes and waypoints) can be exported to following file formats:
 </para>
+<orderedlist>
+	<listitem>
+		<para>GPX</para>
+	</listitem>
+	<listitem>
+		<para>GPSPoint</para>
+	</listitem>
+	<listitem>
+		<para>GPSMapper</para>
+	</listitem>
+	<listitem>
+		<para>Google's KML</para>
+	</listitem>
+	<listitem>
+		<para>Any GPSBabel <ulink url="http://www.gpsbabel.org/capabilities.html">File Formats</ulink></para>
+	</listitem>
+	<listitem>
+		<para>GeoJSON. Via the program <ulink url="https://github.com/mapbox/togeojson">togeojson</ulink></para>
+		<para>This option will not be available if the program is not detected on your system.
+		See <ulink url="https://www.npmjs.org/package/togeojson">here</ulink> for the installation method.</para>
+	</listitem>
+</orderedlist>
 <para>
 Version1.1+: An individual track can be exported to a GPX file via the track menu.
 </para>
@@ -1480,17 +1517,15 @@ You will need an open internet connection when you are downloading maps, but onc
 Some maps are continually improving over time (e.g. OpenStreetMap) and so in order to not to have to (re)download the data all the time &appname; employs a timeout method - <emphasis>Tile Age</emphasis> to determine whether to access the server. However a forced refresh for the current view can be made via the <guilabel>Reload All Onscreen Maps</guilabel> option.
 </para>
 <para>
-Inbuilt maps include various <ulink url="http://en.wikipedia.org/wiki/TerraServer-USA">Terraserver</ulink> (Primarily USA coverage) and <ulink url="http://openstreetmap.org/">OpenStreetMap (OSM)</ulink> ones and more:
+Inbuilt maps include various <ulink url="http://openstreetmap.org/">OpenStreetMap (OSM)</ulink> ones and more:
 </para>
 <itemizedlist>
 <listitem><para>Bing Bird's Eye (Aerial) Maps (&appname; Version1.2+)</para></listitem>
-<listitem><para>Terraserver Topos</para></listitem>
-<listitem><para>Terraserver Aerials</para></listitem>
-<listitem><para>Terraserver Urban Areas</para></listitem>
 <listitem><para>OpenStreetMap (Mapquest) - This is the default (&appname; Version1.3+)</para></listitem>
 <listitem><para>OpenStreetMap (Mapnik)</para></listitem>
 <listitem><para>OpenStreetMap (Cycle)</para></listitem>
 <listitem><para>OpenStreetMap (Transport) (&appname; Version1.3+)</para></listitem>
+<listitem><para>OpenStreetMap (Humanitarian) (&appname; Version1.5+)</para></listitem>
 <listitem><para>NASA BlueMarble</para></listitem>
 </itemizedlist>