diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave.html | 2 | ||||
| -rw-r--r-- | templates/eastings.html | 55 |
2 files changed, 33 insertions, 24 deletions
diff --git a/templates/cave.html b/templates/cave.html index bd1519f..00b2a5f 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -175,7 +175,7 @@ <dt>Explorers</dt><dd>{{ ent.entrance.explorers|safe }}</dd> {% endif %} {% if ent.entrance.northing %} - <dt>Location</dt><dd>UTM33 Northing: {{ ent.entrance.northing|safe }}, Easting: {{ ent.entrance.easting|safe }}, {{ ent.entrance.alt|safe }}m</dd> + <dt>Location</dt><dd> Northing: {{ ent.entrance.northing|safe }}, Easting: {{ ent.entrance.easting|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> diff --git a/templates/eastings.html b/templates/eastings.html index 646cba4..2bb57ed 100644 --- a/templates/eastings.html +++ b/templates/eastings.html @@ -27,15 +27,25 @@ Coordinate systems in Austria are explained in:<br> <p>The Lat. Long. coordinates are manually entered using a phone or a hand-held GPS device at (or near) the entrance. <p>For the Cave column, if there is an official cave name, then it is shown. Otherwise whatever other name we can find for it is shown <em>in italics</em>. -For the Entrance column, if the entrance has a name (e.g. Grüner Eingang in Schwarzmooskogeleishöhle) then it is shown. - Otherwise it says "Anon:" followed by whatever other name we can find for it, usually the entrance id slug, <em>in italics</em>. + <style> th, td { padding-left: 5px; padding-right: 5px; </style> -<table> -<tr><th>Cave</th><th>Entrance</th><th>best Easting</th><th>best Northing</th><th>GPS Lat</th><th>GPS Long</th><th>tag</th><th>tag exact</th><th>tag other</th><th>slug</th></tr> + +<p>OK now for the nasty bit. Many of the older caves did not have easting & northing in UTM 33T at all, but (probably) in BMN and converting between BMN into UTM requires ellipsoids and bessel functions.. or we can just take a linear approximation, which is what I have done here:<br> +e.northingUTM = e.northingBMN + 5198919.918<br> +e.eastingUTM = e.easting + 374854.63<br> +Such converted eastings and northings are <em>in italics</em> in the table below. As you can see, some were wildly out. +<p>These magic numbers simply come from assuming that both BMN and UTM are in metres, and linear over our area, and then taking the avergage of the offsets for 5 locations, the 5 cave entrances at the bottom of this page: +<a href="http://localhost:8000/handbook/survey/coord.htm#summary">Olaf's Coordinates</a>. +<p>This horrible approximation is accruate to ~8m in the northing and ~30m in the easting. +<table>BMN +<tr><th>Cave</th><th>Entrance slug</th><th>Easting</th><th>Northing</th><th>best tag easting</th><th>best tag northing</th> +<th>Δ x</th> +<th>Δ y</th> +<th>Distance (m)</th></tr> {% for ent in ents %} <tr> <td style="text-align:left"> @@ -47,28 +57,24 @@ th, td { <em>{{c|safe}}</em> {% endif %}</a><br> {% endfor %}</td> - <td style="text-align:left"> - {% if ent.name %} - {{ent.name|safe}} - {% else %} - Anon: <em>{{ent|safe}}</em> - {% endif %} - </td> - <td style="text-align:right">{{ent.easting|floatformat:2}}</td> - <td style="text-align:right">{{ent.northing|floatformat:2}}</td> - <td style="text-align:right">{{ent.lat_wgs84|floatformat:6}}</td> - <td style="text-align:right">{{ent.long_wgs84|floatformat:6}}</td> - <td style="text-align:right">{{ent.tag_station}}</td> - <td style="text-align:right">{{ent.exact_station}}</td> - <td style="text-align:right">{{ent.other_station}}</td> <td style="text-align:right">{{ent.slug}}</td> + + <td style="text-align:right; {% if ent.bmn %}font-style: italic{% endif %}">{{ent.easting|floatformat:2}}</td> + <td style="text-align:right; {% if ent.bmn %}font-style: italic{% endif %}">{{ent.northing|floatformat:2}}</td> + + <td style="text-align:right">{{ent.best_station_object.x|floatformat:2}}</td> + <td style="text-align:right">{{ent.best_station_object.y|floatformat:2}}</td> + <td style="text-align:right; {% if ent.bmn %}font-style: italic{% endif %}">{{ent.diffx|floatformat:0}}</td> + <td style="text-align:right; {% if ent.bmn %}font-style: italic{% endif %}">{{ent.diffy|floatformat:0}}</td> + <td style="text-align:right; {% if ent.bmn %}font-style: italic{% endif %}">{{ent.error|floatformat:0}}</td> </tr> {% endfor %} </table> -<p>and now with the locations of the survey stations. All as UTM eatings, norhtings: + +<p>and now the GPS equivalents: <table> -<tr><th>Cave</th><th>best Lat</th><th>best Long</th><th>tag</th><th>tag Lat</th><th>tag Long</th><th>tag exact</th><th>exact Lat</th><th>exact Long</th><th>tag other</th><th>other Lat</th><th>other Long</th></tr> -{% for ent in ents %} +<tr><th>Cave</th><th>GPS Lat</th><th>GPS Long</th><th>best Lat</th><th>best Long</th><th>tag</th><th>tag Lat</th><th>tag Long</th><th>tag exact</th><th>exact Lat</th><th>exact Long</th><th>tag other</th><th>other Lat</th><th>other Long</th></tr> +{% for ent in gpsents %} <tr> <td style="text-align:left"> {% for c in ent.cavelist %} @@ -80,6 +86,8 @@ th, td { {% endif %}</a><br> {% endfor %}</td> + <td style="text-align:right">{{ent.lat_wgs84|floatformat:6}}</td> + <td style="text-align:right">{{ent.long_wgs84|floatformat:6}}</td> <td style="text-align:right">{{ent.lat|floatformat:6}}</td> <td style="text-align:right">{{ent.long|floatformat:6}}</td> <td style="text-align:right">{{ent.tag_station}}</td> @@ -104,8 +112,9 @@ the assemblage of survex files, including fixed point files, and is probably 'co <a href="/handbook/survey/coord2.html">GPS and coordinate systems</a><br> <a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>. +<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></tr> +<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>Used on ent</th></tr> {% for s in stations %} <tr> <td style="text-align:left; width:240px"> {{s.name|safe}} </td> @@ -113,7 +122,7 @@ the assemblage of survex files, including fixed point files, and is probably 'co <td style="text-align:right; width:90px"> {{s.y|floatformat:2}} </td> <td style="text-align:right; width:90px"> {{s.lat|floatformat:6}} </td> <td style="text-align:right; width:90px"> {{s.long|floatformat:6}} </td> - + <td style="text-align:right;" > {{s.entrance|safe}} </td> </tr> {% empty %} <td colspan="3"> NO STATION DATA - This is due to survex (cavern) failing on the entire dataset. |