1 files changed, 34 insertions, 2 deletions
diff --git a/templates/eastings.html b/templates/eastings.html
index 3def5c3..6aa4c6d 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -29,7 +29,7 @@ th, td {
   padding-right: 5px;
 </style>
 <table>
-<tr><th>Cave</th><th>Entrance</th><th>Easting</th><th>Northing</th><th>Lat</th><th>Long</th><th>tag</th><th>tag exact</th><th>tag other</th><th>slug</th></tr>
+<tr><th>Cave</th><th>Entrance</th><th>best Easting</th><th>best Northing</th><th>GPS Lat</th><th>GPS Long</th><th>tag</th><th>tag exact</th><th>tag other</th><th>slug</th></tr>
 {% for ent in ents %}
 <tr>
   <td style="text-align:left">
@@ -59,6 +59,35 @@ th, td {
 </tr>
 {% endfor %}
 </table>
+<p>and now with the locations of the survey stations. All as UTM eatings, norhtings:
+<table>
+<tr><th>Cave</th><th>best Lat</th><th>best Long</th><th>tag</th><th>tag Lat</th><th>tag Long</th><th>tag exact</th><th>exact Lat</th><th>exact Long</th><th>tag other</th><th>other Lat</th><th>other Long</th></tr>
+{% for ent in ents %}
+<tr>
+  <td style="text-align:left">
+  {% for c in ent.cavelist %}
+    <a href="/{{c.url}}">
+    {% if c.official_name %}
+        {{c.official_name|safe}}
+    {% else %}
+        <em>{{c|safe}}</em>
+    {% endif %}</a><br>
+  {% endfor %}</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>
+  <td style="text-align:right">{{ent.exact_station}}</td>
+  <td style="text-align:right">{{ent.tag_es.lat|floatformat:6}}</td>
+  <td style="text-align:right">{{ent.tag_es.long|floatformat:6}}</td>
+  <td style="text-align:right">{{ent.other_station}}</td>
+  <td style="text-align:right">{{ent.tag_os.lat|floatformat:6}}</td>
+  <td style="text-align:right">{{ent.tag_os.long|floatformat:6}}</td>
+ </tr>
+{% endfor %}
+</table>
 
 <p>But the Entrances - the objects in the troggle system - are not properly connected to the dataset which is the combined set of survex data. They are only linked - and only implicitly - by the tag name. The data in the table below is calculated directly from 
 the assemblage of survex files, including fixed point files, and is probably 'correct'. 
@@ -70,12 +99,15 @@ the assemblage of survex files, including fixed point files, and is probably 'co
 <a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>.
 
 <table cellpadding="6" cellspacing="8">
-<tr><th>Survex Station</th><th>x</th><th>y</th></tr>
+<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</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>
+  
 </tr>
 {% empty %}
   <td colspan="3"> NO STATION DATA - This is due to survex (cavern) failing on the entire dataset.