From 0cd527761e5106ebdd6a640634f5b1a681d61831 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Wed, 11 Oct 2023 20:53:41 +0300
Subject: [PATCH] easting first, then northing: always

---
 templates/cave.html     | 8 ++++----
 templates/eastings.html | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/templates/cave.html b/templates/cave.html
index f3b36db..4a6e7d8 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -175,25 +175,25 @@
             <dt>Explorers</dt><dd>{{ ent.entrance.explorers|safe }}</dd>
         {% endif %}
         {% if ent.entrance.northing %}
-            <dt>Location</dt><dd> Northing: {{ ent.entrance.northing|safe }}, Easting: {{ ent.entrance.easting|safe }} (UTM or BMN, depending...), {{ ent.entrance.alt|safe }}m</dd>
+            <dt>Location</dt><dd> Easting: {{ ent.entrance.easting|safe }}, Northing: {{ ent.entrance.northing|safe }}  (UTM or BMN, depending...), {{ ent.entrance.alt|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.lat_wgs84 %}
             <dt>Location</dt><dd><a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.lat_wgs84|floatformat:7}}&mlon={{ent.entrance.long_wgs84|floatformat:7}}">WGS84 Lat.: {{ ent.entrance.lat_wgs84|floatformat:7 }} N, Long.:{{ ent.entrance.long_wgs84|floatformat:7 }} E</a></dd>
         {% endif %}
         {% if ent.entrance.tag_station %}
-            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.tag.latlong.0}}&mlon={{ent.entrance.tag.latlong.1}}">{{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E</a> (UTM33 {{ ent.entrance.tag.y|floatformat:0 }}, {{ ent.entrance.tag.x|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m</dd>
+            <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.tag.latlong.0}}&mlon={{ent.entrance.tag.latlong.1}}">{{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E</a> (UTM33 {{ ent.entrance.tag.x|floatformat:0 }}, {{ ent.entrance.tag.y|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m</dd>
         {% endif %}
         {% if ent.entrance.bearings %}
             <dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
         {% endif %}
         {% if ent.entrance.exact_station %}
-            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }}<a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.exact_location.latlong.0}}&mlon={{ent.entrance.exact_location.latlong.1}}"> {{ ent.entrance.exact_location.latlong.0|floatformat:7 }}N {{ ent.entrance.exact_location.latlong.1|floatformat:7 }}E</a> (UTM33 {{ ent.entrance.exact_location.y|floatformat:0 }}, {{ ent.entrance.exact_location.x|floatformat:0 }}), {{ ent.entrance.exact_location.z|floatformat:0 }}m</dd>
+            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }}<a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.exact_location.latlong.0}}&mlon={{ent.entrance.exact_location.latlong.1}}"> {{ ent.entrance.exact_location.latlong.0|floatformat:7 }}N {{ ent.entrance.exact_location.latlong.1|floatformat:7 }}E</a> (UTM33 {{ ent.entrance.exact_location.x|floatformat:0 }}, {{ ent.entrance.exact_location.y|floatformat:0 }}), {{ ent.entrance.exact_location.z|floatformat:0 }}m</dd>
         {% endif %}
         {% if ent.entrance.other_station %}
             <dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
         {% if ent.entrance.other_description %}
             - {{ ent.entrance.other_description|safe }}
-        {% endif %} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.other_location.latlong.0}}&mlon={{ent.entrance.other_location.latlong.1}}"> {{ ent.entrance.other_location.latlong.0|floatformat:7 }}N {{ ent.entrance.other_location.latlong.1|floatformat:7 }}E</a> (UTM33 {{ ent.entrance.other_location.y|floatformat:0 }}, {{ ent.entrance.other_location.x|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m
+        {% endif %} <a href="https://www.openstreetmap.org/?mlat={{ ent.entrance.other_location.latlong.0}}&mlon={{ent.entrance.other_location.latlong.1}}"> {{ ent.entrance.other_location.latlong.0|floatformat:7 }}N {{ ent.entrance.other_location.latlong.1|floatformat:7 }}E</a> (UTM33 {{ ent.entrance.other_location.x|floatformat:0 }}, {{ ent.entrance.other_location.y|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m
         </dd>
         {% endif %}
           </dl>  
diff --git a/templates/eastings.html b/templates/eastings.html
index e759c42..a269ba5 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -70,6 +70,14 @@ Such converted eastings and northings are <em>in italics</em> in the table below
 </tr>
 {% endfor %}
 </table>
+<p>For Radost's tool, but remember, these are hacked-up BMN conversions, not real.<br />
+{% for ent in ents %}
+33T {{ent.easting|floatformat:1}} {{ent.northing|floatformat:1}} <br />
+{% endfor %}
+<p>
+{% for ent in ents %}
+*fix x{{ent.slug}} {{ent.easting|floatformat:2}} {{ent.northing|floatformat:2}} {{ent.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>