summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/eastings.html27
1 files changed, 7 insertions, 20 deletions
diff --git a/templates/eastings.html b/templates/eastings.html
index 17b19b2..21a40e6 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -5,17 +5,6 @@
<h1>Entrance locations</h1>
-<p>
-These first two tables are all the Caves which have <em>manual</em> locations specified as Northing/Easting coordinates in their Cave Entrance Description data.
-<p>
-This report is to help you sort out and fix the bad data in our records. You can see from the tables here
-that UTM data sometimes have Northings and Eastings swapped, or UTM is used when it is intended to be
-BMN and vice versa.
-
-<p>All surveyed caves have entrance locations fixed by the survex data, as survey stations with names such as
-1623.p277a . This is the reliable data and is shown in the third table. The reason why we have manual data is because when a
-cave entrance is first discovered, it is not yet connected to the survey network. But we want to record its position
-otherise we will lose it.
<p>
Coordinate systems in Austria are explained in:<br>
@@ -35,12 +24,11 @@ th, td {
</style>
<p>
-{% for ent in ents %}
-*fix {{ent.pslug}} {{ent.bmn_e|floatformat:0}} {{ent.bmn_n|floatformat:0}} {{ent.bmn_alt|floatformat:0}}<br />
-{% endfor %}
-<p>and what those stations are:
+
+
<table>
-<tr><th>Cave</th><th>tag</th><th>tag x</th><th>tag y</th><th>tag exact</th><th>exact x</th><th>exact y</th><th>tag other</th><th>other x</th><th>other y</th></tr>
+<tr><th>Cave</th><th>Ent slug</th>
+<th>tag</th><th>tag x</th><th>tag y</th><th>tag exact</th><th>exact x</th><th>exact y</th><th>tag other</th><th>other x</th><th>other y</th></tr>
{% for ent in ents %}
<tr>
<td style="text-align:left">
@@ -53,6 +41,7 @@ th, td {
{% endif %}</a><br>
{% endfor %}</td>
+ <td style="text-align:right">{{ent.slug}}</td>
<td style="text-align:right">{{ent.tag_station}}</td>
<td style="text-align:right">{{ent.tag_ts.x|floatformat:0}}</td>
<td style="text-align:right">{{ent.tag_ts.y|floatformat:0}}</td>
@@ -71,7 +60,7 @@ th, td {
<tr><th>Cave</th>
<th>Alt</th>
<th>GPS Lat</th><th>GPS Long</th>
-<th>best Lat</th><th>best Long</th><th>tag</th><th>tag Lat</th><th>tag Long</th>
+<th>best Lat</th><th>best Long</th>
</tr>
{% for ent in gpsents %}
<tr>
@@ -90,9 +79,7 @@ th, td {
<td style="text-align:right">{{ent.long_wgs84|floatformat:6}}</td>
<td style="text-align:right">{{ent.lat|floatformat:6}}</td>
<td style="text-align:right">{{ent.long|floatformat:6}}</td>
- <td style="text-align:right">{{ent.tag_station}}</td>
- <td style="text-align:right">{{ent.tag_ts.lat|floatformat:6}}</td>
- <td style="text-align:right">{{ent.tag_ts.long|floatformat:6}}</td>
+
</tr>
{% endfor %}
</table>