X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/9c237137b2ffa3b22215fb21243910bb89c18eec..a2d207d7200a11313bd98202a5be081bc92c70dc:/doc/viking.xml?ds=sidebyside

diff --git a/doc/viking.xml b/doc/viking.xml
index caa48569..0f7689e7 100644
--- a/doc/viking.xml
+++ b/doc/viking.xml
@@ -30,10 +30,10 @@ and docbook-xsl in your Build-Depends control field.
   <!ENTITY dhfirstname "<firstname>Ralf</firstname>">
   <!ENTITY dhsurname   "<surname>Meyer</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>2012-11-24</date>">
+  <!ENTITY dhdate      "<date>2013-04-08</date>">
   <!-- Would be nice if the version could auto-update. -->
   <!ENTITY dhsource      "Viking">
-  <!ENTITY dhversion     "1.3.2">
+  <!ENTITY dhversion     "1.4.1">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
@@ -64,7 +64,7 @@ and docbook-xsl in your Build-Depends control field.
       <holder>Guilhem Bonnefille</holder>
     </copyright>
     <copyright>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Rob Norris</holder>
     </copyright>
     &dhdate;
@@ -294,10 +294,6 @@ and docbook-xsl in your Build-Depends control field.
         <para>The VikWebtoolCenter allows to declare any Webtool using a logic based on center coordinates and zoom level value.</para>
         <para>The related properties are:
           <variablelist>
-            <varlistentry>
-              <term>id</term>
-              <listitem><para>this is an integer and should be unique as it used to identify the tool</para></listitem>
-            </varlistentry>
             <varlistentry>
               <term>label</term>
               <listitem><para>the text displayed in the menu entry</para></listitem>
@@ -312,16 +308,57 @@ and docbook-xsl in your Build-Depends control field.
         <para>The related properties are:
           <variablelist>
             <varlistentry>
-              <term>id</term>
-              <listitem><para>this is an integer and should be unique as it used to identify the tool</para></listitem>
+              <term>label</term>
+              <listitem><para>the text displayed in the menu entry</para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>url</term>
+              <listitem><para>the parametrized address of the tile, in the spirit of C printf format, with 4 "%s" fields for left, right, bottom and top (eg. "http://hostname:8111/load_and_zoom?left=%s&amp;right=%s&amp;bottom=%s&amp;top=%s")</para></listitem>
             </varlistentry>
+          </variablelist>
+        </para>
+      </formalpara>
+
+      <formalpara>
+        <title>Remote File Datasources</title>
+        <para>It is possible to add web references expected to return a file which can then be opened directly or converted via GPSBabel.</para>
+        <para>The file is <filename>~/.viking/datasources.xml</filename>.</para>
+        <para>An example of the file is in the source distribution <filename>doc/examples/datasources.xml</filename>.</para>
+        <para>The VikWebtoolDatasource allows to declare any URL using logic based on coordinates.</para>
+        <para>The related properties are:
+          <variablelist>
             <varlistentry>
               <term>label</term>
               <listitem><para>the text displayed in the menu entry</para></listitem>
             </varlistentry>
             <varlistentry>
               <term>url</term>
-              <listitem><para>the parametrized address of the tile, in the spirit of C printf format, with 4 "%s" fields for left, right, bottom and top (eg. "http://hostname:8111/load_and_zoom?left=%s&amp;right=%s&amp;bottom=%s&amp;top=%s")</para></listitem>
+              <listitem>
+                <para>the parametrized URL to open in the spirit of C printf format, with up to 7 "%s" values. e.g. <literal>http://hostname/getfile?lat=%s&amp;lon=%s</literal></para>
+                <para>The order and meaning of these parameters is given by the url_format_code below</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>url_format_code</term>
+              <listitem>
+                <para>A string describing the parametrized URL substitution parameters, each character represents how to translate each term.</para>
+                <para>B = Bottom of the current view i.e. minimum latitude</para>
+                <para>L = Left of the current view i.e. minimum longitude</para>
+                <para>T = Top of the current view i.e. maximum latitude</para>
+                <para>R = Right of the current view i.e. maximum longitude</para>
+                <para>A = center lAtitude of the current view</para>
+                <para>O = center lOngitude of the current view</para>
+                <para>Z = OSM Zoom value of the current view. See <ulink url="http://wiki.openstreetmap.org/wiki/Zoom_levels">Zoom Levels</ulink></para>
+                <para>Thus for the url example above then the format code should be <emphasis>AO</emphasis></para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>file_type</term>
+              <listitem>
+                <para>This value is passed on for the -i parameter in interfacing with GPSBabel.</para>
+                <para>If it is not defined then the returned file is interpreted internally as a GPX file.</para>
+                <para>Possible values such as 'kml', 'mapsource' etc.. can be used. See <ulink url="http://www.gpsbabel.org/capabilities.html">GPSBabel File Formats</ulink> for the full list.</para>
+              </listitem>
             </varlistentry>
           </variablelist>
         </para>
@@ -353,12 +390,33 @@ and docbook-xsl in your Build-Depends control field.
           <para>See previous section for details.</para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><filename>~/.viking/datasources.xml</filename></term>
+        <listitem>
+          <para>File containing definition of remote file datasources.</para>
+          <para>See previous section for details.</para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
         <term><filename>~/.viking/viking.prefs</filename></term>
         <listitem>
           <para>Preferences for &dhpackage;.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><filename>~/.viking/viking_layer_defaults.ini</filename></term>
+        <listitem>
+          <para>Layer default values for &dhpackage;.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><filename>~/.viking/viking.ini</filename></term>
+        <listitem>
+          <para>Values for &dhpackage; automatically saved between sessions.</para>
+          <para>Not generally intended to be manually edited.</para>
+	  <para>However some finer control of default internal values can be set.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><filename>~/.viking/cookies.txt</filename></term>
         <listitem>
@@ -375,6 +433,7 @@ and docbook-xsl in your Build-Depends control field.
 
 	<para>Extension files (<filename>maps.xml</filename>,
 	<filename>goto_tools.xml</filename>,
+	<filename>datasources.xml</filename>,
 	<filename>external_tools.xml</filename>)
 	are also searched in <filename>/etc/viking</filename> and
 	<filename>/usr/share/viking</filename> directories (or related in your system).</para>