Old Garmin handheld GPS devices
--These need the Garmin communication protocol to import cave entrance locations (waypoints) and paths (tracks). -You can't do it by simply copying files. -This means that you need special software on your laptop in addition to a USB cable that -connects your laptop to the Garmin device. +
Even modern (2019) Garmin GPS devices use this old style mini-USB socket. So you will need the special cable that comes with the device. An ordinary phone USB cable won't work.
Very Old Garmin handheld GPS devices
++These need the Garmin communication protocol to import cave entrance locations (waypoints) and paths (tracks). +You can't do it by simply copying files. +This means that you need special software on your laptop in addition to a USB cable that +connects your laptop to the Garmin device. +
Once you have the right cable and connected your handheld to your laptop:
- On a Windows machine, use "GPSbabel for Windows" which has an easy to use graphical user interface:
@@ -115,11 +116,11 @@ devise new routes to reach them.
To regenerate the most recent version which contains the cave entrances discovered during expo you will need to ask someone who is competent in logging into the server and running scripts. -
The data is in the version control system repository :loser: in +
The data is in the version control system repository :loser: in
loser/gpx/
-and is generated from the survex data by a script. It is best to do this on a laptop which has the entire :loser: +and is generated from the survex data by a script. It is best to do this on a laptop which has the entire :loser: repo downloaded onto it (e.g. the expo laptop) rather than on the server itself as the server can run out of memory doing this.The most recent track data will have been uploaded by an expoer into e.g. @@ -133,9 +134,9 @@ repo downloaded onto it (e.g. the expo laptop) rather than on the server This is actually entirely hand-edited from original tracks. The only survex data it uses is the entrances waypoints which are exported by the script which has been hand-edited in. It also has the kataster boundaries hand-edited in. -
Last year's (17 July 2018) +
The 17 July 2018 version can be downloaded from here : essentials.gpx (190K). -(This is a symlink to loser/gpx/essentials.gpx). +(This is a symlink to loser/gpx/essentials.gpx). This works fine on laptops but most phones don't like this sort of link.
diff --git a/handbook/index.htm b/handbook/index.htm index 31bebedb9..4bffdc2c5 100644 --- a/handbook/index.htm +++ b/handbook/index.htm @@ -27,6 +27,7 @@ You've never been to expo? This is what you need to know before packing to come:Second steps
This is what it's all about:-
+
- Introduction to expo - a 40-year institution
- Primer - For new expedition members - the caves we are exploring
- Surveying - Why and how we survey caves. (important!)
- Surveying - beginners guide - Jump to: Beginners guide. @@ -56,6 +57,7 @@ This is a scientific expedition - the Austrian government allows us to wander ar
- New Cave - How to Enter the Data - Straight to step #6 of the online cave data-entry process
- Trip report status - Missing .svx's, missing tunnel drawings etc.
+
@@ -119,6 +121,7 @@ Things that are likely to be relevant at basecamp.Misc
-
+
- Photography Guide - vital for entrances and documenting caves.
- Travelling cavers phrases - Vocabulary in (German, Spanish, French).
- For those new to CUCC expo surveying:
-
+
- Expo logbooks - how and why
- The complete process for recording cave data
- Current Expo survey wallet status.
- Current Expo survey data TO-DO list. diff --git a/handbook/tollrd.html b/handbook/tollrd.html index 1d177648f..2e643fb23 100644 --- a/handbook/tollrd.html +++ b/handbook/tollrd.html @@ -47,9 +47,9 @@ trip for the view, but quickly becomes prohibitive for a caving expedition made up mainly of impoverished students needing to make a dozen or more return journeys. Cyclists go free, but 900m of ascent from the village is a little excessive with heavy gear. It does make a splendid run back down, -however ! Trying only to travel at night is possible, but is both underhand -and rather restrictive, particularly if an emergency arises. Permission is -needed to camp within the Nature Reserve at the top, so it is best to +however ! Trying only to travel at night is no longer possible +because of the automated gates and automated number-plate recognition system. +Permission is needed to camp within the Nature Reserve at the top, so it is best to negotiate a cheaper deal. The owner is very interested to know about the caves on "his" plateau, so it's important to send a report as soon as possible after the expedition. diff --git a/handbook/troggle/trogstatus.html b/handbook/troggle/trogstatus.html index 3efe10868..488e790a6 100644 --- a/handbook/troggle/trogstatus.html +++ b/handbook/troggle/trogstatus.html @@ -30,19 +30,27 @@ The loser repo and expoweb repo need more care in migration (expoweb is the webs
- "Django 1.11 is the last version to support Python 2.7. Support for Django 1.11 ends in 2020." see: django versions. You will notice that we are really outstaying our welcome here, especially as python2.7 was declared dead in January this year. + +
- For a table displaying the various versions of django and support expiry dates
see the django download page.
Django 1.7 expired in December 2015.
-Django: full deprecation timeline.
-
Ideally we should upgrade from django 1.7 to django 1.11, then port from python2 to python3 on -the same version of django, -then upgrade to as recent a version of django as we can. +Django: full deprecation timeline. + +
- Ubuntu 20.04 came out on 23rd April but it does not support python2 at all. So we cannot use it for software maintenance (well be can, but only using non-recommended software, which is what we are trying to get away from). +
- Cave Descriptions Index. Recently-explored major caves:
-
-
- Fischgesicht -
- Tunnockschacht +
- Fischgesicht-Höhle - FishFace +
- Heimkehrhöhle - Homecoming
- Balkonhöhle +
- Tunnockschacht
- Schwarzmooskogeleishöhle -
- Eislufthöhle +
- Kaninchenhöhle
- Steinbrückenhöhle
2019 | 2020 +| +expedition planning and logistics - ++ +2016 +| +2017 +| +2018 +| +2019 +| +2020 +| +expedition cave exploration and survey data + - Other years
- Introduction to expo +
- Published Articles and Presentations in Journals and at conferences (bibliography with links)
- External Presentations(Hidden Earth, etc)
- Published Articles and Presentations in Journals and at conferences (bibliography with links)
- Area/subarea descriptions
- Geological outline
- Cave Descriptions Index -
- The Austrian Kataster or cave catalogue -
- Current data - download file for display using aven -
- Loser Panoramastraße +
- Kataster - The Austrian cave catalogue
- The weather at Grundlesee from a webcam about 5km from basecamp -
- Festering - or alternative activities for jaded cavers
- Independent visitors' info
- Other groups who have worked in the area.
- Deep and Long Caves list - out of date -
- Fixed Ropes in CUCC caves - very out of date +
- Current data - download file for display using aven
- Full Expedition Handbook - start here.
-This contains the Prospecting Handbook and the Surveying Handbook sections.
- - Handbook section on surveying -
- Primer - for new expedition members +
- Primer - for new expedition members +
- Expedition Handbook - +the Prospecting, Surveying, GPS, Rigging and How To Expo.
- Rescue guide IMPORTANT -
- Expo logbooks procedures -
- Handbook section on prospecting -
- Get GPS data on cave locations +
- Surveying Handbook +
- Prospecting Handbook +
- Essential GPS in the mountains
- Rigging guide
- Expo Planning Guide - How to plan and make an expo happen. diff --git a/scripts/detect-filename-clashes.py b/scripts/detect-filename-clashes.py index bdfe564e5..9f647a9cf 100644 --- a/scripts/detect-filename-clashes.py +++ b/scripts/detect-filename-clashes.py @@ -1,53 +1,53 @@ -#!/usr/bin/env python -""" -Recursively checks that no filenames from the current working directory -down are the same, even if they are in different subdirectories. Exits -with status 0 if no matching filenames are found, or 1 if a match is -found. - -2020-03-25 PMS Copied originally from https://gist.github.com/seanh/229455 -Modified to lowercase everything before checking, to detect clashes caused -by capitalisation, and to capture full path for all clashing files -""" -import sys,os -print "Checking for filename clashes...", - -def sortSecond(val): - return val[1] - -allfilenames = [] -detect = [] -clashes = [] -report = [] -exclude = set([".git",".hg"]) -for root, dirs, files in os.walk('.', topdown=True): - dirs[:] = [d for d in dirs if d not in exclude] # modifies dirs in-place. - for filename in files: - if filename.endswith('~'): - # Ignore automatically created backup files. - continue - if os.path.islink(os.path.join(root,filename)): - # Don't count symlinks as filename clashes. - continue - allfilenames.append((root,filename)) - if filename.lower() in detect: - clashes.append(filename.lower()) - else: - detect.append(filename.lower()) - -print len(allfilenames), 'files found...', -if clashes == []: - print 'OK' - sys.exit(0) -else: - print len(clashes)," clash(es) found." - for r,f in allfilenames: - if f in clashes: - report.append((r,f)) - # sorts the array in descending according to - # second element: the clashing filename - report.sort(key = sortSecond) - for r,f in report: - print os.path.join(r,f) - print len(clashes)," clash(es) found." +#!/usr/bin/env python +""" +Recursively checks that no filenames from the current working directory +down are the same, even if they are in different subdirectories. Exits +with status 0 if no matching filenames are found, or 1 if a match is +found. + +2020-03-25 PMS Copied originally from https://gist.github.com/seanh/229455 +Modified to lowercase everything before checking, to detect clashes caused +by capitalisation, and to capture full path for all clashing files +""" +import sys,os +print "Checking for filename clashes...", + +def sortSecond(val): + return val[1] + +allfilenames = [] +detect = [] +clashes = [] +report = [] +exclude = set([".git",".hg"]) +for root, dirs, files in os.walk('.', topdown=True): + dirs[:] = [d for d in dirs if d not in exclude] # modifies dirs in-place. + for filename in files: + if filename.endswith('~'): + # Ignore automatically created backup files. + continue + if os.path.islink(os.path.join(root,filename)): + # Don't count symlinks as filename clashes. + continue + allfilenames.append((root,filename)) + if filename.lower() in detect: + clashes.append(filename.lower()) + else: + detect.append(filename.lower()) + +print len(allfilenames), 'files found...', +if clashes == []: + print 'OK' + sys.exit(0) +else: + print len(clashes)," clash(es) found." + for r,f in allfilenames: + if f in clashes: + report.append((r,f)) + # sorts the array in descending according to + # second element: the clashing filename + report.sort(key = sortSecond) + for r,f in report: + print os.path.join(r,f) + print len(clashes)," clash(es) found." sys.exit(1) \ No newline at end of file
Similarly expoweb is full of bloat from fat images and surveys and one 82MB thesis that got checked in and then removed. Clearing that out is a good idea. I have a set of 'unused fat blob' lists which can be stripped out with git-gilter. It's not hard to make a 'do the conversion' script, ready for sometime after expo 2019 has calmed down. -
April/May 2020 and django versions
+May 2020 and django versions
-Wookey has now moved 'expoweb' from mercurial to git largely "as-is" and will to use the git tools to patch up the history and to remove redundancies, rather than the original plan to tidy them up "at the time of conversion". Mark Shinwell is working on loser. -
Sam continues to work on upgrading django from v1.7 . We are using python 2.7.17 and while we could upgrade to Python v3 using the same version (1.7) of django, we would rather upgrade django as much as possible first before we tackle that. Old versions of django have unpatched security issues. -
"Django 1.11 is the last version to support Python 2.7. Support for Python 2.7 and Django 1.11 ends in 2020." see: django versions. -
Ubuntu 20.04 came out on 23rd April but it does not support python2 at all. So we cannot use it for software maintenance. -
For a table displaying the various versions of django and support expiry dates +Wookey has now moved 'expoweb' from mercurial to git largely "as-is" and will to use the git tools to patch up the history and to remove redundancies, rather than the original plan to tidy them up "at the time of conversion". Mark Shinwell is working on loser with him. +
Sam continues to work on upgrading django from v1.7 on python 2.7.17 . We would like to upgrade django as quickly as possible because old versions of django have unpatched security issues. +Upgrading to later django versions is a real pig - not helped by the fact that all the tools to help do it are now out of date for these very old django releases. +
-
+
We planned to upgrade from django 1.7 to django 1.11, then port from python2 to python3 on +the same version of django, then upgrade to as recent a version of django as we could. But we have +discovered that django1.7 works just fine with python3, so we will probably move to python3 during June and +then upgrade the server operating system from Debian stretch to buster before +tackling the next step: thinking deeply about when we migrate from django +to something else.
Enforced time at home is giving us a new impetus to writing and restructuring the documentation for everything. diff --git a/infodx.htm b/infodx.htm index 0029f3e83..615d84e3b 100644 --- a/infodx.htm +++ b/infodx.htm @@ -13,12 +13,14 @@
Public articles and presentations
Area Description
-
-
Expedition Handbook
-
-