moved to /computing and fixed links

This commit is contained in:
Philip Sargent
2021-04-29 15:21:31 +01:00
parent 974cb39ad0
commit b09a66b6ff
7 changed files with 24 additions and 24 deletions

View File

@@ -0,0 +1,122 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Saving GPS tracks and locations</h1>
<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)
<ol>
<li>recorded somewhere,
<li>eventually appear properly in the cave survey database.
</ol>
<p>To make this happen you have to transfer
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.
<p><em>(If you are looking for how to upload some photos instead, those instructions are
<a href="uploading.html">here</a>)</em>.
<h3>Instructions: contents</h3>
<ol>
<li><a href="#getgpx">Get the GPX file</a> that holds your locations and wanderings from your phone.
<li><a href="#simplegpx">Upload the GPX file</a> to the proper place.
</ol>
<h2 id="getgpx">Getting the GPX data out of your phone or device</h2>
<ol>
<li>Use the "Wikilocs" app (or another app with GPS tracking function) to record your track as you walk across the plateau.
<li>When you have finished your walk and are back on the internet, publish your track using the app.
<li>In the app, if there is an option to "share" your track by email:
<ul>
<li>Share it with yourself i.e. email it to your own email address.
<li>Share it with someone who knows how to do the GPX thing and upload it properly.
</ul>
<li>On your laptop (or possibly on your phone) look at the email and visit the web page by clicking on the link.
<li>The web page has a "Download" button: click on it.
<li>It may give you options such as "Garmin", or "File". Choose "File".
<li>It will ask for a filename to use. Pick something like "northplat-asmith-2018-07-29" (if your name is Aaron Smith)
<li>A GPX file "northplat-asmith-2018-07-29.gpx" will be downloaded to the Downloads folder on your laptop.
<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
</ol>
<p>
Congratulations. You now have your track recorded using GPS as a GPX file.
<h3 id="simplegpx">Simple upload instructions</h3>
<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 enough for email systems, so don't be shy of adding them as attachments.
<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
</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
<a href="#expert">Expert instructions</a> below.
<h3>Slightly less simple upload instructions</h3>
<p>Using your own laptop on expo, or after you return from expo,
use the "more complex" instructions for <a href="uploading.html">uploading photos</a> to /uploads/,
but upload your GPX files instead. But <em>none of this will work</em> on your own laptop until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure.
<h2 id="uploadgpx">More complex upload instructions</h2>
<p>OK you now have a file produced by your device, something like XTR20170714X2345.GPX .
<ol>
<li>First you rename it
to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case).
<li>On the <i>expo laptop</i> copy it to a folder in/home/expo/Downloads/gpslogs/YourName/
<li>Tell someone you have done it.
<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
</ol>
<br><br><br><br>
<h2 id="expert">Experts only</h2>
<p>
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 <a href="repos.html">repository</a> <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="/repositories/">Loser git 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>

View File

@@ -42,9 +42,9 @@ This page is the overview. The online systems manuals are split into these secti
<p>How to use basecamp computers and networks, how to configure your phone for GPS, how to use your own laptop and "how to expo" in general are all part of the <em>handbook content</em>:
<ul>
<li><a style="color: blue" href="contribute.html">How can I contribute?</a>
<li><a href="../uploading.html">Uploading your photos</a></li>
<li><a href="uploading.html">Uploading your photos</a></li>
<li><a href="../logbooks.html">Uploading typed logbooks</a></li>
<li><a href="../gpxupload.html">Uploading GPS tracks</a></li>
<li><a href="gpxupload.html">Uploading GPS tracks</a></li>
<li><a href="../survey/newcave.html">Recording a new cave discovery</a></li>
<li><a href="../survey/status.html">Monitoring the cave survey workflow status</a></li>
<li><a href="manual.html">Data maintenance</a> - finding and updating cave survey data using online tools

View File

@@ -21,7 +21,7 @@
<p>If you don't need an entire copy of all of it, then it is probably best to use Filezilla/ftp to
copy just a small part of the filesystem to your own machine and to upload the bits you add to or edit.
Instructions for installing and using Filezilla are found in the expo user instructions for
uploading photographs: <a href="../uploading.html">uploading.html</a>.
uploading photographs: <a href="uploading.html">uploading.html</a>.
<p> To sync all
the files from the server to your local expofiles directory on your laptop:</p>

View File

@@ -0,0 +1,80 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading Photos and files - Experts</h1>
<h2>Experts only</h2>
<p>If you have been using FTP since the last century or are particularly keen on doing everything using the command-line, read on.
<p>With the new server in 2019 it is harder to configure scp or sftp (or ssh or rsync) because the server needs a key-pair setup
setting up first. So while scp (once working) is now
more secure than it was, we are forced to allow ordinary ftp to allow experienced but non-key-exchanged expoers' laptops or phones to upload photos
to the server. This is worse than it was as the password is now sent in clear.
<p>So it is important that the ordinary ftp access is restricted to the /uploads/ folder tree.
See <a href="computing/keyexchange.html">key-pair setup instructions</a> for how to arrange with an admin for this to be done for your device.
<h3>Using scp - requires key-pair setup for the device</h3>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt
mac and android with other tools. If you have Windows 10 and <a href="https://msdn.microsoft.com/en-gb/commandline/wsl/about">have installed WSL</a>, then you can use scp and don't need winscp.</p>
<p>If you don't have winscp installed you can get it from here:
<a href="http://winscp.net/eng/index.php">http://winscp.net/eng/</a>.</p>
<p>quick start guide:
<a href="http://winscp.net/eng/docs/getting_started">http://winscp.net/eng/docs/getting_started</a></p>
<p>screenshots:
<a href="http://winscp.net/eng/docs/screenshots">http://winscp.net/eng/docs/screenshots</a></p>
<!-- WedDAV no longer works because the effective user is "apache" and the permissions
for the folder /uploads/ no longer allow it to write anything because we had to change it to allow Filezilla
to work.Philip & Wookey 11 August 2018
<h3>Using WebDAV - cadaver</h3>
<p>Command-line people can use the 'cadaver' client which is even
available for windows too:
<a href="http://www.phtagr.org/2009/04/01/cadaver-for-windows/">www.phtagr.org/2009/04/01/cadaver-for-windows/</a></p>
-->
<p>scp gives you an 'explorer-like' interface (although winscp can
give you a norton-commander-style 2-pane UI as well).</p>
<p>rewite this bit...
<ol>
<li>Download and install <b>Filezilla</b>.
<li>Or learn to use <b><a href="https://www.computerhope.com/unix/scp.htm">scp</a></b>.
<li>Or on a Windows machine try Winscp.
<li>Or if you are using an Android mobile phone, follow <a href="uploading.html#android">the andftp Android instructions</a> .
</ol>
<h3>Expo laptops</h3>
<p>The <i>expo laptop</i> has got the key-pair setup set up on it so it is configured for Filezilla to use sftp not ftp but this is invisible to normal use.
<h3>Using WebDAV</h3>
This no longer works as we had to change the folder permissions for /uploads/. Sorry.
<h3>Using rsync</h3>
<p>No, don't use rsync for this. Really don't. It's too liable to delete everything or to overwrite files which are not changed at all because of the incompatibilities between Linux and Windows filename conventions (uppercase and lowercase are automagically converted and rsync gets it wrong).
<h3>Regenerating photos albums</h3>
<p>ssh in to the server, cd to /expofiles/ and
<pre>
$ ./updatephotos
</pre>
will regenerate it all using the installation of bins on the server
using the config in /home/expo/config/bins/binsrc
<hr />
</body>
</html>

View File

@@ -0,0 +1,195 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading Photos</h1>
<h2>The end-result you are trying to achieve</h2>
What you are trying to do is to get your happy holiday snaps appear <i>properly indexed</i> with all the others from the previous decades of expo history. You can see them all here: <br /> <a
href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
which is the end result. But all you have to do is to upload the photos to the right place.
A hidden script does the hard work to make it all look nice after the upload.
<p>If you are a beginner you can use the initial simple method below (using /uploads/ )
for the photos you have taken of cave entrances for cave survey and prospecting purposes.
<p>If you are looking for how to upload a GPS track, those instructions have <a href="gpxupload.html">been moved to here</a>.
<h3>Names for your photo files and folders</h3>
<p>Please use lower-case for all filenames.
<p>Please
rename the filenames of the photos intelligently to e.g. "big-hole-near-path-to-fgh.jpg", or
"2018-ad-07-entrance3.jpg" rather than "DSC31415926.jpg" or whatever your camera app produces. Please explain by email to an admin/nerd what you have done, where you have put them and how you have renamed files.
<p>Please don't upload lots of near-duplicate photos: cull them first to just the good ones. We don't want any that are out of focus either.
<p>When copying many files put them into a new folder which identifies you personally.
When you copy the files create your own folder with your name like this: <span style="font-family: monospace">/YourName/</span> and put your files into that folder. "YourName" should have no spaces, hyphens or underline characters (CamelCase).
<h2>Simple instructions</h2>
<ol>
<li>If you only have a photo or two just email or message them to someone who knows how to do it. <br>
If you are doing more than a few photos, email will be clunky, so do this:
<li>Copy the photo files from your phone to the <i>expo laptop</i> in the tatty hut using a USB cable.<br> See <a href="#android">phone app</a> if you do not know how to copy files from your phone.
<li>Rename the filenames of the photos to something descriptive (see para above).
<li>After copying your files to the <i>expo laptop</i> into the /uploads/ folder tell a nerd that you have done it.
</ol>
<p><b>Complete beginners</b> should always put all their files into their own folder within the folder <b>/home/expo/expofiles/uploads/</b> on the <a href="../computer.html"><i>expo laptop</i></a> and ask an experienced user to move them to the right place later.
<p>If you want to use your photos in a blog (see below) tell an experienced user which and they will copy a lower-resolution version to the appropriate place.
<p>That's it, you're done.
<h2>Using uploaded photos in blogs</h2>
<p>The <a href="https://ukcaving.com/board/index.php?topic=25195.msg310908#msg310908">UK Caving blog</a> requires that
photos in it are actually hosted elsewhere. This needs to be a permanent place so
that the blogs can be read in years to come. Imgur, Flikr or Instagram are OK though not ideal (expo has its own Instagram account) but
your personal GoogleDocs or GooglePhotos stash definitely is not.
Preferably
they should be put on the expo server e.g. 2018 blog photos are permanently archived on <a href="http://expo.survex.com/expofiles/photos/2018/BlogPostPhotos/">expo.survex.com<b>/expofiles/</b>photos/2018/BlogPostPhotos/</a> in the published resolution.
<h2 id="experienced">Experienced users</h2>
<p>OK the admin/nerd you have been asking to move the files to the right place on the <i>expo laptop</i> is getting fed up and now wants you to put the uploaded photos in the right place yourself and not just in /uploads/. This is where they go:
<pre>
directory: /home/expo/expofiles/<b>photos</b>/2019/YourName/
</pre>
or, for GPS logs (GPX files):
<pre>
directory: /home/expo/expofiles/<b>gpslogs</b>/2019/YourName/
</pre>
<p>Obviously replace /2019/ with the current year. This is the expo year the photos are taken, so if you are uploading a previous years' photos which you never got around to uploading you will use /2018/ or whatever.
<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
(this is known as "<a href="https://en.wikipedia.org/wiki/Camel_case">CamelCase</a>").
<p style="margin-left:20px">This is the only place in the whole system
that you should use some capital letters. Absolutely everywhere else you should use
only lower-case letters, no spaces, and hyphens (not underlines) when creating filenames, folder names or variable names of any sort.
<p>
Use the year that the photo was taken or the GPStrack logged.</p>
<h3 id="init">Uploading files from the <i>expo laptop</i></h3>
<p>Always learn how to <i>use</i> the system first on the <i>expo laptop</i> before trying to do it with your own machine.
<p>OK the files have been put into the correct place on the laptop by an experienced user and now you need to copy them to the server. Don't worry about deleting them from the <i>expo laptop</i> after copying as we can do that clean-up at the end of expo. In fact <i>don't</i> delete them from /uploads/ on the <i>expo laptop</i>.
<p>The expo server has a big section under 'home/expo/expofiles/' that is <b>not under version control</b>. This is dangerous as there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble.
<p>This is where we store big files that we don't want to keep multiple versions of which is why it is not under verson control.
<p>This is why we do not want beginners directly uploading photos to the server but to just put them on the <i>expo laptop</i> instead.
<p>So assuming that you have the photos on the laptop in directory:
<pre>
/home/expo/expofiles/photos/2019/YourName/
</pre>
you are going to be copying them to directory:
<pre>
/home/expo/expofiles/photos/2019/YourName/
</pre>
on the server.<img src="https://wiki.filezilla-project.org/favicon.ico" width=64 margin =10 align=right>
<p>
<ul>
<li>Start up Filezilla - click on red "Fz" logo in the application favourites bar on the laptop desktop.
<li>Click on the "Bookmarks" menu item:
<ul>
<li>At the bottom of the "Bookmarks" drop-down menu you may see "expo-uploads";
if so, click on it.
<li>If you can't see "expo-uploads" in that menu
(because this is temporarily broken in version 3.28 of Filezilla),
click on the "File" menu item and select "Site Manager...".
This will display a tree-structured menu in a sub-window and one of the items will be "expo-uploads". Highlight it
and then click on the "Connect" button at the bottom of the sub-window.
</ul>
<li>If this is the first time it is used this expo you will now be prompted for the password for the expo server. This is the "cavey:beery" one which we never write down or write in emails. Get it verbally or by phone or secure text message from another expoer.
</ul>
<p>Now you are in and can copy and move files anywhere. But please stick to copying files from your machine (the left window) to the server (the right window) into the /uploads/, /photos/ or /gpslogs/ folders only:<br><br>
<a href="fzexample.png" border=2><img src="fzexample.png" align=center width=65%></a><br>(Click to enlarge).
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically. But <em>none of this will work</em> on new machine until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure.
<h3>Automated magic</h3>
<p>Note that uploading photos does not automatically update the view
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> immediately. An update script needs to be run. This should run automatically once/day around midnight UTC (2017 and earlier) or a couple of minutes after you do the upload to the right place (2018 if Wookey gets this sorted out in time) but may be broken. Prod a web admin if nothing is updated by the next morning..</p>
<h2>Expert instructions</h2>
<p>These have been moved to a separate page: <a href="upload-expert.html">expert upload instructions</a>.
<h2 id="morecomplex">Using your own laptop</h2>
<p>To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an <a href="#experienced">experienced user</a> first.
<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure.</p>
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">To install and configure Filezilla on your machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
<h2 id="android">Getting photo files from phones</h2>
<p>Phones are set up these daya to share photos via apps such as "Gallery" or "Google Photos" and most people never see the photo files explicitly. However you will need to see them in order to upload them.
<p>When plugged into a computer using a USB cable most laptops will offer the option to copy files as well as charge the phone. If your phone does this, then answer "yes" when that popup appears. The photos (and probably all your other media) will be copied to the laptop. Where it copies the files depends on your phone and you will have to sit at the laptop to find the folder it has put them into. (Note that some cheap USB cables are "power only" and won't do this with any phone.)
<p>If you use Google Photos or a similar app you can create an online album using the app and share it with your friends. Do this for your caving holiday snaps and cave entrance location photos and share them with an expo nerd who will download them the right place on the server. Be careful that you are sharing the full original resolution of the photos and not some cut-down compressed bastardized "enhanced" version of the photos.
<h2 id="android">Using an FTP app </h2>
<p>If you want to do it yourself and the USB cable trick does not work then you will need to install a file manager and FTP app. Currently (on Expo 2019) the best seems to be the free <a href="http://www.lysesoft.com/products/andftp/">andftp</a> app. Assuming you can find where your phone camera has put the photo files on your phone, you can use your phone to upload photos directly to the /uploads/ folder on the expo server. However renaming them to something sensible and putting them in your own <span style="font-family: monospace">/YourName/</span> folder (see above for file naming guidelines) is fiddly on a phone.
<p>To use the FTP app you will need:<img src="http://www.lysesoft.com/products/andftp/images/splash.jpg" width=128 style="float:right; margin: 10px">
<ol>
<li>The hostname of the server: <span style="font-family: monospace">expo.survex.com</span>
<li>the username: <span style="font-family: monospace">expo</span>
<li>the password: (the usual cavey:beery password which you can get verbally from another expoer)
<li>the target folder: <span style="font-family: monospace">/uploads/</span>, or it may appear as <span style="font-family: monospace">/expofiles/uploads/</span>
<li>the port number: 21 (if you leave this blank it will probably work)
</ol>
<p>But <em>none of this will work</em> until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure. On a phone this means that you will also need to install a terminal (command line) app. See <a href="yourlaptop.html">your machine</a> instructions, the Android bits.
<ol>
<li>Install the <a href="http://www.lysesoft.com/products/andftp/">andftp</a> app onto your Android phone using the Google Play Store and allow it to access your files and photos on your phone (just click on the popup to do this).
<li>Click on the icon that looks like a "plus" synbol in a circle
<li>This opens a window with 3 tabs: General, Advanced and Sync
<li>On the General tab, type in the hostname, username and password as listed above.
<li>Also tick the checkbox "Enable resume support"
<li>Click OK to the two popups that appear
<li>You will now see an icon of a networked file folder (light blue) with the label "expo.survex.com". Click on it.
<li>Wait a while as it loads...
<li>Keep waiting. Various messages will scroll by at the bottom of the screen in tiny font.
<li>Keep waiting..
<li>The tiny text at the bottom will say "226 Transfer complete" and the main part of the window will show a listing of the files in the /uploads/ folder on the server.
<li>Now click on the little icon of a phone near the middle of the top row of icons.
<li>This will show a list of folders on your phone. Initially it will show "alt_autocycle, Android and DCIM".
<li>Click on ""DCIM", it will show a folder "Camera", click on that
<li>Now you can see a list of all your photo files by name and with the size shown on the right. Typically they will be 1.3MB or so in size.
<li>Before you upload, you need to create your own folder.
<li>Now click on the icon of a little cloud near the middle of the icon bar. This will show the files on the server.
<li>Now you need to create a folder <span style="font-family: monospace">/YourName/</span> and move those files into it. Click on the 3-dots icon on the right-hand end of the icon bar.
<li>Select the Create Folder option.
<li>A popup appears and you type in YourName. The folder is created.
<li>Click on the <span style="font-family: monospace">/YourName/</span> folder. This will makeyour folder the destination for uploaded files.
<li>Now click on the little icon of a phone near the middle of the top row of icons.
<li>This shows you the list of your photo files you saw before.
<li>Clicking on each photo filename will cause a green tick to appear on the left. This is selecting files for FTP upload.
<li>Now click on the "upload icon" on the top row: it looks like a short horizontal line with an up-arrow on it.
<li>A popup will appear asking if you wish to proceed. Click OK.
<li>The upload happens and you can see progress bars for each file.
<li>When it finishes it presents a popup with an OK button. Click on it.
<li>Now you will see the files you have just uploaded. And they will be in your folder. Success.
<li>Now you need to rename the files to something descriptive. This is very time-consuming on a phone.
<li>Click on one file to give it a green tick. Then select the 3-dot icon and then select the "Rename" option in the drop-down menu.
<li>Of course you will have earlier noted down the names of all your photos and made a note of their contents (which you see using the phone's Gallery app) so that you can do the renaming intelligently.
</ol>
<hr />
</body>
</html>

View File

@@ -75,7 +75,7 @@ but all the recommended software here is open source (and please don't install p
<li><a href="http://www.thomas-holder.de/projects/inkscape-speleo/extensions/">inkscape-speleo</a> - plugin to import/export survex, therion and pockettopo files to the drawing package inkscape.
<li><a href="https://imagemagick.org/script/">Imagemagick convert</a> for re-scaling photographs and scanned images and converting from PDF to JPG. (NB you may need to fix this <a href="https://stackoverflow.com/questions/52998331/imagemagick-security-policy-pdf-blocking-conversion">security issue</a>)
</ul>
<p>Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't. Expo has a policy decision on which to use: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also <a href="/expofiles/tunnelwiki/wiki/pages/Other_Cave_Software.html">Comparison of Tunnel to Other Cave Software</a>.
<p>Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't. Expo has a policy decision on which to use: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also <a href="/expofiles/tunnelwiki/wiki/pages/Other_Cave_Software.html">Comparison of Tunnel to Other Cave Software</a>.</p>
<a href="https://therion.speleo.sk/2D.php"><img src="https://therion.speleo.sk/img/head.jpg" hspace="20"></a>
@@ -118,7 +118,7 @@ but all the recommended software here is open source (and please don't install p
<li><a href="https://osmand.net/">OsmAnd</a> - a GPS app. See also <a href="../essentials.html">the expo GPS configuration pages</a>
<li><a href="http://www.gpsessentials.com/">GPSessentials</a> - another GPS app.
<li><a href="http://apemap.com/">Ape@Map</a> - another GPS app, compatible with Kompass commerical map sand used by Austrian cavers
<li><a href="../uploading.html#android">andftp</a> FTP app - needs an <a href="keyexchange.html">ssh key</a> installed on your phone
<li><a href="uploading.html#android">andftp</a> FTP app - needs an <a href="keyexchange.html">ssh key</a> installed on your phone
<li><a href="ftpusage.html">FTP using Cx_File_Explorer</a> (this is probably out of date)
<li><a href="https://sites.google.com/site/speleoapps/home">TopoDroid</a> makes cave surveys with the DistoX.
<li><a href="https://sites.google.com/site/speleoapps/home">Cave3D</a> is a Therion 3D viewer.
@@ -151,8 +151,8 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="manual.html#quickstart">exceptionally careful when using rsync</a>.
<p>The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'.
See <a href="../upload-expert.html">Experts: Uploading files</a>,
<a href="../uploading.html">Uploading files</a> and <a href="../gpxupload.html">Uploading GPS tracks</a>.
See <a href="upload-expert.html">Experts: Uploading files</a>,
<a href="uploading.html">Uploading files</a> and <a href="gpxupload.html">Uploading GPS tracks</a>.
Only machines which have done the key-pair setup process can do scp, sftp or rsync.
</p>