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 @@
Explorers
{{ ent.entrance.explorers|safe }}
{% endif %} {% if ent.entrance.northing %} -
Location
Northing: {{ ent.entrance.northing|safe }}, Easting: {{ ent.entrance.easting|safe }} (UTM or BMN, depending...), {{ ent.entrance.alt|safe }}m
+
Location
Easting: {{ ent.entrance.easting|safe }}, Northing: {{ ent.entrance.northing|safe }} (UTM or BMN, depending...), {{ ent.entrance.alt|safe }}m
{% endif %} {% if ent.entrance.lat_wgs84 %}
Location
WGS84 Lat.: {{ ent.entrance.lat_wgs84|floatformat:7 }} N, Long.:{{ ent.entrance.long_wgs84|floatformat:7 }} E
{% endif %} {% if ent.entrance.tag_station %} -
Tag Location
{{ ent.entrance.tag_station }} {{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E (UTM33 {{ ent.entrance.tag.y|floatformat:0 }}, {{ ent.entrance.tag.x|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m
+
Tag Location
{{ ent.entrance.tag_station }} {{ ent.entrance.tag.latlong.0|floatformat:5 }}N {{ ent.entrance.tag.latlong.1|floatformat:5 }}E (UTM33 {{ ent.entrance.tag.x|floatformat:0 }}, {{ ent.entrance.tag.y|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m
{% endif %} {% if ent.entrance.bearings %}
Bearings
{{ ent.entrance.bearings|safe }}
{% endif %} {% if ent.entrance.exact_station %} -
Exact Station
{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.latlong.0|floatformat:7 }}N {{ ent.entrance.exact_location.latlong.1|floatformat:7 }}E (UTM33 {{ ent.entrance.exact_location.y|floatformat:0 }}, {{ ent.entrance.exact_location.x|floatformat:0 }}), {{ ent.entrance.exact_location.z|floatformat:0 }}m
+
Exact Station
{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.latlong.0|floatformat:7 }}N {{ ent.entrance.exact_location.latlong.1|floatformat:7 }}E (UTM33 {{ ent.entrance.exact_location.x|floatformat:0 }}, {{ ent.entrance.exact_location.y|floatformat:0 }}), {{ ent.entrance.exact_location.z|floatformat:0 }}m
{% endif %} {% if ent.entrance.other_station %}
Other Station
{{ ent.entrance.other_station|safe }} {% if ent.entrance.other_description %} - {{ ent.entrance.other_description|safe }} - {% endif %} {{ ent.entrance.other_location.latlong.0|floatformat:7 }}N {{ ent.entrance.other_location.latlong.1|floatformat:7 }}E (UTM33 {{ ent.entrance.other_location.y|floatformat:0 }}, {{ ent.entrance.other_location.x|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m + {% endif %} {{ ent.entrance.other_location.latlong.0|floatformat:7 }}N {{ ent.entrance.other_location.latlong.1|floatformat:7 }}E (UTM33 {{ ent.entrance.other_location.x|floatformat:0 }}, {{ ent.entrance.other_location.y|floatformat:0 }}), {{ ent.entrance.other_location.z|floatformat:0 }}m
{% endif %} 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 in italics in the table below {% endfor %} +

For Radost's tool, but remember, these are hacked-up BMN conversions, not real.
+{% for ent in ents %} +33T {{ent.easting|floatformat:1}} {{ent.northing|floatformat:1}}
+{% endfor %} +

+{% for ent in ents %} +*fix x{{ent.slug}} {{ent.easting|floatformat:2}} {{ent.northing|floatformat:2}} {{ent.alt|floatformat:0}}
+{% endfor %}

and what those stations are:
Cavetagtag xtag ytag exactexact xexact ytag otherother xother y