diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave.html | 3 | ||||
| -rw-r--r-- | templates/dataformat/entrance.xml | 3 | ||||
| -rw-r--r-- | templates/eastings.html | 6 | ||||
| -rw-r--r-- | templates/entrance_html.kml | 7 |
4 files changed, 3 insertions, 16 deletions
diff --git a/templates/cave.html b/templates/cave.html index 4a6e7d8..870df95 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -186,9 +186,6 @@ {% 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.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 %} diff --git a/templates/dataformat/entrance.xml b/templates/dataformat/entrance.xml index 7c0c775..98ca575 100644 --- a/templates/dataformat/entrance.xml +++ b/templates/dataformat/entrance.xml @@ -47,12 +47,9 @@ though, you do not need to do a data import as it happens automatically --> <findability>{{ entrance.findability|default_if_none:""|safe }}</findability> <findability_description>{{ entrance.findability_description|default_if_none:""|safe }}</findability_description> <alt>{{ entrance.alt|default_if_none:""|safe }}</alt> -<northing>{{ entrance.northing|default_if_none:""|safe }}</northing> -<easting>{{ entrance.easting|default_if_none:""|safe }}</easting> <lat_wgs84>{{ entrance.lat_wgs84|default_if_none:""|safe }}</lat_wgs84> <long_wgs84>{{ entrance.long_wgs84|default_if_none:""|safe }}</long_wgs84> <tag_station>{{ entrance.tag_station|default_if_none:""|safe }}</tag_station> -<exact_station>{{ entrance.exact_station|default_if_none:""|safe }}</exact_station> <other_station>{{ entrance.other_station|default_if_none:""|safe }}</other_station> <other_description>{{ entrance.other_description|default_if_none:""|safe }}</other_description> <bearings>{{ entrance.bearings|default_if_none:""|safe }}</bearings> diff --git a/templates/eastings.html b/templates/eastings.html index 21a40e6..32a628e 100644 --- a/templates/eastings.html +++ b/templates/eastings.html @@ -28,7 +28,7 @@ th, td { <table> <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> +<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"> @@ -45,9 +45,7 @@ th, 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.exact_station}}</td> - <td style="text-align:right">{{ent.tag_es.x|floatformat:0}}</td> - <td style="text-align:right">{{ent.tag_es.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> diff --git a/templates/entrance_html.kml b/templates/entrance_html.kml index 902102c..a9e50a9 100644 --- a/templates/entrance_html.kml +++ b/templates/entrance_html.kml @@ -33,18 +33,13 @@ {% if entrance.explorers %} <dt>Explorers</dt><dd>{{ entrance.explorers|safe }}</dd> {% endif %} - {% if entrance.northing %} - <dt>Location</dt><dd>?BMN? Northing: {{ entrance.northing|safe }}, Easting: {{ entrance.easting|safe }}, {{ entrance.alt|safe }}m</dd> - {% endif %} {% if entrance.tag_station %} <dt>Tag Location</dt><dd>{{ entrance.tag_station }} {{ entrance.tag.latlong.0|floatformat:5 }}N {{ entrance.tag.latlong.1|floatformat:5 }}E - UTM33 {{ entrance.tag.y|floatformat:0 }}, {{ entrance.tag.x|floatformat:0 }}, {{ entrance.tag.z|floatformat:0 }}m</dd> {% endif %} {% if entrance.bearings %} <dt>Bearings</dt><dd>{{ entrance.bearings|safe }}</dd> {% endif %} - {% if entrance.exact_station %} - <dt>Exact Station</dt><dd>{{ entrance.exact_station|safe }} {{ entrance.exact_location.latlong.0|floatformat:5 }}N {{ entrance.exact_location.latlong.1|floatformat:5 }}E - UTM33 {{ entrance.exact_location.y|floatformat:0 }}, {{ entrance.exact_location.x|floatformat:0 }}, {{ entrance.exact_location.z|floatformat:0 }}m</dd> - {% endif %} + {% if entrance.other_station %} <dt>Other Station</dt><dd>{{ entrance.other_station|safe }} {% if entrance.other_description %} |