tooling to check unevidenced locations

2 files changed, 31 insertions, 18 deletions

diff --git a/core/forms.py b/core/forms.py
index 3127bb1..ed334f6 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -175,10 +175,10 @@ class EntranceForm(ModelForm):
         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) - from survex data"
+        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) - from survex data"
+        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"
@@ -189,7 +189,7 @@ class EntranceForm(ModelForm):
     alt = forms.CharField(required=False, label="Altitude (m)")
     url = forms.CharField(required=False, label="URL [usually blank]", widget=forms.TextInput(attrs={"size": "45"}))
 
-    field_order = ['name', 'entrance_description', 'explorers', 'map_description', 'location_description', 'lastvisit', 'approach', 'underground_description', 'photo', 'marking_comment', 'findability_description', 'other_description', 'bearings', 'tag_station', 'exact_station', 'other_station', 'northing', 'easting', 'lat_wgs84', 'long_wgs84', 'alt', 'url']
+    field_order = ['name', 'entrance_description', 'explorers', 'map_description', 'location_description', 'lastvisit', 'approach', 'underground_description', 'photo', 'marking_comment', 'findability_description', 'other_description', 'bearings', 'tag_station', 'exact_station', 'other_station',  'easting', 'northing', 'lat_wgs84', 'long_wgs84', 'alt', 'url']
 
     class Meta:
         model = Entrance
diff --git a/core/views/statistics.py b/core/views/statistics.py
index c1a0ca8..7e29f5e 100644
--- a/core/views/statistics.py
+++ b/core/views/statistics.py
@@ -305,26 +305,39 @@ def eastings(request):
                 
     entrances = Entrance.objects.all()
     for e in entrances:
-        if e.easting or e.northing:
+        if e.exact_station:
             ents.add(e)
             add_stations(e)
-            e.northing = float(e.northing)
-            e.easting = float(e.easting)
+        # if e.easting or e.northing:
+            # ents.add(e)
+            # add_stations(e)
+            # e.northing = float(e.northing)
+            # e.easting = float(e.easting)
             
-            if e.northing < 5200000:
-                e.bmn = True
-                # e.northing = e.northing + 5200000
-                e.northing = e.northing + 5198919.918
+            # if e.northing < 5200000:
+                # e.bmn = True
+                # e.bmn_n = e.northing
+                # # e.northing = e.northing + 5200000
+                # e.northing = e.northing + 5198919.918
                 
-                #e.easting = e.easting  - 36000 + 486000
-                e.easting = e.easting + 374854.63 # linear hack
+                # e.bmn_e = e.easting
+                # #e.easting = e.easting  - 36000 + 486000
+                # e.easting = e.easting + 374854.63 # linear hack
             
-            try:
-                e.diffx = e.easting - e.best_station_object().x
-                e.diffy = e.northing - e.best_station_object().y
-                e.error = sqrt(e.diffx**2 + e.diffy**2)
-            except:
-                pass
+                # if e.alt:
+                    # e.alt = e.alt.replace("m","")
+                   
+                    # #print(f"{e.slug} '{e.alt}'")
+                    # e.bmn_alt = e.alt
+                # else:
+                    # e.bmn_alt = 1000
+                # e.pslug = e.slug.replace("1623-","x")
+            # try:
+                # e.diffx = e.easting - e.best_station_object().x
+                # e.diffy = e.northing - e.best_station_object().y
+                # e.error = sqrt(e.diffx**2 + e.diffy**2)
+            # except:
+                # pass
             
     for e in entrances:
         if e.lat_wgs84 or e.long_wgs84: