[QA] Explain some more map configuration options.

diff --git a/help/C/viking.xml b/help/C/viking.xml
index f3391efcf001325b0a6ce5a0915c782768a07858..b918ea94d67e689d8ba39112e4c912b67de99e64 100644 (file)
--- a/help/C/viking.xml
+++ b/help/C/viking.xml
@@ -2839,47 +2839,62 @@ Accept: */*
             </varlistentry>
             <varlistentry>
               <term>switch-xy (optional)</term>
             </varlistentry>
             <varlistentry>
               <term>switch-xy (optional)</term>

-              <listitem><para>Swap the X,Y values around in the URL parametrized ordering.</para></listitem>
+              <listitem>
+                <para>Swap the X,Y values around in the URL parametrized ordering.</para>
+                <para>The default is false.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>
+              <listitem>
+                <para>Sends the timestamp of the tile to the server, so the server can decide whether it should send a new tile or not.</para>
+                <para>The default is false.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>use-etag (optional)</term>
+              <listitem>
+                <para>Use and compare the <ulink url="http://en.wikipedia.org/wiki/HTTP_ETag">ETag</ulink> value in determining whether to download a newer tile. The default is false.</para>
+                <para>The ETag value is stored in a separate file in the same directory as the tile to enable checking the value across multiple runs of the program.</para>
+              </listitem>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>

-        <para>The <classname>VikTmsMapSource</classname> allows to declare any TMS service. It supports the following properties:
+        <para>The <classname>VikTmsMapSource</classname> allows to declare any TMS service. It supports the following properties (as per VikSlippyMapSource above):

           <variablelist>
             <varlistentry>
               <term>id</term>
           <variablelist>
             <varlistentry>
               <term>id</term>

-              <listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>label</term>
             </varlistentry>
             <varlistentry>
               <term>label</term>

-              <listitem><para>the text displayed in the map's source selection dialog</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>hostname</term>
             </varlistentry>
             <varlistentry>
               <term>hostname</term>

-              <listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>url</term>
             </varlistentry>
             <varlistentry>
               <term>url</term>

-              <listitem><para>the parametrized address of the tile, in the spirit of C printf format, with 3 "%d" fields for X, Y and Z (zoom level) (eg. "/%d/%d/%d.png")</para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>

-        <para>The <classname>VikWmscMapSource</classname> allows to declare any WMS or WMS-C service. It supports the following properties:
+        <para>The <classname>VikWmscMapSource</classname> allows to declare any WMS or WMS-C service. It supports the following properties  (as per VikSlippyMapSource above):

           <variablelist>
             <varlistentry>
               <term>id</term>
           <variablelist>
             <varlistentry>
               <term>id</term>

-              <listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>label</term>
             </varlistentry>
             <varlistentry>
               <term>label</term>

-              <listitem><para>the text displayed in the map's source selection dialog</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>hostname</term>
             </varlistentry>
             <varlistentry>
               <term>hostname</term>

-              <listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>url</term>
             </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 bounding box coordinates (eg. "/coord=%s,%s,%s,%s")</para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>

diff --git a/help/viking.xml b/help/viking.xml
index bb4a947ed0c846eaf294a1d6cbb05b451cc418bf..ecd7e81705f85ce3c8f72a2374fae53384e340c9 100644 (file)
--- a/help/viking.xml
+++ b/help/viking.xml
@@ -235,47 +235,62 @@ and docbook-xsl in your Build-Depends control field.
             </varlistentry>
             <varlistentry>
               <term>switch-xy (optional)</term>
             </varlistentry>
             <varlistentry>
               <term>switch-xy (optional)</term>

-              <listitem><para>Swap the X,Y values around in the URL parametrized ordering.</para></listitem>
+              <listitem>
+                <para>Swap the X,Y values around in the URL parametrized ordering.</para>
+                <para>The default is false.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>
+              <listitem>
+                <para>Sends the timestamp of the tile to the server, so the server can decide whether it should send a new tile or not.</para>
+                <para>The default is false.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>use-etag (optional)</term>
+              <listitem>
+                <para>Use and compare the <ulink url="http://en.wikipedia.org/wiki/HTTP_ETag">ETag</ulink> value in determining whether to download a newer tile. The default is false.</para>
+                <para>The ETag value is stored in a separate file in the same directory as the tile to enable checking the value across multiple runs of the program.</para>
+              </listitem>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>

-        <para>The VikTmsMapSource allows to declare any TMS service. It supports the following properties:
+        <para>The VikTmsMapSource allows to declare any TMS service. It supports the following properties (as per VikSlippyMapSource above):

           <variablelist>
             <varlistentry>
               <term>id</term>
           <variablelist>
             <varlistentry>
               <term>id</term>

-              <listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>label</term>
             </varlistentry>
             <varlistentry>
               <term>label</term>

-              <listitem><para>the text displayed in the map's source selection dialog</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>hostname</term>
             </varlistentry>
             <varlistentry>
               <term>hostname</term>

-              <listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>url</term>
             </varlistentry>
             <varlistentry>
               <term>url</term>

-              <listitem><para>the parametrized address of the tile, in the spirit of C printf format, with 3 "%d" fields for X, Y and Z (zoom level) (eg. "/%d/%d/%d.png")</para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>

-        <para>The VikWmscMapSource allows to declare any WMS or WMS-C service. It supports the following properties:
+        <para>The VikWmscMapSource allows to declare any WMS or WMS-C service. It supports the following properties  (as per VikSlippyMapSource above):

           <variablelist>
             <varlistentry>
               <term>id</term>
           <variablelist>
             <varlistentry>
               <term>id</term>

-              <listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>label</term>
             </varlistentry>
             <varlistentry>
               <term>label</term>

-              <listitem><para>the text displayed in the map's source selection dialog</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>hostname</term>
             </varlistentry>
             <varlistentry>
               <term>hostname</term>

-              <listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>

             </varlistentry>
             <varlistentry>
               <term>url</term>
             </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 bounding box coordinates (eg. "/coord=%s,%s,%s,%s")</para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>check-file-server-time (optional)</term>

             </varlistentry>
           </variablelist>
         </para>
             </varlistentry>
           </variablelist>
         </para>