expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-31 07:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document Scan Upload and Drawing Upload forms

Browse Source
This commit is contained in:
Philip Sargent 2021-05-04 15:41:17 +01:00
parent 567c30f5d7
commit 7a44e7a1f6
6 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handbook/computing/onlinesystems.html
View File

@ -22,14 +22,15 @@ This page is the overview. The online systems manuals are split into these secti
<ul>
<li><a href="manual.html"><b>Data maintenance</b></a> - for cavers finding and updating cave survey data using the software tools.
<ul>
<li><a href="../survey/status.html">Monitoring</a> the cave survey workflow status</li>
<li><a href="todo-data.html">To-do</a> - data maintenance to-do list
<li><a href="../treasurer.html">Accounts</a> - the Bank of Expo, the bier book
<li><a href="newyear.html">the next expo</a> - preparing for next year
</ul>
<li><a href="../survey/index.htm"><b>Survey handbook</b></a> - how to input cave survey data.
<li><a href="hbmanual1.html"><b>Handbook maintenance</b></a> - how to improve and update what you are reading now.
<li><a href="../troggle/trogintro.html"><b>System maintenance</b></a> - how to fix and enhance the software tools we have written:
<ul>
<li><a href="newyear.html">the next expo</a> - preparing for next year
<li><a href="../computing/repos.html">The repositories</a></li>
<li><a href="todo.html">To-do</a> - online systems to-do list
<li><a href="../troggle/trogmanual.html">Troggle</a> - the system framework
@ -46,7 +47,6 @@ This page is the overview. The online systems manuals are split into these secti
<li><a href="../logbooks.html">Uploading typed logbooks</a></li>
<li><a href="gpxupload.html">Uploading GPS tracks</a></li>
<li><a href="../survey/newcave.html">Recording a new cave discovery</a></li>
<li><a href="../survey/status.html">Monitoring the cave survey workflow status</a></li>
<li><a href="manual.html">Data maintenance</a> - finding and updating cave survey data using online tools
<li><a href="yourlaptop.html">Configuring your own laptop</a> - for fixing /expofiles/ files with rsync and software work</li>
</ul>

34
handbook/survey/caveentry.html
View File

@ -45,8 +45,36 @@ This page outlines step 6 of the survey production process. Each step is documen
to have some idea what is going on behind the scenes. So you are recommended to have a quick look
at the <a href="newcavefile.html">new cave file method</a> even if you have no intention of using it.
</p>
<h3>Guidebook description</h3>
<p>
<p>For a simple cave all the description will go into the "New Cave" form as described here. A more complex cave will have separate HTML files for the different sections and subdirectories to put them all in. Here we only describe the process for a simple cave.
<p>
Complementing the passage description in vertical bits is a <a href="newrig.html">Rigging
Guide</a>. Keep notes on this as it is the next step after drawing up the survey.
The rigging guide sections will have been written into the logbook, and the passage descriptions will
have been written into the survex files, with more lyrical descriptions written into the logbook for each trip.
<p>Write a <b>passage descriptions</b> by copying and extending the descriptions
given in all the component .svx files.
<p>This should be detailed enough to be
followed by someone in the cave who hasn't been there before, and should
include all passage names, lengths of pitches and climbs, compass directions
when this makes left/right/ahead clearer. If your passage is a connection
it is worth while writing descriptions from both directions. You will copy the collected descriptions
into the online system using the "New Cave" form but for now just ensure that you
have it all collected together.
<p>In
written descriptions, underline passage names the first time they are
mentioned, or when they are "defined".</p>
<p>
If it is a complex cave, you will type this description, and pass it on to someone more nerdy who
will file it in the right place. For a simple cave you can do it all yourself with the
the <a href="/newcave/">New Cave form</a> - but not yet.
<h2>Recommended procedure</h2>
<p>
@ -68,7 +96,7 @@ This page outlines step 6 of the survey production process. Each step is documen
somewhat obscure.
Go to the main cave index page which lists all the caves: <a href="/caves">Cave Index</a>
and on the right of the page, between the 1626 caves and the 1623 caves, it says<br />
<a href="/cave/new/">New Cave</a><br /> just above where it also says "Cave Number Index - kept updated".<br /> But don't click on it yet, first we will edit an old cave.
<a href="/newcave/">New Cave</a><br /> just above where it also says "Cave Number Index - kept updated".<br /> But don't click on it yet, first we will edit an old cave.
</p>
<h3>Edit Cave form</h3>

44
handbook/survey/drawup.htm
View File

@ -43,7 +43,7 @@ survex format</a> , run
<a href="newsurvex.html">"How to use survex" training procedure</a>.
<h3 id="runsurvex">Running survex to create a centre-line</h3>
<p><em>to be documented</em>
<p>Seriously, go and follow all the rest of the links you skipped the first time in the <a href="newsurvex.html">"How to use survex" training procedure</a>.
<h3 id="rescan">Transcribing and re-scanning your sketches</h3>
<p>Use aven to print out the centre lines of the passages. Now you will have to decide whether to use Tunnel or Therion. Expo has a polciy decision on this: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also <a href="/expofiles/tunnelwiki/wiki/pages/Other_Cave_Software.html">Comparison of Tunnel to Other Cave Software</a>.
@ -70,10 +70,15 @@ Very detailed instructions for doing this in Tunnel are in <a href="/expofiles/t
<h3 id="filescans">Filing your sketches</h3>
<p>The files of your scanned and re-scanned sketches should be stored in the same folder
as the scanned notes, i.e. (for wallet #19, for expo 2018) you would put them in:
as the scanned notes, i.e. (for wallet #19, for expo 2018) you would upload them to folder
<a href="/scanupload/2018:19">2018#19</a>.
This is actually stored in:
<tt>
/home/expo/expofiles/surveyscans/2018/2018#19/
</tt>
but you don't need to know that as the Upload Scan form just uses the wallet name
<a href="/scanupload/2018:19">2018#19</a>
(but this is not where you will put your finished Tunnel or Therion vector files.)
<h3 id="therion">Using tunnel or therion for final survey production</h3>
@ -85,10 +90,11 @@ as the scanned notes, i.e. (for wallet #19, for expo 2018) you would put them in
<p>Tunnel only produces plan surveys, but they are very pretty.
<p>The tunnel (or therion) vector files should NOT stored in the same folder as the scanned notes. They will eventually
be uploaded to the version control repository
<p>The tunnel (or therion) vector files should NOT stored in the same folder as the scanned notes. You will upload
them to the version-controlled repository
<var><a href="../computing/repos.html">drawings</a></var>
but for a first attempt store them on the <em>expo laptop</em> in <var>/home/expo/drawings/{cavenumber}</var>.
using the <a href="/dwgupload/">Upload Drawings</a> form. You will put them in <a href="/dwgupload/uploads">the Uploads Folder</a>. You can create your new subfolders there by typing them in to the browser address bar, e.g. <a href="/dwgupload/uploads/my_new_subfolder">my new subfolder</a>
<p>If you are working on the <em>expo laptop</em> then put them in <var>/home/expo/drawings/{cavenumber}</var>.
Look at what is in there already and ask someone which directory to put them in. It will probably be a folder like this:
<tt>
/home/expo/drawings/264-and-258/toimport/
@ -96,35 +102,7 @@ Look at what is in there already and ask someone which directory to put them in.
<h3>Guidebook description</h3>
<p>This is the last thing to do for a new cave.
The rigging guide sections will have been written into the logbook, and the passage descriptions will
have been written into the survex files, with more lyrical descriptions written into the logbook for each trip.
<p>Write a <b>passage descriptions</b> by copying and extending the descriptions
given in all the component .svx files.
<p>This should be detailed enough to be
followed by someone in the cave who hasn't been there before, and should
include all passage names, lengths of pitches and climbs, compass directions
when this makes left/right/ahead clearer. See If your passage is a connection
it is worth while writing descriptions from both directions. You will eventually copy the collected descriptions
into the online system using the<a href="newcave.html">"New Cave" form</a> but for now just ensure that you
have it all collected together.
<p>In
written descriptions, underline passage names the first time they are
mentioned, or when they are "defined".</p>
<p>
You will type this description, and pass it on to someone more nerdy who
will file it in the right place. This will involve "creating a new cave" using the <a href="../troggle/trogintro.html">troggle</a> system.
<p>Complementing the passage description in vertical bits is a <b>Rigging
Guide</b>. Keep notes on this as it is the next step after drawing up the survey.
<h3>Preparing input into to Tunnel or Therion</h3>

9
handbook/survey/newcavefile.html
View File

@ -97,6 +97,15 @@ the form and the file format however.
appear on the final published website. The URLs in the XML file <em>should be relative URLs</em> to the cave page, which <em>appears</em>
as <tt>cave/{area}/{cavenumber}</tt> on the website even though <em>internally</em> the data
is coming from <tt>cave_data/{area}-{cavenumber}.html and entrance_data/{area}-{cavenumber}.html</tt> </p>
<h3>Handy tips for images</h3>
<p>Cave description files get moved about quite a bit while a cave is being actively explored. And even if the files are not moved, the user-visible URL can move (remember the 171 and 172 caves had different levels of nesting in the url). Doing either of those breaks all the image links
<em>unless</em> you do it like this:
<ul>
<li>Do not use relative links like this <var>href = "../imgs/2020_w_01/deepandsqualid/camp5.jpg"</var>
<li>Put all the images for a cave into the same folder, and use absolute links: <var>href = "/1623/2020_w_01/i/camp5.jpg"</var> with a leading slash "/".
<li>A common idiom is to have subfolders "/i/", "/t/" and "/l/" containing respectively the full image (~600 pixels across), a thumbnail image, and an HTML file fragment of the big image with descriptive text.
</ul>
<hr />
<p>Back to the form-filling method
<a href="caveentry.html">the form-filling method</a> guide

2
handbook/survey/newwallet.html
View File

@ -93,7 +93,7 @@ in your cave in, e.g. here is the data for <a href="/survexfile/204">cave 204</a
in the right-most column titles "Scans". If you are doing an entirely new cave, then this won't exist yet but it
will be where your new discovery is eventually published.
<p>As well as following through the links on those pages, have a look at the
<a href="/tunneldata/">drawings files page</a> which lists all the scanned notes,
<a href="/dwgfiles">drawings files page</a> which lists all the scanned notes,
plan and elevation scans in the each wallet ("Scans folder" column).
<h3 id="onlinew">Scan the notes into the online wallet</h3>

4
handbook/survey/status.html
View File

@ -14,11 +14,9 @@
<p>There are two separate online systems to help you do this.
<p><b>First</b>, you look online at or for the current year: (2018 in this example)<br />
<a href="http://expo.survex.com/expofiles/surveyscans/2018/index.html"><b>/expofiles/surveyscans/2018/</b></a>
<a href="http://expo.survex.com/expofiles/surveyscans/2018/walletindex.html"><b>/expofiles/surveyscans/2018/</b></a>
<br />
(you can substitute any year after 2015 instead of 2018 in that example).
<p> or if you are chasing work unfinished from previous years look at the consolidated list 2014-2018:<br />
<a href="http://expo.survex.com/expofiles/surveyscans/2014-18/index.html"><b>/expofiles/surveyscans/2014-18/</b></a>
<br />
<p><b>Second</b>, look at the online troggle-generated table of logbook entries and survey trips<br />