diff --git a/core/forms.py b/core/forms.py index ed334f6..8eb8f78 100644 --- a/core/forms.py +++ b/core/forms.py @@ -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" ) diff --git a/core/models/caves.py b/core/models/caves.py index 3079ed1..bd35461 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -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") diff --git a/templates/eastings.html b/templates/eastings.html index 17b19b2..21a40e6 100644 --- a/templates/eastings.html +++ b/templates/eastings.html @@ -5,17 +5,6 @@
-These first two tables are all the Caves which have manual locations specified as Northing/Easting coordinates in their Cave Entrance Description data. -
-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. - -
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.
Coordinate systems in Austria are explained in:
@@ -35,12 +24,11 @@ th, td {
-{% for ent in ents %}
-*fix {{ent.pslug}} {{ent.bmn_e|floatformat:0}} {{ent.bmn_n|floatformat:0}} {{ent.bmn_alt|floatformat:0}}
-{% endfor %}
-
and what those stations are: + +
Cave | tag | tag x | tag y | tag exact | exact x | exact y | tag other | other x | other y | |
---|---|---|---|---|---|---|---|---|---|---|
Cave | Ent slug | +tag | tag x | tag y | tag exact | exact x | exact y | tag other | other x | other y |
@@ -53,6 +41,7 @@ th, td {
{% endif %} {% endfor %} |
+ {{ent.slug}} | {{ent.tag_station}} | {{ent.tag_ts.x|floatformat:0}} | {{ent.tag_ts.y|floatformat:0}} | @@ -71,7 +60,7 @@ th, td {||||||
Cave | Alt | GPS Lat | GPS Long | -best Lat | best Long | tag | tag Lat | tag Long | +best Lat | best Long |
{{ent.long_wgs84|floatformat:6}} | {{ent.lat|floatformat:6}} | {{ent.long|floatformat:6}} | -{{ent.tag_station}} | -{{ent.tag_ts.lat|floatformat:6}} | -{{ent.tag_ts.long|floatformat:6}} | +