expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-03-30 06:49:50 +01:00
Code Issues 18 Projects 3 Activity

fixing many things which are just wrong

Browse Source
This commit is contained in:
Philip Sargent
2025-10-31 12:00:26 +02:00
parent f573838e89
commit 0a5e779dfd
4 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
templates/statistics.html
View File

@@ -1,28 +1,32 @@
{% extends "base.html" %}
{% block title %}Expo statistics{% endblock %}
{% block title %}Expo survey statistics{% endblock %}
{% block content %}
<h1>Expedition Statistics</h1>
<h1>Expo Survey Statistics</h1>
<p>{{ expoCount }} expeditions: {{ personCount }} people, {{ caveCount }} caves, {{ walletsCount }} wallets and {{ logbookEntryCount }} logbook entries.
<p>Number of survey legs: {{nsurvexlegs}} <br />
Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.</p>
<p>Number of survey legs: {{adduplegs}} <br />
Total length: {{adduplength}} km adding up the total for each year.</p>
<p>These lengths are from surveys which have been recorded in expo wallets. Non-expo surveys done by other clubs, and surveys
<a href="/survexfilewild">which have not been properly recorded</a>
in an expo wallet are excluded.
<p>These are <em>uncorrected</em> tape lengths which include pitches and duplicates but exclude splays or surface-surveys. They are uncorrected
because they are lengths <em>before</em> any loop-closure corrections done by survex.
<p>This only includes lengths surveyed by expo survey trips (though not all have valid expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes non-expo surveys (ARGE and others).
<p>These lengths are not authoritative.
<p>These are <em>uncorrected</em> tape lengths.They are uncorrected
because they are lengths <em>before</em> any loop-closure corrections done by survex and because they <em>include duplicated surveys</em>. These numbers include pitches but exclude splays or surface-surveys.
<p>Authoritative survey lengths for each cave are calculated using <a href="/handbook/troggle/cavelengths.html">a script</a> which uses the
<em>loop-closure corrected</em> lengths and is manually curated to exclude duplicate surveys of the same cave. The results are maintained
<p>Authoritative survey lengths for each cave, as explored by expo participants, are calculated using <a href="/handbook/troggle/cavelengths.html">a script</a> which
<ol><li>uses the
<em>loop-closure corrected</em> lengths
<li>is manually curated to exclude duplicate surveys of the same cave,
<li>and to include only surveys by expo participants.
</ol>
These authoritative results are maintained
in an <a href="/repositories/loser/.git/tree/docs/smklengths.ods">ODS-format spreadsheet</a>.
<p>
<table>
<tr><th>Year</th><th>Survex<br>Survey<br>Blocks</th><th>Survex<br>Survey Legs</th><th>Survex <br>length(m)</th><th>Cavers</th><th>meters/caver</th></tr>
<tr><th>Year</th><th>Survex<br>Survey<br>Blocks</th><th>Survex<br>Survey Legs</th><th>Survex <br>length(m)</th><th>Cavers</th><th>Non-cavers</th><th>meters/caver</th></tr>
{% for legs in legsbyexpo %}
<tr>
<td style="text-align:center"><a href="{{ legs.0.get_absolute_url }}">{{legs.0}}</a></td>
@@ -30,6 +34,7 @@ in an <a href="/repositories/loser/.git/tree/docs/smklengths.ods">ODS-format spr
<td style="text-align:center">{{legs.1.nsurvexlegs|rjust:"10"|floatformat:"0g"}} </td>
<td style="text-align:right">{{legs.1.survexleglength|floatformat:"0g"}}</td>
<td style="text-align:right">{{legs.1.people|floatformat:"0g"}}</td>
<td style="text-align:right">{{legs.1.tourists|floatformat:"0g"}}</td>
<td style="text-align:right">{{legs.1.success|floatformat:"1g"}}</td>
</tr>
{% endfor %}
@@ -37,7 +42,9 @@ in an <a href="/repositories/loser/.git/tree/docs/smklengths.ods">ODS-format spr
<p>One Survex Survey Block is one *begin/*end block of data in a survex file.
Some files from other caving clubs may have a convention of using many more blocks per file than we do, e.g. if the
file is exported from other software into survex format, but each block is recorded on a single day.
<p>Currently the number of cavers includes non-caving attendees: that needs to be fixed.
<p>The number of cavers excludes those attending who were not caving. This is something of a distortion as non-cavers
may still be doing useful expo-related work such as prospecting, ferrying gear and preparing food.
Non-cavers also include the bier tent and Rover Richardson, see <a href="/folk/index.html">the folk list</a> for details.