2018-ms-01, -02 ent photos

This commit is contained in:
Philip Sargent 2023-11-10 00:37:25 +02:00
parent ec7b5144cd
commit e77e432338
16 changed files with 105 additions and 38 deletions

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:16 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:16 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@ -20,7 +20,7 @@ the form documented at
<caveslug>1626-2018-MS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' -->
<official_name></official_name><!-- Name of the cave (normally in German) Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
<area>1626</area><!-- e.g. "1623" -->
<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
<kataster_code>-</kataster_code><!-- 'length-or-depth/type exploration'
code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
T Trockenh&ouml;hlen (Dry caves)
@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1626-2018-MS-01</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1626-2018-MS-01+1626-2018-MS-01 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
@ -57,7 +56,7 @@ Notes: tag hammered into crack near to placed spit
Photo: Becka's phone at 14:00</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
<references>Becka's phone GPS 33+ 410730 5274320 Alt 1698m Accuracy 4m</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<references>Becka's phone GPS 33+ 410730 5274320 Alt 1698m Accuracy 4m - but this location is actually the bier tent! We get the real location from a geolocated photo at 13:56.</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
@ -70,7 +69,6 @@ Becka, Tom, Mark Shinwell.</notes><!-- Normally empty, but place for anything el
<extent></extent>
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>1626/2018-MS-01/2018-MS-01.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
</cave>
</body>
</html>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<!-- This file is generated by troggle on Nov. 6, 2023, 7:26 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:07 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Nov. 6, 2023, 7:26 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:07 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1626-2018-ms-02</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1626-2018-ms-02+1626-2018-ms-02 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
@ -61,7 +60,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<extent></extent>
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>1626/2018-ms-02/2018-ms-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
</cave>
</body>
</html>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:05 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:05 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1626-2018-ms-03</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1626-2018-ms-03+1626-2018-ms-03 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
@ -68,7 +67,6 @@ Climb down boulder tickle 5m leads to 2m climb. Rift continues to 4m pitch into
<extent></extent>
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>1626/2018-ms-03/2018-ms-03.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
</cave>
</body>
</html>

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- This file is generated by troggle on Oct. 12, 2023, 12:21 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:16 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Oct. 12, 2023, 12:21 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:16 p.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>
@ -25,13 +25,16 @@ though, you do not need to do a data import as it happens automatically -->
<explorers></explorers>
<map_description></map_description>
<location_description>Becka's phone GPS 33+ 410730 5274320 Alt 1698m Accuracy 4m<br />
Shinwell 2023-07-12: this fix is miles off, so commenting out in gps/gps18.svx
Shinwell 2023-07-12: "this fix is miles off, so commenting out in gps/gps18.svx
So this is effectly lost, though refindable, except that it is near 2018-ms-02, 03, 04</location_description>
So this is effectly lost, though refindable, except that it is near 2018-ms-02, 03, 04"
[in fact this is a fix of the bier tent, but with a different altitude]
Entrance photo found, with GPS EXIF. So it is found.</location_description>
<lastvisit>2018-07-18</lastvisit>
<approach>logbook entry 2018-07-18</approach>
<underground_description></underground_description>
<photo></photo>
<photo><a href='/l/20180711_135632.html'><img src='/t/20180711_135632.jpg' /></a></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@ -47,16 +50,15 @@ So this is effectly lost, though refindable, except that it is near 2018-ms-02,
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability>R</findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<lat_wgs84></lat_wgs84>
<long_wgs84></long_wgs84>
<tag_station></tag_station>
<other_station></other_station>
<other_station>1623.p2018-ms-01</other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>
</body>
</html>

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- This file is generated by troggle on Nov. 6, 2023, 7:26 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:07 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
@ -14,21 +14,21 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Nov. 6, 2023, 7:26 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:07 p.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>
<non_public>False</non_public>
<slug>1626-2018-ms-02</slug> <!-- one entrance and one slug per entrance_data file -->
<name></name>
<entrance_description></entrance_description>
<entrance_description>Hole ~5m long x 1m wide.</entrance_description>
<explorers></explorers>
<map_description></map_description>
<location_description></location_description>
<lastvisit></lastvisit>
<approach></approach>
<underground_description></underground_description>
<photo></photo>
<photo><a href='/l/20180711_145641.html'><img src='/t/20180711_145641.jpg' /></a></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@ -39,7 +39,7 @@ though, you do not need to do a data import as it happens automatically -->
U = Unmarked,
? = Unknown" -->
<marking>T</marking>
<marking_comment></marking_comment>
<marking_comment>Photo shows person pointing at the tag in a crack in the rock</marking_comment>
<!-- findability options: ? = To be confirmed ...,
S = Surveyed,
L = Lost,
@ -49,11 +49,10 @@ though, you do not need to do a data import as it happens automatically -->
<alt></alt>
<lat_wgs84></lat_wgs84>
<long_wgs84></long_wgs84>
<tag_station></tag_station>
<other_station>1626.p2018-ms-02</other_station>
<tag_station>1626.p2018-ms-02</tag_station>
<other_station>1626.p2018-ms-02_2</other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>
</body>
</html>

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- This file is generated by troggle on Oct. 12, 2023, 2:24 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- This file is generated by troggle on Nov. 9, 2023, 10:05 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Oct. 12, 2023, 2:24 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Nov. 9, 2023, 10:05 p.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>
@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
<lastvisit></lastvisit>
<approach></approach>
<underground_description></underground_description>
<photo></photo>
<photo><a href='/l/20180711_161247.html'><img src='/t/20180711_161247.jpg' /></a></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@ -53,7 +53,6 @@ though, you do not need to do a data import as it happens automatically -->
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>
</body>
</html>

BIN
i/20180711_135632.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

BIN
i/20180711_145641.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

BIN
i/20180711_161247.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

24
l/20180711_135632.html Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
<title>
Becka&#x27;s photo
</title>
<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
</head>
<body>
<H1>Becka&#x27;s photo</H1>
<div class="centre"><img alt="" src="/i/20180711_135632.jpg" />
</div>
<p>snow filled ramp</p>
<p class="caption">Photo &copy; Becka Lawson, 2018</p>
<hr />
</body>
</html>

24
l/20180711_145641.html Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
<title>
Entrance
</title>
<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
</head>
<body>
<H1>Entrance</H1>
<div class="centre"><img alt="" src="/i/20180711_145641.jpg" />
</div>
<p>p2018-ms-02_2</p>
<p class="caption">Photo &copy; Becka Lawson, 2018</p>
<hr />
</body>
</html>

24
l/20180711_161247.html Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
<title>
Entrance
</title>
<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
</head>
<body>
<H1>Entrance</H1>
<div class="centre"><img alt="" src="/i/20180711_161247.jpg" />
</div>
<p>Finger pointing at tag in crack in rock</p>
<p class="caption">Photo &copy; Becka Lawson, 2018</p>
<hr />
</body>
</html>

BIN
t/20180711_135632.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
t/20180711_145641.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
t/20180711_161247.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -14,7 +14,7 @@ maintain half a dozen parser functions.
Sorry about all the crap that surrounds the image tags which has been imported along with the content
when UK Caving blogs have been parsed.
Exported on 2023-10-22 23:10 using either the control panel webpage or when editing a logbook entry online
Exported on 2023-11-09 21:11 using either the control panel webpage or when editing a logbook entry online
See troggle/code/views/other.py and core.models/logbooks.py writelogbook(year, filename)
-->
<body>
@ -85,6 +85,7 @@ these caves have been hammered into cracks and only cucc-2018-ms01 has a hole dr
<br /><br />
<b>cucc-2018-ms01</b><br />
Becka's phone GPS 33+ 410730 5274320 Alt 1698m Accuracy 4m<br />
[Ed. This GPS fix is actually bang-on the bier tent at basecamp,
Description: Rubble slope with snow plug down to a jammed boulder. Wriggle down next to it to a 45°
ramp down. This levels off to a tight squeeze down to a small chamber. Around 30m long with no draft.<br />
Sketch: see notes and photo on Becka's phone at 09:30 on 13/7/18<br />