expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-25 08:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved to /computing and fixed links

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handbook/gpxupload.html → handbook/computing/gpxupload.html
View File

@ -2,7 +2,7 @@
<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" />
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
@ -43,7 +43,7 @@ unavoidable complexities in getting the GPX file out of your device.
<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.
<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>
@ -56,7 +56,7 @@ Congratulations. You now have your track recorded using GPS as a GPX file.
<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.
<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
@ -65,7 +65,7 @@ GPX files are small enough for email systems, so don't be shy of adding them as
<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="computing/keyexchange.html">key-pair setup</a> procedure.
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 .
@ -75,7 +75,7 @@ but upload your GPX files instead. But <em>none of this will work</em> on your
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.
<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>
@ -86,7 +86,7 @@ to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case
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="computing/repos.html">repository</a> <em>:loser:</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

4
handbook/computing/onlinesystems.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

2
handbook/computing/qstart-rsync.html
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>

6
handbook/upload-expert.html → handbook/computing/upload-expert.html
View File

@ -2,11 +2,11 @@
<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" />
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading Photos and files - Expert Use</h1>
<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.
@ -54,7 +54,7 @@ give you a norton-commander-style 2-pane UI as well).</p>
<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="computing/ftpusage.html">Radost's instructions</a> which also cover Winscp briefly (though the app he recommends is no longer available).
<li>Or if you are using an Android mobile phone, follow <a href="uploading.html#android">the andftp Android instructions</a> .
</ol>

14
handbook/uploading.html → handbook/computing/uploading.html
View File

@ -2,7 +2,7 @@
<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" />
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
@ -39,7 +39,7 @@ If you are doing more than a few photos, email will be clunky, so do this:
<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><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.
@ -115,9 +115,9 @@ and then click on the "Connect" button at the bottom of the sub-window.
</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="computing/fzexample.png" border=2><img src="computing/fzexample.png" align=center width=65%></a><br>(Click to enlarge).
<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="computing/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="computing/keyexchange.html">key-pair setup</a> procedure.
<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
@ -131,9 +131,9 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<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="computing/keyexchange.html">key-pair setup</a> procedure.</p>
<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="computing/fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
<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>
@ -154,7 +154,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<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="computing/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="computing/yourlaptop.html">your machine</a> instructions, the Android bits.
<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

8
handbook/computing/yourlaptop.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>

2
handbook/survey/newwallet.html
View File

@ -146,7 +146,7 @@ ensure that it is copied to the expo server.
If you want to do this yourself on your own laptop then be aware that
since 2018 this is all more involved because of the enforced security on our new server. First you need a <a href="../computing/basiclaptop.html">minimal laptop setup</a> and then you will need to
learn how to use Filezilla
- as <a href="../uploading.html">documented for uploading your expo photographs</a>. The correct folder
- as <a href="../computing/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.
But <em>only copy files to the server that you created yourself and which live in your own wallet folder</em>
</code>