Updates to caves to improve prospecting guide. Changed main page to 2013.

This commit is contained in:
expo 2013-08-01 17:06:38 +02:00
parent 1a4c89aa5d
commit 511c717eff
32 changed files with 60 additions and 60 deletions

View File

@ -9,7 +9,7 @@
<dl>
<dt><a href="look4.htm">Prospecting</a></dt>
<dd>The printable <a href="prospecting_guide.html">prospecting guide</a> is essential reading before you wander the plateau stumbling across holes of potential interest. Vast amounts of work have been wasted in the past through inadequate recording. It isn't very much extra work, but ensures that your hard work gains some recognition in the future rather than making lots of tedious work and the cursing of your name... There is a separate page with pictures of surface landmarks for <a href="findit.htm">taking bearings</a>, and a new guide to getting a <a href="survey/gps.htm">GPS fix</a>.</dd>
<dd>The printable <a href="prospecting_guide.html">prospecting guide</a> or <a href="/prospecting_guide/">new prospecting guide (slow to load)</a> is essential reading before you wander the plateau stumbling across holes of potential interest. Vast amounts of work have been wasted in the past through inadequate recording. It isn't very much extra work, but ensures that your hard work gains some recognition in the future rather than making lots of tedious work and the cursing of your name... There is a separate page with pictures of surface landmarks for <a href="findit.htm">taking bearings</a>, and a new guide to getting a <a href="survey/gps.htm">GPS fix</a>.</dd>
<dt><a href="survey/index.htm">Surveying</a></dt>
<dd>Once the cave starts to get significant (ie. anything which requires getting changed or rigging), it needs good documentation. This is mostly a matter of doing a cave survey, a guidebook description and usually a surface survey. The first time you go to explore a poorly documented question mark, you will realise how important this is, and it also makes for having a pretty survey on your wall to support your bullshit. For 1998, the surveying guide has been split into easily digestible chunks, including pages specifically intended for people who <a href="survey/what.htm">haven't surveyed before</a>.</dd>
<dt><a href="rescue.htm">Rescue</a></dt>

View File

@ -12,7 +12,7 @@
</head>
<body id="homepage">
<div id="homebox">
<h1>CUCC in Austria <a href="years/1976/report.htm">1976</a>-<a href="years/2012/">2012</a></h1>
<h1>CUCC in Austria <a href="years/1976/report.htm">1976</a>-<a href="years/2013/">2013</a></h1>
<p>Welcome to the website of the <a href="http://www.srcf.ucam.org/caving/wiki/Main_Page" target="_blank">Cambridge University Caving Club</a> expeditions to Austria</p>
</div>
<!--div id="homeimg"><img src="images/stone-bridge-view.jpg" alt="Austria panorama" width="399" height="260" /-->

View File

@ -8,10 +8,10 @@
<cave>
<non_public>False</non_public>
<caveslug>1623-2001-03</caveslug>
<official_name></official_name>
<official_name>Unamed</official_name>
<area>1623</area>
<area>2d</area>
<kataster_code>?</kataster_code>
<kataster_code>1/T=</kataster_code>
<kataster_number></kataster_number>
<unofficial_number>2001-03</unofficial_number>
@ -21,7 +21,7 @@
</entrance>
<explorers>CUCC 2001 MikeTA</explorers>
<underground_description>No description extant</underground_description>
<underground_description>A short (~5m) downclimb with passage going off</underground_description>
<equipment></equipment>
<references><a href="../../years/2001/log.htm#id2001-204-12">2001 logbook</a></references>
<survey></survey>

View File

@ -24,14 +24,14 @@
<underground_description>Climb down shakehole leads to meandering stream canyon sloping steeply down to cobble choke. Attempts to dig this failed to make progress. There is no noticeable draught.</underground_description>
<equipment></equipment>
<references></references>
<survey>Drawn up straight into Tunnel by Phil.</survey>
<survey>Drawn up straight into Tunnel by Phil. Shown on <a href="/smkridge/204/surveys/plan2006.png">204 area survey</a></survey>
<kataster_status></kataster_status>
<underground_centre_line>In dataset</underground_centre_line>
<notes></notes>
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<survex_file>caves/2002-05/2002-05.svx</survex_file>
<description_file>smkridge/2002-05/2002-05.html</description_file>
<url>smkridge/2002-05/2002-05.html</url>
</cave>

View File

@ -24,14 +24,14 @@
<underground_description>Greasy 3m climb into rift chamber. Way on is too tight.</underground_description>
<equipment></equipment>
<references></references>
<survey>Drawn up straight into Tunnel by DL.</survey>
<survey>Drawn up straight into Tunnel by DL. This tunnel file appears to be lost.</survey>
<kataster_status></kataster_status>
<underground_centre_line>In dataset</underground_centre_line>
<notes></notes>
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<survex_file>caves/2002-06/2002-06.svx</survex_file>
<description_file>smkridge/2002-06/2002-06.html</description_file>
<url>smkridge/2002-06/2002-06.html</url>
</cave>

View File

@ -8,7 +8,7 @@
<cave>
<non_public>False</non_public>
<caveslug>1623-2002-AD-01</caveslug>
<official_name></official_name>
<official_name>Unamed</official_name>
<area>1623</area>
<area>2d</area>
<kataster_code>1/S =</kataster_code>
@ -24,7 +24,7 @@
<underground_description>Short drop (~4m) to snow plug. There is a gap above the snow plug and there may be a way on, though it is probably choked.</underground_description>
<equipment></equipment>
<references>Brief description in 2002#12</references>
<survey></survey>
<survey>Sketch in 2002#12</survey>
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line>
<notes></notes>

View File

@ -11,7 +11,6 @@
<official_name>Unamed</official_name>
<area>1623</area>
<area>2d</area>
<area></area>
<kataster_code>1T-</kataster_code>
<kataster_number></kataster_number>
<unofficial_number>2012-HW-01</unofficial_number>
@ -22,7 +21,7 @@
</entrance>
<explorers></explorers>
<underground_description> </underground_description>
<underground_description></underground_description>
<equipment></equipment>
<references></references>
<survey></survey>

View File

@ -29,14 +29,14 @@
<underground_description>An approximately 20m deep shaft with snow at the bottom. If snow levels allow, a way on can found down the left side of the snow plug, through an awkward squeeze over a large rock into a chamber with a snow and ice slope. A second short pitch leads off to the left, but soon ends.</p><p>A second small entrance leads via an awkward crawl to a sloping ledge on the right hand wall of the shaft a couple of metres down.</underground_description>
<equipment></equipment>
<references></references>
<survey></p><p><a href="238surveylarge.jpg"><img alt="238 survey (from 2001)" src="238surveysmall.jpg" /></a></p><p>Survey of 238 from 2001. The cave was resurveyed in 2002 (notes in 2002#06) but not drawn up.</survey>
<survey><a href="238surveylarge.jpg"><img alt="238 survey (from 2001)" src="238surveysmall.jpg" /></a></p><p>Survey of 238 from 2001. The cave was further explored in 2002 (notes in 2002#06) but not drawn up.</survey>
<kataster_status>2002 logbook (2002-08-05)</kataster_status>
<underground_centre_line>In dataset</underground_centre_line>
<notes></notes>
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<survex_file>caves/238/238.svx </survex_file>
<description_file>smkridge/238/238.html</description_file>
<url>smkridge/238/238.html</url>
</cave>

View File

@ -26,7 +26,7 @@
<references></references>
<survey></p><img src="247elev.jpg" /> <img src="247plan.jpg" /> <p>(drawn up partly from sketch in 2003 logbook and partly from memory)</survey>
<kataster_status>Form prepared 06/03/2005, sent May 2005, number issued August.</kataster_status>
<underground_centre_line></underground_centre_line>
<underground_centre_line>caves/247/247.svx</underground_centre_line>
<notes></notes>
<length></length>
<depth>~20m</depth>

View File

@ -31,7 +31,7 @@
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<survex_file>caves/249/249.svx</survex_file>
<description_file>smkridge/249/249.html</description_file>
<url>smkridge/249/249.html</url>
</cave>

View File

@ -25,7 +25,7 @@
<letter>b</letter>
</entrance>
<explorers>CUCC 2006, 2007</explorers>
<explorers>CUCC 2006-13</explorers>
<underground_description>See <a href="desc.html">underground description</a> page</underground_description>
<equipment>See underground description</equipment>
<references></references>

View File

@ -38,8 +38,8 @@
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station>gps98.107</other_station>
<other_description>pre selective availability GPS</other_description>
<other_station>p107</other_station>
<other_description>from surface survey</other_description>
<bearings></bearings>
<url></url>
</entrance>

View File

@ -38,8 +38,8 @@
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station>gps00.145</other_station>
<other_description>post selective availability GPS</other_description>
<other_station>p145</other_station>
<other_description>from surface survey</other_description>
<bearings></bearings>
<url></url>
</entrance>

View File

@ -36,10 +36,10 @@
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<tag_station>p162b</tag_station>
<exact_station></exact_station>
<other_station>p1999-10</other_station>
<other_description>post selective availability GPS</other_description>
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>

View File

@ -32,11 +32,11 @@
L = Lost,
R = Refindable" -->
<findability>R</findability>
<findability_description></findability_description>
<findability_description>Coordinates need translating from wgs84. See loser/fixedpts/gps12.</findability_description>
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station>p99ob01</tag_station>
<tag_station>p99ob01 commented out of database</tag_station>
<exact_station></exact_station>
<other_station></other_station>
<other_description></other_description>

View File

@ -25,13 +25,13 @@
S? = Spit (?),
U = Unmarked,
? = Unknown" -->
<marking></marking>
<marking>T</marking>
<marking_comment></marking_comment>
<!-- findability options: ? = To be confirmed ...,
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -25,13 +25,13 @@
S? = Spit (?),
U = Unmarked,
? = Unknown" -->
<marking></marking>
<marking>T</marking>
<marking_comment></marking_comment>
<!-- findability options: ? = To be confirmed ...,
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -36,7 +36,7 @@
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station>gps04.p2004-18</tag_station>
<tag_station>p2004-18</tag_station>
<exact_station></exact_station>
<other_station></other_station>
<other_description></other_description>

View File

@ -42,8 +42,8 @@ Discovered 2012
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station></other_station>
<other_description></other_description>
<other_station>p2012-HW-02</other_station>
<other_description>gps</other_description>
<bearings></bearings>
<url>smkridge/2012-HW-02_entrance.html</url>
</entrance>

View File

@ -33,7 +33,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -32,7 +32,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -32,7 +32,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -38,8 +38,8 @@
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station>gps00.wk2</other_station>
<other_description>post selective availability GPS</other_description>
<other_station>p207</other_station>
<other_description>from surface survey</other_description>
<bearings>VSK (obvious point = Nipple ?) 103&deg;, HSK (leftmost top) 052&deg;, Sch&ouml;nberg 346&deg; </bearings>
<url></url>
</entrance>

View File

@ -38,8 +38,8 @@
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station>gps00.wk3</other_station>
<other_description>post selective availability GPS</other_description>
<other_station>p208</other_station>
<other_description>from surface survey</other_description>
<bearings>B.Nase 161&deg;, VSK (obvious point = Nipple ?) 104&deg;, HSK (leftmost top) 054&deg;, Sch&ouml;nberg 346&deg;, Wildkogel (L&amp;R ends of obvious summit ridge) 007-011&deg;</bearings>
<url></url>
</entrance>

View File

@ -31,7 +31,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -31,7 +31,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -36,10 +36,10 @@
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<tag_station>p218</tag_station>
<exact_station></exact_station>
<other_station>gps00.218</other_station>
<other_description>post selective availability GPS</other_description>
<other_station></other_station>
<other_description></other_description>
<bearings>Grie&szlig;kogel: 354&deg;, HSK (rightmost peak) 018&deg;</bearings>
<url></url>
</entrance>

View File

@ -36,10 +36,10 @@
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<tag_station>p222</tag_station>
<exact_station></exact_station>
<other_station>gps00.96_04 gps00.96_04a</other_station>
<other_description>post selective availability GPS</other_description>
<other_station></other_station>
<other_description></other_description>
<bearings>VSK (probably true summit): 213&deg;, ?? (<b>not</b> Hollweiser - nearest peak across Hochklapf valley): 114&deg;</bearings>
<url></url>
</entrance>

View File

@ -31,7 +31,7 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>

View File

@ -31,8 +31,8 @@
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability_description></findability_description>
<findability>R</findability>
<findability_description>Very near 238A</findability_description>
<alt></alt>
<northing></northing>
<easting></easting>

View File

@ -38,8 +38,8 @@
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station>gps00.80</other_station>
<other_description>post selective availability GPS</other_description>
<other_station>p80</other_station>
<other_description>Nils survey</other_description>
<bearings>(1996) VSK nipple: 135&deg;, BW pt 1835: 043&deg; (this cannot possibly be right), Grieskogel: 007&deg;, HSK: 043&deg;</bearings>
<url></url>
</entrance>

View File

@ -337,11 +337,7 @@ surfacecolour = "#808080"
repath = re.compile(r'^(?:182to(?:tc|184)|tctocol|82to97|vd1to161d|161ftod|161etof|161etog|40entlink2|surfnr161|surf161|kansurf)$')
for fnm in ("../all.3d", "../alltracks.3d"):
for mapcode in draws.keys():
try:
file3d = os.popen(dump3d_binary + " " + fnm)
except:
#dump3d doesn't return an error code on "Couldnt open data file". It should.
print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
file3d = os.popen(dump3d_binary + " " + fnm)
draw = draws[mapcode]
lastx, lasty = 0, 0
for l in file3d:
@ -364,6 +360,7 @@ for fnm in ("../all.3d", "../alltracks.3d"):
$ #end of the line
''', l, re.VERBOSE)
if not match:
print "Unknown: " + l
continue
@ -389,6 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"):
else:
draw.line([lastx, lasty, x, y], fill="#800080")
lastx,lasty = x,y
if not file3d.close():
# FIXME: If dump3d can't gives an error and exits with non-zero status, this
# doesn't get triggered...
print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
surfacecolour = "#008000"
repath = re.compile(r'^')
print "Done"
@ -414,7 +415,7 @@ for cave in cavetab:
area = re.sub(r' .*', "", area)
if area == '1626' or area == 'nonexistent': continue
try:
try:
loctuple = find_location(cave)
except:
print "Unable to find location for %s" % (number)