summaryrefslogtreecommitdiffstats
path: root/templates/eastings.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/eastings.html')
-rw-r--r--templates/eastings.html55
1 files changed, 7 insertions, 48 deletions
diff --git a/templates/eastings.html b/templates/eastings.html
index a269ba5..17b19b2 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -34,49 +34,9 @@ th, td {
padding-right: 5px;
</style>
-<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. Well they were until I swapped teh easting/northings around and dealt with obvious typos.
-<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>&Delta; x</th>
-<th>&Delta; y</th>
-<th>Distance (m)</th></tr>
-{% for ent in ents %}
-<tr>
- <td style="text-align:left">
- {% for c in ent.cavelist %}
- <a href="/{{c.url}}">
- {% if c.official_name %}
- {{c.official_name|safe}}
- {% else %}
- <em>{{c|safe}}</em>
- {% endif %}</a><br>
- {% endfor %}</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>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 />
+*fix {{ent.pslug}} {{ent.bmn_e|floatformat:0}} {{ent.bmn_n|floatformat:0}} {{ent.bmn_alt|floatformat:0}}<br />
{% endfor %}
<p>and what those stations are:
<table>
@@ -108,7 +68,11 @@ Such converted eastings and northings are <em>in italics</em> in the table below
<h3>and now the GPS equivalents</h3>
<table>
-<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>
+<tr><th>Cave</th>
+<th>Alt</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>
+</tr>
{% for ent in gpsents %}
<tr>
<td style="text-align:left">
@@ -121,6 +85,7 @@ Such converted eastings and northings are <em>in italics</em> in the table below
{% endif %}</a><br>
{% endfor %}</td>
+ <td style="text-align:right">{{ent.alt|floatformat:1}}</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>
@@ -128,12 +93,6 @@ Such converted eastings and northings are <em>in italics</em> in the table below
<td style="text-align:right">{{ent.tag_station}}</td>
<td style="text-align:right">{{ent.tag_ts.lat|floatformat:6}}</td>
<td style="text-align:right">{{ent.tag_ts.long|floatformat:6}}</td>
- <td style="text-align:right">{{ent.exact_station}}</td>
- <td style="text-align:right">{{ent.tag_es.lat|floatformat:6}}</td>
- <td style="text-align:right">{{ent.tag_es.long|floatformat:6}}</td>
- <td style="text-align:right">{{ent.other_station}}</td>
- <td style="text-align:right">{{ent.tag_os.lat|floatformat:6}}</td>
- <td style="text-align:right">{{ent.tag_os.long|floatformat:6}}</td>
</tr>
{% endfor %}
</table>