diff --git a/cave_data/1623-288.html b/cave_data/1623-288.html index 4961bbe92..a8fd1c100 100644 --- a/cave_data/1623-288.html +++ b/cave_data/1623-288.html @@ -1,46 +1,41 @@ - - - + + + + - - - + + False 1623-288 -Lila Lupinenhöhle +Lila Lupinenhöhle 1623 288 2015-mf-06 - - 1623-288 - + 1623-288 + - -

CUCC 2015

 - + +

CUCC 2015

 +

-

-

 +

+

- + -caves-1623/288/288.svx - -1623/288/288.html - +caves-1623/2015-mf-06/2015-mf-06.svx + +1623/288/288.html - - - diff --git a/cave_data/1623-76.html b/cave_data/1623-76.html index d7dd94528..975dba19d 100644 --- a/cave_data/1623-76.html +++ b/cave_data/1623-76.html @@ -35,8 +35,8 @@ The exploration is written up in many places:

This last item, the only complete write up of 1977-79, appeared in Polish translation, and is published in the English original for the first time here. -

The lower parts of the 1970s surveys are based on measurement of rope lengths and thus probably best categorised as Grade 2. The 2004 resurveyed depth for the taproom agrees closely with the 1970s surveys:

+

The lower parts of the 1970s surveys are based on measurement of rope lengths and thus probably best categorised as Grade 2. The 2004 resurveyed depth for the taproom agrees closely with the 1970s surveys:

Data for the sections covered so far by the resurvey project begun in 2004 can be downloaded as a .3d file. diff --git a/handbook/i/76-clipart.png b/handbook/i/76-clipart.png new file mode 100644 index 000000000..d1bdc22f0 Binary files /dev/null and b/handbook/i/76-clipart.png differ diff --git a/handbook/survey/how.htm b/handbook/survey/how.htm index 6dfb9b90d..0bbc5333e 100644 --- a/handbook/survey/how.htm +++ b/handbook/survey/how.htm @@ -26,8 +26,8 @@ chance to survey, on the derigging trip of a cave which is now "finished"), it is better to record all the passage, rather than part of it to a very high standard. Particularly to be avoided is a survey that doesn't connect to the rest of the cave.

- -

You are collecting data to fulfill a number of needs: the actual position +

+You are collecting data to fulfill a number of needs: the actual position of the passage for finding where it goes and possible connections; the shape of it for drawing pretty surveys; the location of possible leads for future exploration; geological info for working out how it got there.

diff --git a/handbook/survey/index.htm b/handbook/survey/index.htm index 9d2dbea0f..2af440b1b 100644 --- a/handbook/survey/index.htm +++ b/handbook/survey/index.htm @@ -13,7 +13,7 @@ Janet & John document their cave

Mostly by Wookey and Andy Waddington (1999)

Introduction

- +

This part of the Expedition Handbook is about documentation - recording what the expedition found for posterity and so future expeditions have something to build upon. Mostly this means producing a good survey of each cave, but diff --git a/handbook/t/76-clipart.jpg b/handbook/t/76-clipart.jpg new file mode 100644 index 000000000..60bbd6f60 Binary files /dev/null and b/handbook/t/76-clipart.jpg differ diff --git a/handbook/troggle/trog2030.html b/handbook/troggle/trog2030.html index f7f48003f..f29f28082 100644 --- a/handbook/troggle/trog2030.html +++ b/handbook/troggle/trog2030.html @@ -59,7 +59,14 @@ Documentation is the key to keeping troggle in a state where someone can pick it

New functionality: e.g. making the whole thing GIS-centric is a possibility. A GIS db could make a lot of sense. Not in scope for this discussion. -

There is not yet a front-end (javascript) framework on the client, i.e. a phone app or webpage, which is stable enough for us to commit effort to. Bits of troggle use very old jQuery ("edit this page", and the svx file editor) , and Flask looks interesting, but maybe in 2025 we could see a good way to move all the user interface to the client and just have an API on the server. +

There is not yet a front-end (javascript) framework on the client, i.e. a phone app or webpage, which is stable enough for us to commit +effort to. Bits of troggle use very old jQuery ("edit this page", and the svx file editor) , and Flask looks interesting +(but maybe is only simpler when +starting a new project and doesn't scale to complexity the way Django does, but maybe in 2025 we +could see a good way to move all the user interface (rewritten to be GIS-centric) to the client +(re-written in Typescript +or Dart) and just have an API on the server. [We already have a proof of principle JSON export API working at +expo.survex.com/api/expeditions_json.]

API

We will also need an API now-ish, whatever we do, so that keen kids can write their own special-purpose front-ends using new cool toys. Which will keep them out of our hair. We can do this easily with Django templates that generate JSON, which is what CUYC do @@ -69,8 +76,7 @@ A GIS db could make a lot of sense. Not in scope for this discussion.

So a useful goal, I think, is to make 'troggle2' accessible to a generic python programmer with no specialist skills in any databases or frameworks. Put against that is the argument that that might double the volume of code to be maintained, which would be worse. Nevertheless, an aim to keep in mind. -But even 'just Python' is not that easy. Python is a much bigger language now than it used to be, with some esoteric corners. (Some of which could be very useful, such as the self-testing unit test -capability: docs.python.org/3.8/library/doctest ) +But even 'just Python' is not that easy. Python is a much bigger language now than it used to be, with some esoteric corners. diff --git a/handbook/troggle/trogsimpler.html b/handbook/troggle/trogsimpler.html index 1ec0775e1..48d2fd764 100644 --- a/handbook/troggle/trogsimpler.html +++ b/handbook/troggle/trogsimpler.html @@ -15,8 +15,11 @@ Day to day cave recording and surveying tasks are documented in the expo "survey handbook"

stroggle

At one time Martin Green attempted to reimplement troggle as "stroggle" using flask instead of Django at - git@gitorious.org:stroggle/stroggle.git (but gitorious has been deleted).

+ git@gitorious.org:stroggle/stroggle.git (but gitorious has been deleted). +

A copy of this project is archived by Wookey on wookware.org/software/cavearchive/stroggle/. +

(but maybe is only simpler when +starting a new project and doesn't scale to complexity the way Django does?)

There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "gitorious valhalla"
stroggle code
stroggle-gitorious-wiki
@@ -68,12 +71,12 @@ But it has to be said that the django HTML templating mechanism is sufficiently powerful that it does almost amount to an additional language to learn. -

Troggle has 66 different url recognisersand there are 71 HTML django +

Troggle has 66 different url recognisers and there are 71 HTML django template files which the recognisers direct to. Not all page templates are currently used but still some kind of templating system would seem to be -probably necessary.

+probably necessary for sanity and maintenance self-documentation.

The django system is sufficiently well-thought-of -that it forms the basis for the framework-independent templaing engine +that it forms the basis for the framework-independent templating engine Jinja - and that site has a good discussion on whether templating is a good thing or not. There are about 20 different python template engines.] @@ -121,9 +124,13 @@ exist [This vastly underestimates the number of things that troggle does for us. See " Troggle: a revised system for cave data management".] And a VM is not required to run and debug troggle. -Sam has produced a docker variant which he uses extensively. +Sam has produced a docker variant which he uses extensively and I run it directly on local +WSL/Ubuntu in Windows10.

Troggle today has 6,400 non-comment lines of python and 2,500 non-comment lines of django HTML template code. Plus there is the integration with the in-browser HTML editor in JavaScript. Half of the python is in the parsers which will not change whatever we do. Django itself is much, much bigger and includes all the security middleware necessary in the web today. -

But maintaining the code with the regular Django updates is a heavy job.] +

But maintaining the code with the regular Django updates is a heavy job. +

"the horrifying url rewrites that correspond to no files" were bugs introduced by people who edited troggle without knowing what they were doing. We now have a test suite and these have all been fixed. +

Troggle is now packaged such that it can run entirely on a standalone laptop and re-loads from scratch in 2 minutes, not 5 hours. So if one has a microSD card with 40GB of historical scanned images and photos, it will run on any Windows or Linux laptop. Even at top camp. +] How much work would this actually take: