diff --git a/handbook/gpxupload.html b/handbook/computing/gpxupload.html similarity index 89% rename from handbook/gpxupload.html rename to handbook/computing/gpxupload.html index 4188171f8..633939d5d 100644 --- a/handbook/gpxupload.html +++ b/handbook/computing/gpxupload.html @@ -2,7 +2,7 @@ CUCC Expedition Handbook: Uploading files/photos - +

CUCC Expedition Handbook

@@ -43,7 +43,7 @@ unavoidable complexities in getting the GPX file out of your device.
  • It may give you options such as "Garmin", or "File". Choose "File".
  • It will ask for a filename to use. Pick something like "northplat-asmith-2018-07-29" (if your name is Aaron Smith)
  • A GPX file "northplat-asmith-2018-07-29.gpx" will be downloaded to the Downloads folder on your laptop. -
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found. +
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found.

    @@ -56,7 +56,7 @@ Congratulations. You now have your track recorded using GPS as a GPX file.

  • Email the public link from the app to someone who knows how to do it.
  • Email the GPX file to someone who knows how to do it.
    GPX files are small enough for email systems, so don't be shy of adding them as attachments. -
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found. +
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found.

    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

    Slightly less simple upload instructions

    Using your own laptop on expo, or after you return from expo, use the "more complex" instructions for uploading photos to /uploads/, -but upload your GPX files instead. But none of this will work on your own laptop until you have also done the key-pair setup procedure. +but upload your GPX files instead. But none of this will work on your own laptop until you have also done the key-pair setup procedure.

    More complex upload instructions

    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 none of this will work on your to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case).

  • On the expo laptop copy it to a folder in/home/expo/Downloads/gpslogs/YourName/
  • Tell someone you have done it. -
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found. +
  • Write a note in the expo logbook to say what you have done with a short description of what you saw and found. @@ -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.

    GPS tracks are voluminous and we also get a lot of repetition diff --git a/handbook/computing/onlinesystems.html b/handbook/computing/onlinesystems.html index c5c56f365..b68f98f26 100644 --- a/handbook/computing/onlinesystems.html +++ b/handbook/computing/onlinesystems.html @@ -42,9 +42,9 @@ This page is the overview. The online systems manuals are split into these secti

    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 handbook content:

    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:

    -
    (Click to enlarge). +
    (Click to enlarge). -

    For installing and pre-configuring Filezilla on a new machine see FileZilla install instructions which will set you up pointing at the correct folder automatically. But none of this will work on new machine until you have also done the key-pair setup procedure. +

    For installing and pre-configuring Filezilla on a new machine see FileZilla install instructions which will set you up pointing at the correct folder automatically. But none of this will work on new machine until you have also done the key-pair setup procedure.

    Automated magic

    Note that uploading photos does not automatically update the view @@ -131,9 +131,9 @@ at http://expo.survex.com/photos/ i

    Using your own laptop

    To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an experienced user first. -

    You will need to know the expo password but none of this will work until you have also done the key-pair setup procedure.

    +

    You will need to know the expo password but none of this will work until you have also done the key-pair setup procedure.

    -

    To install and configure Filezilla on your machine see FileZilla install instructions which will set you up pointing at the correct folder automatically. +

    To install and configure Filezilla on your machine see FileZilla install instructions which will set you up pointing at the correct folder automatically.

    Getting photo files from phones

    @@ -154,7 +154,7 @@ at http://expo.survex.com/photos/ i
  • the target folder: /uploads/, or it may appear as /expofiles/uploads/
  • the port number: 21 (if you leave this blank it will probably work) -

    But none of this will work until you have also done the key-pair setup procedure. On a phone this means that you will also need to install a terminal (command line) app. See your machine instructions, the Android bits. +

    But none of this will work until you have also done the key-pair setup procedure. On a phone this means that you will also need to install a terminal (command line) app. See your machine instructions, the Android bits.

    1. Install the andftp 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).
    2. Click on the icon that looks like a "plus" synbol in a circle diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index 7f09beb4c..6ec5e8914 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -75,7 +75,7 @@ but all the recommended software here is open source (and please don't install p
    3. inkscape-speleo - plugin to import/export survex, therion and pockettopo files to the drawing package inkscape.
    4. Imagemagick convert for re-scaling photographs and scanned images and converting from PDF to JPG. (NB you may need to fix this security issue) -

      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 Comparison of Tunnel to Other Cave Software. +

      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 Comparison of Tunnel to Other Cave Software.

      @@ -118,7 +118,7 @@ but all the recommended software here is open source (and please don't install p
    5. OsmAnd - a GPS app. See also the expo GPS configuration pages
    6. GPSessentials - another GPS app.
    7. Ape@Map - another GPS app, compatible with Kompass commerical map sand used by Austrian cavers -
    8. andftp FTP app - needs an ssh key installed on your phone +
    9. andftp FTP app - needs an ssh key installed on your phone
    10. FTP using Cx_File_Explorer (this is probably out of date)
    11. TopoDroid makes cave surveys with the DistoX.
    12. Cave3D is a Therion 3D viewer. @@ -151,8 +151,8 @@ to excessively careful when naming files and survex names and be exceptionally careful when using rsync.

      The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. - See Experts: Uploading files, - Uploading files and Uploading GPS tracks. + See Experts: Uploading files, + Uploading files and Uploading GPS tracks. Only machines which have done the key-pair setup process can do scp, sftp or rsync.

      diff --git a/handbook/survey/newwallet.html b/handbook/survey/newwallet.html index 8d6484fcf..513319b04 100644 --- a/handbook/survey/newwallet.html +++ b/handbook/survey/newwallet.html @@ -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 minimal laptop setup and then you will need to learn how to use Filezilla -- as documented for uploading your expo photographs. The correct folder +- as documented for uploading your expo photographs. 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 only copy files to the server that you created yourself and which live in your own wallet folder