expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-17 09:47:24 +00:00
Code Issues 18 Projects 3 Activity

more explanation about wallet survey lengths

Browse Source
This commit is contained in:
Philip Sargent
2025-10-20 17:25:30 +03:00
parent 79ef45a99f
commit 5e4ab5006f
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/views/logbooks.py
View File

@@ -30,6 +30,7 @@ def notablepersons(request):
def notabilitykey(person): def notabilitykey(person):
return person.notability() return person.notability()
print(request)
persons = Person.objects.order_by('fullname') persons = Person.objects.order_by('fullname')
# From what I can tell, "persons" seems to be the table rows, while "pcols" is the table columns. - AC 16 Feb 09 # From what I can tell, "persons" seems to be the table rows, while "pcols" is the table columns. - AC 16 Feb 09
pcols = [] pcols = []

12
templates/statistics.html
View File

@@ -10,10 +10,16 @@
<p>Number of survey legs: {{nsurvexlegs}} <br /> <p>Number of survey legs: {{nsurvexlegs}} <br />
Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.</p> Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.</p>
<p>These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. They are also <em>before</em> any loop-closure corrections. <p>These lengths are from surveys which have been recorded in expo wallets. Non-expo surveys done by other clubs, and surveys
<p> <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>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>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
in an <a href="/repositories/loser/.git/tree/docs/smklengths.ods">ODS-format spreadsheet</a>.
<table> <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>meters/caver</th></tr>

8
templates/survexfilewild.html
View File

@@ -48,7 +48,7 @@ and there is {{foreignlength|floatformat:"0g"}}m of foreign (non-expo) surveyed
If the "team" field is empty, it probably means that it is an ARGE survey (in German) and so we do not recognise any participants as valid 'expo' members. If the "team" field is empty, it probably means that it is an ARGE survey (in German) and so we do not recognise any participants as valid 'expo' members.
Or it may mean that we did it, but that the survex file has been created since the last database reset. Or it may mean that we did it, but that the survex file has been created since the last database reset.
<br /> <br />
If the parent block says "troggle _unseens" or "None" then the survex file has not been plumbed in to the expo survex network yet. If the parent block says "troggle _unseens" or "None" then the survex file has either not been plumbed in to the expo survex network yet, <b>or it is a duplicate survey</b>.
<br /> <br />
If there is a *ref line of the correct format, then maybe that wallet has not been created yet. Create it, and fill in the data. If there is a *ref line of the correct format, then maybe that wallet has not been created yet. Create it, and fill in the data.
<br /><br /> <br /><br />
@@ -67,11 +67,15 @@ Length of survex data referenced by wallets in this year {{walletslength|floatfo
</table> </table>
<p>These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. <p>These are <em>uncorrected</em> tape lengths (before loop-closure corrections) which include pitches <b>and duplicates</b> but exclude splays or surface-surveys.
<p>One Survex Survey Block is one *begin/*end block of data in a survex file. <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 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. file is exported from other software into survex format.
<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 ARGE and other non-expo surveys. <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 ARGE and other non-expo 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
in an <a href="/repositories/loser/.git/tree/docs/smklengths.ods">ODS-format spreadsheet</a>.
{% endblock %} {% endblock %}

2
urls.py
View File

@@ -161,7 +161,7 @@ trogglepatterns = [
re_path(r'^caves$', cavesall, name="cavesall"), re_path(r'^caves$', cavesall, name="cavesall"),
re_path(r'^indxal.htm$', cavesall, name="cavesall"), # ~420 hrefs to this url in expoweb files re_path(r'^indxal.htm$', cavesall, name="cavesall"), # ~420 hrefs to this url in expoweb files
re_path(r'^people/?$', notablepersons, name="notablepersons"), path('people', notablepersons, name="notablepersons"),
path('people_ids', people_ids, name="people_ids"), path('people_ids', people_ids, name="people_ids"),
path('folk_export', folk_export, name="folk_export"), path('folk_export', folk_export, name="folk_export"),
path('caveslist', caveslist, name="caveslist"), path('caveslist', caveslist, name="caveslist"),