From f49f5d4c4e8d595e858d74d985f4f40c36e3d865 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Fri, 7 May 2021 20:12:47 +0100
Subject: [PATCH] NewEntrance page
---
handbook/survey/caveentry.html | 6 ++--
handbook/survey/coord.htm | 3 ++
handbook/survey/drawup.htm | 4 +--
handbook/survey/ententry.html | 64 ++++++++++++++++++++++++++++++++++
handbook/survey/lasers.htm | 10 ++++++
handbook/survey/newcave.html | 3 +-
handbook/survey/newrig.html | 4 +--
handbook/survey/newsurvex.html | 5 +--
handbook/survey/newwallet.html | 4 +--
9 files changed, 91 insertions(+), 12 deletions(-)
create mode 100644 handbook/survey/ententry.html
diff --git a/handbook/survey/caveentry.html b/handbook/survey/caveentry.html
index 8a374b6e7..cd4d522bf 100644
--- a/handbook/survey/caveentry.html
+++ b/handbook/survey/caveentry.html
@@ -24,8 +24,8 @@ This page outlines step 6 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
-</div>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a></div>
<h2>Process</h2>
<p>
This page and those following describe the process for creating new
@@ -156,7 +156,7 @@ So each field you fill in on the form may contain arbitrary HTML. Be careful!</p
<p>Back to the previous page in this sequence <a href="newrig.html">New rigging guide</a>.
<br />A side trip to see an explantion of all <a href="caveentryfields.html">the fields on the form</a>
<br />A side trip to see how to do this as a file upload process using git, the <a href="newcavefile.html">cave description data file</a>
- <br />Now go the the next page in this sequence <a href="cavedescription.html">Write the full cave descriptions with diagrams</a>.
+ <br />Now go the the next page in this sequence <a href="ententry.html">Create a new Entrance record</a>.
diff --git a/handbook/survey/coord.htm b/handbook/survey/coord.htm
index ebd70c96e..53f4e1817 100644
--- a/handbook/survey/coord.htm
+++ b/handbook/survey/coord.htm
@@ -251,6 +251,8 @@ about a metre or so.
<h2><a name="summary">Summary</a></h2>
<p>
+[These are Olaf's view in 2012. This is no longer what we use! Today we use WGS84
+latitude and logitude just as it appears on your phone or GPS. (Note added May 2021)]</p>
For all practical purposes I'd say, set your GPS receiver to UTM coordinates,
WGS84 ellipsoid, WGS84 datum. It will
usually spit out rather unspecific "heights above sea level", which are within
@@ -280,6 +282,7 @@ latitude-longitude, UTM and data set coordinates:
<p><i>Olaf Kähler, September 2012</i></p>
<hr />
+ <p>Return to <a href="coord2.html">GPS and coordinate systems</a>.
</body>
</html>
diff --git a/handbook/survey/drawup.htm b/handbook/survey/drawup.htm
index 68a2a9f94..f95d3fcef 100644
--- a/handbook/survey/drawup.htm
+++ b/handbook/survey/drawup.htm
@@ -21,8 +21,8 @@ This page outlines step 4 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
-</div>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a></div>
<h2>Process</h2>
<p>
<h3>Drawing up your survey</h3
diff --git a/handbook/survey/ententry.html b/handbook/survey/ententry.html
new file mode 100644
index 000000000..ae6d233ad
--- /dev/null
+++ b/handbook/survey/ententry.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>CUCC Expedition Handbook: Entrance data entry</title>
+<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
+</head>
+<body>
+<body>
+<h2 id="tophead">CUCC Expedition Handbook - New Entrance data</h2>
+<h1>Creating a new entrance in the online system</h1>
+
+<h2>Great, I have discovered a new cave...</h2>
+<p>If you have not come to this page from the sequence starting at <a href="newcave.html">Starting a New Cave"</a> then go and read that first.
+
+<div style="width:100%;height:50px;background:#C8E1E2" align="center">
+This page outlines step 7 of the survey production process. Each step is documented separately.<br />
+ <!-- Yes we need some proper context-marking here, breadcrumb trails or something.
+ Maybe a colour scheme for just this sequence of pages
+ -->
+<a href="newcave.html">1</a>
+ - <a href="newwallet.html">2</a>
+ - <a href="newsurvex.html">3</a>
+ - <a href="drawup.htm">4</a>
+ - <a href="newrig.html">5</a>
+ - <a href="caveentry.html">6</a>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a>
+</div>
+<h2>Process</h2>
+<p>
+ This page follows directly on from creating a new cave. If you haven't read thos pages, please go back and do so.</p>
+</p>
+<h3>Two ways of creating a new entrance in the online system</h3>
+<ul>
+ <li>Filling in the online form</li>
+ <li>Editing a file and uploading it</li>
+</ul>
+<p>exactly analogously to creating a new cave.</p>
+
+ <h2>Recommended procedure</h2>
+
+ <p>
+ As with a cave, you will find the process a lot easier to follow if you Edit an existing entrance first.
+ </p>
+
+ <h3>Edit Entrance form</h3>
+ <p>New in 2021 are fields for the latitude and logitude (WGS84 - the same as your GPS displays). These should be entred 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>
+<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 />
+ <p>Back to the previous page in this sequence <a href="newrig.html">New rigging guide</a>.
+ <br />A side trip to see an explantion of all <a href="caveentryfields.html">the fields on the form</a>
+ <br />A side trip to see how to do this as a file upload process using git, the <a href="newcavefile.html">cave description data file</a>
+ <br />Now go the the next page in this sequence <a href="cavedescription.html">Write the full cave descriptions with diagrams</a>.
+
+
+
+ <hr />
+</body>
+<html>
diff --git a/handbook/survey/lasers.htm b/handbook/survey/lasers.htm
index 0d5d32de6..89cb886fa 100644
--- a/handbook/survey/lasers.htm
+++ b/handbook/survey/lasers.htm
@@ -10,6 +10,16 @@
<h2 id="tophead">CUCC Expo Surveying Handbook</h2>
<h1>Geographical fixed points on Loser</h1>
+<h3>Note to readers in the 2020s</h3>
+<p>While this page is mostly <em>correct</em>, it is most definitely not <em>current</em>.
+It was written in 2001 and last seriously updated in 2006.
+These days the Austrians use WGS84 GPS like eveyone else.
+<p>For the nitty gritty about coordinate systems in Austria see:<br>
+<a href="coord2.htm">GPS and coordinate systems</a><br>
+<a href="coord.htm">Basic Coordinate Systems</a>.
+
+
+<h3>Original description - Historical record</h3>
<p>The coordinate system used by the Austrian Kataster is called the
Gauß + Krüger Landeskoordinatensystem, which is supposedly
identical to the widely used Universal Transverse Mercator system (Gauß
diff --git a/handbook/survey/newcave.html b/handbook/survey/newcave.html
index 034ef3c85..fe9a92ffb 100644
--- a/handbook/survey/newcave.html
+++ b/handbook/survey/newcave.html
@@ -35,7 +35,8 @@ This page outlines step 1 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a>
</div>
<h2>Process</h2>
<p>After 40 years or so, we have a well-defined process which you will need to learn.
diff --git a/handbook/survey/newrig.html b/handbook/survey/newrig.html
index d4fdb7b2c..7c5581bf9 100644
--- a/handbook/survey/newrig.html
+++ b/handbook/survey/newrig.html
@@ -31,8 +31,8 @@ This page outlines step 5 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
-</div>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a></div>
</ul>
<h2>Process</h2>
<p>
diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html
index 6a3dfd38e..f5ce47a45 100644
--- a/handbook/survey/newsurvex.html
+++ b/handbook/survey/newsurvex.html
@@ -24,8 +24,9 @@ This page outlines step 3 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
-</div>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a>
+ </div>
<h2>Process</h2>
<p>In principle you do not need any software other than a text editor to create a survex file.
So you do not need to have installed survex on your laptop at this point.
diff --git a/handbook/survey/newwallet.html b/handbook/survey/newwallet.html
index d2a0c5b24..17999d0a3 100644
--- a/handbook/survey/newwallet.html
+++ b/handbook/survey/newwallet.html
@@ -24,8 +24,8 @@ This page outlines step 2 of the survey production process. Each step is documen
- <a href="drawup.htm">4</a>
- <a href="newrig.html">5</a>
- <a href="caveentry.html">6</a>
- - <a href="cavedescription.html">7</a>
-</div>
+ - <a href="ententry.html">7</a>
+ - <a href="cavedescription.html">8</a></div>
<h2>Process</h2>
<p>