Completing missing instructions for GPX file uploads

handbook/gpxupload.html

@@ -10,7 +10,7 @@
 
 <h2>The end-result you are trying to achieve</h2>
 What you are trying to do is to get your recorded locations (waypoints) and wanderings (tracks) 
-	appear properly in the cave survey database. But you have to  upload 
+(a) are recorded somewhere, (b) eventually	appear properly in the cave survey database and. You have to  upload 
 the tracks and waypoints in a GPX file to the right place. 
 <p>If you are really lazy (or really a beginner) you can use the simple upload method, but there are some 
 unavoidable complexities in getting the GPX file out of your device.
@@ -20,7 +20,7 @@ unavoidable complexities in getting the GPX file out of your device.
 
 <h3>Instructions: contents</h3>
 <ol>
-<li><a href="#getgpx">Get the GPX file</a> that holds your locations and wanderings.
+<li><a href="#getgpx">Get the GPX file</a> that holds your locations and wanderings from your phone.
 <li><a href="#uploadgpx">Upload the GPX file</a> to the proper place.
 </ol>
 
@@ -50,7 +50,7 @@ Congratulations. You now have your track recorded using GPS as a GPX file.
 <ol>
 <li>Email the public link from the app to someone who knows how to do it. <br>
 <li>Email the  GPX file to someone who knows how to do it. <br>
-GPX files are small, so don't be shy of adding them as attachments.
+GPX files are small enough for email systems, so don't be shy of adding them as attachments.
 </ol>
 
 <p>If you can't find someone who knows how to do it, find the most extreme nerd you can find and point them at the 
@@ -64,10 +64,40 @@ but upload your GPX files instead.
 
 <h2 id="expert">Experts only</h2>
 <p>
-GPX data is stored in two places. If you have edited GPS tracks and waypoints with no extraneous data 
-then it will go into the <a href="http://expo.survex.com/repositories/home/expo/loser/graph/">Loser DVCS repository</a> in folder /gpx/[year]/ e.g. <br>
-<em>/loser/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx</em><br>
-<p>Note the implicit naming convention for this file created by Anthony Day on July 12th 2018.
+GPX data is stored in two places. 
+<ul>
+<li>initially in <em>expofiles/gpslogs/...</em>
+<li>some key selected tracks are later stored in the cave survey repository <em>::loser::</em>
+</ul>
+<p>
+GPS tracks are voluminous and we also get a lot of repetition 
+as people tend to follow the same routes for part of their walks. So the initial raw data is kept in 
+<pre>
+expofiles/gpslogs/&lt;year&gt;/&lt;MyName&gt;/
+</pre>
+e.g.
+<pre>
+expofiles/gpslogs/2018/PhilipSargent/
+</pre>
+<p>and you can create sub-folders for raw data and edited data, or for different parts of the plateau. You should always
+keep the raw, untouched data as well as any hand-edited data.
+
+<p>The process for uploading the GPX files to a specific folder <em>expofiles/gpslogs/...</em> is exactly the 
+same as for uploading photographs, so go to <a href="uploading.html#morecomplex">these "more complex" instructions</a>
+to learn how to do it.
+
+<p>Note the  naming convention for this folder created by Philip Sargent in 2018. 
+Human names in folders in expofiles are written in CamelCase; not lower-case letters. 
+This is for consistency with the naming for
+<a href="uploading.html#experienced">uploading photos</a>.
+<p>
+If you have edited GPS tracks and waypoints with no extraneous data 
+then, after agreeing this with other people as to its qualityand appropriateness, 
+it will go into the <a href="http://expo.survex.com/repositories/home/expo/loser/graph/">Loser DVCS repository</a> 
+in folder <em>/gpx/&lt;year&gt;/</em> e.g. <br>
+<em>::loser::/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx</em><br>
+<p>Note the  naming convention for this file created by Anthony Day on July 12th 2018. 
+Everything in any repository is always named using lower-case letters.
 <hr />
 </body>
 </html>

handbook/uploading.html

@@ -32,7 +32,7 @@ Please use lower-case for all filenames.
 <p>Beginners should always put all their files into the folder <b>/home/expo/expofiles/uploads/</b> and ask an admin to move them to the right place.
 <p>Now go to <a href="#init">using Filezilla initially</a>  - still using the Expo laptop.
 
-<h2>More complex instructions</h2>
+<h2 id="morecomplex">More complex instructions</h2>
 <p>Using your own laptop on expo, or after you return from expo:
 <ol>
 <li>Download and install <b>Filezilla</b>.
@@ -63,7 +63,10 @@ To make the admin's life easier, create your own folder in <pre>/home/expo/expof
 <pre>
 directory: /home/expo/expofiles/<b>photos</b>/2018/YourName/
 </pre>
-
+or, for GPS logs (GPX files):
+<pre>
+directory: /home/expo/expofiles/<b>gpslogs</b>/2018/YourName/
+</pre>
 <p>Obviously replace 'YourName' with your actual name (no spaces!). 
 It is important that you get this right as this specific way of writing 
 your name is standardised across the website