expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 22:17:06 +00:00
Code Issues 18 Projects 3 Activity

*fix suggestions more

Browse Source
This commit is contained in:
Philip Sargent
2025-07-13 18:29:45 +03:00
parent c2292038c4
commit 6cf7bbb7d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/cave.html
View File

@@ -188,14 +188,15 @@ Nope, it is not useful, removing it... Philip S.
{% if ent.entrance.lat_wgs84 %} {% 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> <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>
<p>This would be eventually replaced with something like this in the appropriate gps file in the <var>fixedpts/gps/</var> folder: <p>This would be eventually replaced with something like this in the appropriate gps file in the <var>fixedpts/gps/</var> folder
for the kataster area <var>{{cave.areacode}}</var> :
<pre><code>*begin <pre><code>*begin
*cs out UTM33 *cs out UTM33
*cs LONG-LAT *cs LONG-LAT
*fix p{{ ent.entrance.name|lower|safe }} {{ent.entrance.long_wgs84|floatformat:7}} {{ ent.entrance.lat_wgs84|floatformat:7 }} {% if ent.entrance.alt %}{{ ent.entrance.alt|safe }}{% else%}0.0{% endif %} *fix p{{ ent.entrance.name|lower|safe }} {{ent.entrance.long_wgs84|floatformat:7}} {{ ent.entrance.lat_wgs84|floatformat:7 }} {% if ent.entrance.alt %}{{ ent.entrance.alt|safe }}{% else%}0.0{% endif %}
*end</code></pre> *end</code></pre>
and the appropriate <var>*equate</var> and <var>*entrance</var> fields in the survex file <var>{{cave.survex_file|safe}}</var> and the appropriate <var>*equate</var> and <var>*entrance</var> fields in the survex file <var>{{cave.survex_file|safe}}</var>
to equate p{{ ent.entrance.name|lower|safe }} to the actual survey station. to equate <var>p{{ ent.entrance.name|lower|safe }}</var> to the actual survey station. The WGS84 fields on the entrance edit form would be deleted, and a Tag/Other survex station id to <var>{{cave.areacode}}.p{{ ent.entrance.name|lower|safe }} </var>used instead.
{% endif %} {% endif %}
{% if ent.entrance.tag_station %} {% 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.x|floatformat:0 }}, {{ ent.entrance.tag.y|floatformat:0 }}), {{ ent.entrance.tag.z|floatformat:0 }}m (SRTM is {{ ent.entrance.tag.srtm_diff.0|safe }} m, distance from reference: {{ent.entrance.tag.srtm_alt.1|floatformat:0}}m) <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 (SRTM is {{ ent.entrance.tag.srtm_diff.0|safe }} m, distance from reference: {{ent.entrance.tag.srtm_alt.1|floatformat:0}}m)