expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-21 23:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistakes and checking cave & entrance stuff works

Browse Source
This commit is contained in:
Philip Sargent 2022-10-11 20:31:46 +03:00
parent af7e727dc5
commit 64389af316
4 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
cave_data/1623-126.html
View File

@ -1,46 +1,58 @@
<!DOCTYPE html><!-- THIS IS INFO FOR ONE CAVE-->
<!-- Only put one cave in this file (it may have multiple entrances) -->
<!-- If you edit this file, make sure it is uploaded (pushed) to the expoweb repository (cave folder) and that you have added one or more entrance files to the entrances folder-->
<!DOCTYPE html>
<!-- This file is generated by troggle 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, make sure you update the database by doing a full data import -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title></title>
<link rel="stylesheet" type="text/css" href="/css/main2.css" /></head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<cave>
<non_public>False</non_public>
<caveslug>1623-126</caveslug>
<official_name>Tunnel Schacht</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
<area>1623</area>
<area></area>
<kataster_code></kataster_code>
<kataster_number>126</kataster_number>
<unofficial_number></unofficial_number>
This file is generated by troggle using the form documented at /handbook/survey/caveentry.html
<br>
<cave>
<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
<caveslug>1623-126</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>Tunnel Schacht</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>1623</area><area></area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
<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)
W Wasserh&ouml;hlen (Caves with water)
(W) Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
E Eishohlen (Caves with ice formations)
S Schachth&ouml;hlen (Caves with pitches)
H Halbh&ouml;hlen (Rock shelters ?)
- unerforscht (unexplored)
= befahren (visited)
× teilweise vermessen (partly surveyed)
+ erforscht (exploration considered complete)
-->
<kataster_number>126</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated -->
<unofficial_number>2022-XX-nn</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
<!-- Add one entrance stanza for each entrance-->
<entrance>
<entranceslug>1623-126</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 -->
<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. -->
<entranceslug>1623-126</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 -->
<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>
<explorers><p></p></explorers> <!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
<underground_description></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><p></p></equipment>
<references><p></references></p><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<explorers><p></p></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
<underground_description>13m deep cave in the Vorderer Schwarzmooskogel</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><p></p></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><p></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<survey><p></p></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>
<notes>13m deep cave in the Vorderer Schwarzmooskogel</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<length></length>
<depth></depth>
<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'. -->
<notes>edited to test system working (Oct.2022)</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<extent></extent>
<survex_file></survex_file> <!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>1623/126/126.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.html, e.g ('1623/165.html')-->
<url>1623/126/126.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>

2
handbook/survey/ententry.html
View File

@ -48,7 +48,7 @@ This page outlines step 7 of the survey production process. Each step is documen
<p>New in 2021 are fields for the latitude and logitude (WGS84 - the same as your GPS displays). These should be entered in degrees with decimals for fractions of a degree, e.g. 42.357 (not 42 degress 21 minutes 25 seconds, or 42 degrees 21.42 minutes).
<p>In previous decades the location of an entrance was the <em>output</em> of a whole lot of surveying and position fixing (e.g. see <a href="lasers.htm">laser points</a>). Today, the location of an entrance is available by GPS at the <em>beginning</em> of the process. So we have these fields to record the data. [We don't yet have the code to automatically add these to the <var>essentials.gpx</var> download to be used for prospecting though.]
<h2>List of New Cave/Cave_data fields</h2>
<h2>List of New Entrance/Entrance_data fields</h2>
<p>The full list of fields is documented: <a href="ententryfields.html">the full list of data-entry fields</a> when creating an entrance.
<hr />

2
handbook/survey/ententryfields.html
View File

@ -32,7 +32,7 @@
<li><b>marking</b> e.g. Tag or Paint
</ul>
<p>See below for explanations.
<h2>List of New Cave/Cave_data fields</h2>
<h2>List of New Entrance/Entrance_data fields</h2>
<dl>
<dt>non_public</dt>
<dd>'False' or 'True'. True if the cave should only be visible to logged-in users. Caves

3
handbook/survey/newwallet.html
View File

@ -148,7 +148,8 @@ their the scanned notes, plan and elevation scans ("Scan files" column).
</figcaption>
</figure>
</div>
<p><em>BEFORE you do anything else, make sure that you write, <b>in ink, visibly</b>, the DATE and the name of the CAVE
on the first page that you scan. And the NAMES of the people on the trip. LEGIBLY please. </em>
<p>Each wallet has a corresponding folder in the online system where a record is kept
of what information is in the wallet and where the corresponding survey data is filed:
<pre>