expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-02-18 05:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Martin Green 2014-08-25 19:03:00 +01:00
commit 93c6071bab
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
folk/l/wookey.htm
View File

@ -10,20 +10,22 @@
alt="" /> alt="" />
<b>Wookey</b> (Churchill 1987-90, Editor 1988-89, Lights manager 1989-90, <b>Wookey</b> (Churchill 1987-90, Editor 1988-89, Lights manager 1989-90,
Librarian a lot of the time since then...)<br /> Librarian a lot of the time since then...)<br />
Expedition 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1998, 1999 Expedition 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1998, 1999,
2000, 2002, 2005, 2007, 2009, 2011, 2012, 2014
- one of the principal explorers and surveyors of - one of the principal explorers and surveyors of
<a href="../../smkridge/161/top.htm">Kaninchenh&ouml;hle</a>, and the <a href="../../smkridge/161/top.htm">Kaninchenh&ouml;hle</a>,
"in-Cambridge" webmaster for the CUCC website.</p> webmaster for the expo website, and sometime fettler of the expo computer.</p>
<p>Wookey also edits <p>Wookey also edited
<img class="onright" src="../i/wookey.jpg" width="101" height="150" alt="" /> <img class="onright" src="../i/wookey.jpg" width="101" height="150" alt="" />
"<a href="http://www.chaos.org.uk/survex/cp/cpinfo.htm">Compass Points</a>" "<a href="http://www.chaos.org.uk/survex/cp/cpinfo.htm">Compass Points</a>"
the quarterly journal of the BCRA the quarterly journal of the BCRA
<a href="http://www.sat.dundee.ac.uk/~arb/surveying/csg.html">Cave Surveying</a> <a href="http://www.sat.dundee.ac.uk/~arb/surveying/csg.html">Cave Surveying</a>
Special Interest Group, and has caved all over Europe, Special Interest Group, from 1993 to 2002 and has caved all over Europe,
both with CUCC and a variety of other groups.<br /> both with CUCC and a variety of other groups, and in Mulu and China
(Tian Xing).<br />
Photo on left taken at the entrance to Kaninchenh&ouml;hle in 1991, Photo on left taken at the entrance to Kaninchenh&ouml;hle in 1991,
photo on right near top camp.</p> photo on right near top camp, back when he still had some hair.</p>
<p>Wookey's <a href="http://www.chaos.org.uk/~wookey/">home page</a></p> <p>Wookey's <a href="http://www.chaos.org.uk/~wookey/">home page</a></p>

2
katast.htm
View File

@ -43,7 +43,7 @@ fabricated aluminium tags with our own internal number as a temporary
measure during early exploration; our practices are documented in the <a measure during early exploration; our practices are documented in the <a
href="handbook/look4.htm">Prospecting Handbook</a>. Once a cave has been href="handbook/look4.htm">Prospecting Handbook</a>. Once a cave has been
accurately located and explored sufficiently to count as a significant find, a accurately located and explored sufficiently to count as a significant find, a
<a href="noinfo/example_kataster_form.sxd">form</a> is filled out and sent to <a href="expoimages/documents/example_kataster_form.odg">form</a> is filled out and sent to
the VfHO, who will allocate a final kataster number.</p> the VfHO, who will allocate a final kataster number.</p>
<p>If caves have been explored by groups not recognised by the local cavers, <p>If caves have been explored by groups not recognised by the local cavers,

2
noinfo/entrance_data/1623-204f.html
View File

@ -16,7 +16,7 @@
<approach></approach> <approach></approach>
<underground_description></underground_description> <underground_description></underground_description>
<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG"> <photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG">
<img alt="204f tag location" src="entrance204f-small.jpg"></a> <img alt="204f tag location" src="i/entrance204f-small.jpg"></a>
<p>204f tag position</p></div></photo> <p>204f tag position</p></div></photo>
<!-- marking options: P = Paint, <!-- marking options: P = Paint,
P? = Paint (?), P? = Paint (?),

BIN
noinfo/example_kataster_form.sxd
View File

Binary file not shown.

8
noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
View File

@ -343,7 +343,7 @@ for fnm in ("../all.3d", "../alltracks.3d"):
for l in file3d: for l in file3d:
match = re.match(r''' match = re.match(r'''
^ #start ^ #start
(MOVE|LINE|NODE) #one of three command types (MOVE|LINE|NODE|XSECT|XSECT_END|STOP) #one of six data types
\s+(-?[0-9.]+) #X-co-ord \s+(-?[0-9.]+) #X-co-ord
\s+(-?[0-9.]+) #Y-co-ord \s+(-?[0-9.]+) #Y-co-ord
\s+(-?[0-9.]+) #altitude \s+(-?[0-9.]+) #altitude
@ -386,10 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"):
else: else:
draw.line([lastx, lasty, x, y], fill="#800080") draw.line([lastx, lasty, x, y], fill="#800080")
lastx,lasty = x,y lastx,lasty = x,y
if not file3d.close(): #if not file3d.close():
# FIXME: If dump3d can't gives an error and exits with non-zero status, this # FIXME: If dump3d can't give an error and exits with non-zero status, this
# doesn't get triggered... # doesn't get triggered...
print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d) #print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
surfacecolour = "#008000" surfacecolour = "#008000"
repath = re.compile(r'^') repath = re.compile(r'^')
print "Done" print "Done"