expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 00:31:55 +00:00
Code Issues 19 Projects 3 Activity

REMOVED northing and easting fields

Browse Source
This commit is contained in:
Philip Sargent 2023-10-12 00:25:24 +03:00
parent a2bddaeb89
commit 3b1fd56fe4
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/forms.py
View File

@ -174,12 +174,7 @@ class EntranceForm(ModelForm):
required=False,
widget=forms.TextInput(attrs={"size": "50"}), label="Other station: Survex station id, e.g. 1623.2023-xx-01.33"
)
northing = forms.CharField(
required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Northing (UTM) - random shit, being expunged"
)
easting = forms.CharField(
required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Easting (UTM) - random shit, being expunged"
)
lat_wgs84 = forms.CharField(
required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Latitude (WSG84) - if no other location"
)

2
core/models/caves.py
View File

@ -236,7 +236,6 @@ class Entrance(TroggleModel):
alt = models.TextField(blank=True, null=True)
approach = models.TextField(blank=True, null=True)
bearings = models.TextField(blank=True, null=True)
easting = models.TextField(blank=True, null=True) # apparently? manually entered not calculated
entrance_description = models.TextField(blank=True, null=True)
explorers = models.TextField(blank=True, null=True)
filename = models.CharField(max_length=200)
@ -250,7 +249,6 @@ class Entrance(TroggleModel):
marking = models.CharField(max_length=2, choices=MARKING_CHOICES)
marking_comment = models.TextField(blank=True, null=True)
name = models.CharField(max_length=100, blank=True, null=True)
northing = models.TextField(blank=True, null=True) # apparently? manually entered not calculated
other_description = models.TextField(blank=True, null=True)
photo = models.TextField(blank=True, null=True)
slug = models.SlugField(max_length=50, unique=True, default="default_slug_id")

27
templates/eastings.html
View File

@ -5,17 +5,6 @@
<h1>Entrance locations</h1>
<p>
These first two tables are all the Caves which have <em>manual</em> locations specified as Northing/Easting coordinates in their Cave Entrance Description data.
<p>
This report is to help you sort out and fix the bad data in our records. You can see from the tables here
that UTM data sometimes have Northings and Eastings swapped, or UTM is used when it is intended to be
BMN and vice versa.
<p>All surveyed caves have entrance locations fixed by the survex data, as survey stations with names such as
1623.p277a . This is the reliable data and is shown in the third table. The reason why we have manual data is because when a
cave entrance is first discovered, it is not yet connected to the survey network. But we want to record its position
otherise we will lose it.
<p>
Coordinate systems in Austria are explained in:<br>
@ -35,12 +24,11 @@ th, td {
</style>
<p>
{% for ent in ents %}
*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>
<tr><th>Cave</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>
<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>
{% for ent in ents %}
<tr>
<td style="text-align:left">
@ -53,6 +41,7 @@ th, td {
{% endif %}</a><br>
{% endfor %}</td>
<td style="text-align:right">{{ent.slug}}</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>
@ -71,7 +60,7 @@ th, td {
<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>
<th>best Lat</th><th>best Long</th>
</tr>
{% for ent in gpsents %}
<tr>
@ -90,9 +79,7 @@ th, 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>
<td style="text-align:right">{{ent.tag_ts.lat|floatformat:6}}</td>
<td style="text-align:right">{{ent.tag_ts.long|floatformat:6}}</td>
</tr>
{% endfor %}
</table>