tidied tables of stations and entrances

core/models/survex.py

@@ -86,14 +86,16 @@ class SurvexStation(models.Model):
         diff = alt - self.z
         if diff >= 0:
             colour = "blue"
+            sign = "+"
         else:
             colour = "red"
+            sign = ""
             
         if abs(diff) > 60:
             weight = "bold"
         else:
             weight = "normal"
-        diff_str = f"<span style='color:{colour}; font-weight:{weight}'>{diff:.0f}</span>"
+        diff_str = f"<span style='color:{colour}; font-weight:{weight}'>{sign}{diff:.0f}</span>"
        
         return diff_str, ref
  

templates/entranceindex.html

@@ -16,10 +16,12 @@
 <tbody>
 <ul>
 {% for entrance in entrances %}
-<tr><td>{{ entrance }}</td><td>{% for cave in entrance.cavelist %}<a href="{{ cave.url }}">{{ cave }}</a>{% endfor %}</td><td>
+<tr><td>{{ entrance }}</td><td>{% for cave in entrance.cavelist %}<a href="{{ cave.url }}">{{ cave }}</a>{% endfor %}</td>
+<td id="{{ entrance.best_station }}"><a href="/stations#{{ entrance.best_station }}">
 {% if entrance.best_station%}
 {{ entrance.best_station }}
-{% endif %}</td>
+{% endif %}
+</a></td>
 <td>{% if entrance.tag %}
 <a href="https://www.openstreetmap.org/?mlat={{ entrance.tag.latlong.0|floatformat:7}}&mlon={{entrance.tag.latlong.1|floatformat:7}}">{{ entrance.tag.latlong.0|floatformat:5}} N, {{ entrance.tag.latlong.1|floatformat:5 }} E</a>
 {% endif %}</td>

templates/stations.html

@@ -3,22 +3,28 @@
 
 {% block content %}
 
+<style>
+th, td {
+ padding-left: 5px;
+ padding-right: 5px;
+}
+</style>
 <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<br> alt</th><th>SRTM<br> ref</th><th>Used on ent</th><th>Cave</th></tr>
+<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>alt</th><th>SRTM<br> alt</th><th>SRTM<br> ref</th><th>Used on <br />this Entrance</th><th>Cave</th></tr>
 {% for s in stations %}
 <tr>
-  <td style="text-align:left; "> {{s.name|safe}} </td>
+  <td style="text-align:left; " id="{{s.name|safe}}"> <a href="/entrances#{{s.name|safe}}">{{s.name|safe}}</a> </td>
   <td style="text-align:right; width:10"> {{s.x|floatformat:2}} </td>
   <td style="text-align:right; width:10"> {{s.y|floatformat:2}} </td>
   <td style="text-align:right; width:10"> <em>{{s.lat|floatformat:6}} </em></td>
   <td style="text-align:right; width:10"> <em>{{s.long|floatformat:6}} </em></td>
   <td style="text-align:right; "> {{s.z|floatformat:0}} </td>
   <td style="text-align:right; "> {{s.srtm_diff.0|safe}} </td>
-  <td style="text-align:right; "> {{s.srtm_diff.1|floatformat:0}}m <small></small></td>
+  <td style="text-align:right; "> {{s.srtm_diff.1|floatformat:0}} </td>
-  <td style="text-align:right;" > <a href="/cave/{{s.entrance.firstcave|safe}}">{{s.entrance|safe}}</a> </td>
+  <td style="text-align:right;" > <small><a href="/cave/{{s.entrance.firstcave|safe}}">{{s.entrance|safe}}</a></small> </td>
   <td style="text-align:right;" > <small>
     {% if s.entrance.firstcave.official_name %}
         {{s.entrance.firstcave.official_name|safe}}
@@ -41,52 +47,10 @@
 
 <p>The SRTM altitude is that measured at a nearby reference point. The horizontal distance between the survey station and the SRTM reference point is shown in the "SRTM ref" column. It is always less than 35m for our dataset. Differences between the recorded altitude and the SRTM altitude are in <b>bold</b> if the discrepancy is more than 60m vertically.
 
-<p>
-Coordinate systems in Austria are explained in:<br>
-<a href="/handbook/survey/lasers.htm">Geographical fixed points on Loser</a><br>
-<a href="/handbook/survey/coord2.html">GPS and coordinate systems</a><br>
-<a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>.
 
-<p>The data in the table immediately below has been hand-entered and is sometimes very wrong.
+<h3>These caves have GPS data directly on them, not via survex survey stations</h3>
-<p>The Lat. Long. coordinates are manually entered using a phone or a hand-held GPS device at (or near) the entrance.
+<p>Because these are only vague locations identified from aerial photos, they have not
-<p>For the Cave column, if there is an official cave name, then it is shown. 
+been surveyed to. 
-Otherwise whatever other name we can find for it is shown <em>in italics</em>.
-
-<style> 
-th, td {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-</style>
-
-<table>
-<tr><th>Cave</th><th>Ent slug</th>
-<th>tag</th><th>tag x</th><th>tag 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">
-  {% 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.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>
-
-  <td style="text-align:right">{{ent.other_station}}</td>
-  <td style="text-align:right">{{ent.tag_os.x|floatformat:0}}</td>
-  <td style="text-align:right">{{ent.tag_os.y|floatformat:0}}</td>
- </tr>
-{% endfor %}
-</table>
-
-<h3>and now the GPS equivalents</h3>
 <table>
 <tr><th>Cave</th>
 <th>Alt</th>
@@ -117,15 +81,18 @@ th, td {
 
 <h3>All entrances in Trogggle</h3>
 <p> See also <a href="/entrances">Entrances list</a>.
-<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 
+<p>But the Entrances - the objects in the troggle system - are not identical to the dataset Survey Stations which is the combined set of survex data. They are only linked - and only implicitly - by the station name, e.g. '1623.gps00.p78' which refers to a *fix line in one of the survex files (in the fixedpts/ folder). Each Entrance can have two stations associated with it: the tag station and the other station.
-the assemblage of survex files, including fixed point files, and is probably 'correct'. 
+
-<p>But which coordinate system are they in ? Read these three articles to find out:
+<p>
-<br>
+Coordinate systems in Austria are explained in:<br>
-<a href="/stations">Troggle UTM and lat./lomg. and altitude report</a><br>
-<a href="/entrances">Troggle entrances</a><br>
 <a href="/handbook/survey/lasers.htm">Geographical fixed points on Loser</a><br>
 <a href="/handbook/survey/coord2.html">GPS and coordinate systems</a><br>
 <a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>.
+<br>
+
+<a href="/stations">Troggle UTM and lat./lomg. and altitude report</a><br>
+<a href="/entrances">Troggle entrances</a><br>
+
 
 
 {% endblock %}