expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-30 07:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

docm improvements

Browse Source
This commit is contained in:
Philip Sargent 2018-08-11 17:54:55 +02:00
parent e22146c53c
commit c3e2817d8e
4 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handbook/index.htm
View File

@ -34,6 +34,7 @@
<li><a href="geartape.html">Label my gear and stuff</a> - the gear-tape colours in use.</li>
<li><a href="lights.html">Charge my light</a> - at top camp and at base camp.</li><br>
<li><a href="phone.htm">Send a message to top camp</a> - or base camp.</li><br>
<li><a href="logbooks.html">Type up my trip </a> - in the logbook</li>
<li><a href="uploading.html">Upload my photos</a> - of people, landscape and cave entrances.</li>
<li><a href="essentials.html">Download GPS data to my device</a> - to find caves and to not get lost.</li>
<li><a href="gpxupload.html">Upload GPS data from my phone (or device)</a> - where I found a new cave.</li>
@ -65,6 +66,8 @@
<dt><a href="datamgt.html">Cave data management</a></dt>
<dd>The biggest surprise for new people on expo are the intense efforts on recording and
managing cave data. This tells you why.<br><br>
The most basic data we keep is the record of your trip in the logbook and then
<a href="logbooks.html">typing that in online</a>.<br><br>
When you discover and survey a new cave we have <a href="survey/newcave.html">a good process</a> for recording the discovery and the cave data.</dd>
<dt><a href="look4.htm">Prospecting Issues </a></dt>

14
handbook/logbooks.html
View File

@ -14,6 +14,10 @@ which is then synchronised the version control system.
your speculations and ideas for what looks promising and what is obvious but doesn't go: things that are vital to future expoers. And please, please
do lots of sketches in the logbook.
<p>The contents of both the topcamp logbook and the basecamp logbook are typed into the same
"logbook.html" file for archiving. The drawings are scanned and stored in the same place, and hand-edited
into the logbook.html file after expo finished.
<p>If this is all new to you, please now read <a href="datamgt.html">Cave data management</a>,
and <a href="survey/why.htm">why we make surveys</a> and then the
<a href="survey/index.htm">Survey Handbook</a>
@ -40,6 +44,16 @@ ensure that the updates from all the people entering trip data are OK and don't
<p>Logbooks are typed up and kept in the [expoweb]/years/[nnnn]/ directory as 'logbook.html'.</p>
<h3>Recommended procedure</a></h3>
<p>
Rather than editing logbook.html when you type up your trip, it is a much better
idea to type up your trip(s) in a separate file, e.g. "logbook-rt.html", and store it in the same
place on the <em>expo laptop</em>, i.e.
<pre>
/home/expoweb/years/2018/
</pre>
<p>or email it to a nerd if you are sitting at a different laptop.
<h3>Format of the online logbooks</a></h3>

8
handbook/survey/index.htm
View File

@ -37,7 +37,13 @@ detailed topics.</p>
<ul>
<li><a href="what.htm">What is a cave survey ?</a></li>
<li><a href="why.htm">Why am I doing this ?</a></li>
</ul></li>
</ul>
</li>
<li><b>For those new to CUCC expo surveying:</b>
<ul>
<li><a href="newcave.html">The complete process for recording cave data</a></li>
</ul>
</li>
<li><b>For those carrying out a survey:</b>
<ul>
<li>Methods: <a href="how.htm">underground</a></li>

23
handbook/survey/newcave.html
View File

@ -115,9 +115,26 @@ and you will put all the scan files in the folder for your wallet, e.g. for 2018
</pre>
and tell someone nerdy when you have finished and they will
ensure that it is copied to the expo server.
If you want to do this yourself, or are using your own laptop, then learn how to use Filezilla
[If you want to do this yourself, or are using your own laptop, then learn how to use Filezilla
- as <a href="../uploading.html">documented for uploading your expo photographs</a>. The correct folder
on the expo server is the same as that on the expo laptop- because we set up the expo laptop to be like that.
on the expo server is the same as that on the expo laptop- because we set up the expo laptop to be like that.]
<h3 id="runsurvex">Storing your electronic survey files</h3>
<p>If you used a PDA instead of making notes on paper, you need to store your .topo files in the right place.
<p>If you using the expo laptop you can put the .topo files in a special "X" folder for your virtual
wallet, as there is no physical wallet,
e.g. for 2018#X16 it would be:
<pre>
/home/expo/expofiles/surveyscans/2018/2018#X16/
</pre>
and tell someone nerdy when you have finished and they will
ensure that it is copied from the <em>expo laptop</em> to the expo server.
<p>[If all else fails, use the "Upload your photos" documented process and store
the .topo files where you would have stored your .jpg photo files. Otherwise you can email all the .topo files
to a friendly nerd who will put them in the right place.]
<p><em>to be further documented - probably in a separate page</em>
<h3 id="survexformat">Typing in the survey data in survex format</h3>
<p>[This has been described in several places and we are in the process of consolidating
@ -148,6 +165,8 @@ ensure that it is <em>saved, committed, </em>and<em> pushed</em> appropriately.
<h3 id="runsurvex">Running survex to create a centre-line</h3>
<p><em>to be documented</em>
<h3>Transcribing and re-scanning your sketches</h3>
<p><em>to be documented</em> See <a href="survey/drawup.htm">drawing up the sketches</a>.