From f706bd814e9c5daecbed52e5be806b9fb2addae3 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Fri, 27 Oct 2023 22:23:03 +0300
Subject: [PATCH] add SRTM alts
---
templates/eastings.html | 50 ++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/templates/eastings.html b/templates/eastings.html
index 32a628e..0bc23f0 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -5,6 +5,33 @@
<h1>Entrance locations</h1>
+<p>This next table is of all the survex stations in troggle: i.e. only those survey stations which have been identified with an Entrance by manually editing the Entrance data.
+<table cellpadding="6" cellspacing="8">
+<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>alt</th><th>SRTM alt</th><th>Used on ent</th></tr>
+{% for s in stations %}
+<tr>
+ <td style="text-align:left; width:240px"> {{s.name|safe}} </td>
+ <td style="text-align:right; width:90px"> {{s.x|floatformat:2}} </td>
+ <td style="text-align:right; width:90px"> {{s.y|floatformat:2}} </td>
+ <td style="text-align:right; width:90px"> {{s.lat|floatformat:6}} </td>
+ <td style="text-align:right; width:90px"> {{s.long|floatformat:6}} </td>
+ <td style="text-align:right; width:90px"> {{s.z|floatformat:0}} </td>
+ <td style="text-align:right; width:90px"> {{s.srtm_diff.0|safe}} </td>
+ <td style="text-align:right;" > {{s.entrance|safe}} </td>
+</tr>
+{% empty %}
+ <td colspan="3"> NO STATION DATA - This is due to survex (cavern) failing on the entire dataset.
+ <br>See <a href="/dataissues">DataIssues</a> 'survex' section .
+ <br>Resolve the survex errors and do a full databasereset import.
+ <br>You should look at the .log and .err files produced by survex in the :loser: repo folder first.
+ <br>
+ <br>Probably, the generaton of the .3d file has failed, so the .pos file is not generated.
+ <br> Look for a message like this 'Failed to find /mnt/d/EXPO/loser/1623-and-1626-no-schoenberg-hs.3d so aborting generation of new .pos, using old one if present'
+ </td>
+{% endfor %}
+</table>
+
+
<p>
Coordinate systems in Austria are explained in:<br>
@@ -93,28 +120,5 @@ the assemblage of survex files, including fixed point files, and is probably 'co
<a href="/handbook/survey/coord2.html">GPS and coordinate systems</a><br>
<a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>.
-<p>This next table is of all the survex stations in troggle: i.e. only those survey stations which have been identified with an Entrance by manually editing the Entrance data.
-<table cellpadding="6" cellspacing="8">
-<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>Used on ent</th></tr>
-{% for s in stations %}
-<tr>
- <td style="text-align:left; width:240px"> {{s.name|safe}} </td>
- <td style="text-align:right; width:90px"> {{s.x|floatformat:2}} </td>
- <td style="text-align:right; width:90px"> {{s.y|floatformat:2}} </td>
- <td style="text-align:right; width:90px"> {{s.lat|floatformat:6}} </td>
- <td style="text-align:right; width:90px"> {{s.long|floatformat:6}} </td>
- <td style="text-align:right;" > {{s.entrance|safe}} </td>
-</tr>
-{% empty %}
- <td colspan="3"> NO STATION DATA - This is due to survex (cavern) failing on the entire dataset.
- <br>See <a href="/dataissues">DataIssues</a> 'survex' section .
- <br>Resolve the survex errors and do a full databasereset import.
- <br>You should look at the .log and .err files produced by survex in the :loser: repo folder first.
- <br>
- <br>Probably, the generaton of the .3d file has failed, so the .pos file is not generated.
- <br> Look for a message like this 'Failed to find /mnt/d/EXPO/loser/1623-and-1626-no-schoenberg-hs.3d so aborting generation of new .pos, using old one if present'
- </td>
-{% endfor %}
-</table>
{% endblock %}
\ No newline at end of file