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

SRTM on all stations report

Browse Source
This commit is contained in:
Philip Sargent 2023-10-27 22:28:10 +03:00
parent f706bd814e
commit 84e0b4fe3f
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/views/statistics.py
View File

@ -275,7 +275,7 @@ def dataissues(request):
return render(request, "dataissues.html", {"didict": dilist}) return render(request, "dataissues.html", {"didict": dilist})
def eastings(request): def stations(request):
"""report each Northing/Easting pair wherever recorded""" """report each Northing/Easting pair wherever recorded"""
ents = set() ents = set()
gpsents = set() gpsents = set()
@ -304,37 +304,7 @@ def eastings(request):
if e.other_station: if e.other_station:
ents.add(e) ents.add(e)
add_stations(e) add_stations(e)
# 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.bmn_n = e.northing
# # e.northing = e.northing + 5200000
# e.northing = e.northing + 5198919.918
# e.bmn_e = e.easting
# #e.easting = e.easting - 36000 + 486000
# e.easting = e.easting + 374854.63 # linear hack
# 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: for e in entrances:
if e.lat_wgs84 or e.long_wgs84: if e.lat_wgs84 or e.long_wgs84:
gpsents.add(e) gpsents.add(e)
@ -343,7 +313,7 @@ def eastings(request):
stations = SurvexStation.objects.all() # NB these are NOT all the stations in troggle_import_root.pos stations = SurvexStation.objects.all() # NB these are NOT all the stations in troggle_import_root.pos
return render(request, "eastings.html", {"ents": ents, "gpsents": gpsents, "stations": stations}) return render(request, "stations.html", {"ents": ents, "gpsents": gpsents, "stations": stations})
def aliases(request, year): def aliases(request, year):

0
templates/eastings.html → templates/stations.html
View File

2
urls.py
View File

@ -178,7 +178,7 @@ trogglepatterns = [
path('therionissues', statistics.therionissues, name="therionissues"), path('therionissues', statistics.therionissues, name="therionissues"),
path('surveximport', statistics.surveximport, name="surveximport"), path('surveximport', statistics.surveximport, name="surveximport"),
path('survexdebug', statistics.survexdebug, name="survexdebug"), path('survexdebug', statistics.survexdebug, name="survexdebug"),
path('eastings', statistics.eastings, name="eastings"), path('stations', statistics.stations, name="stations"),
path('aliases/<int:year>',statistics.aliases, name="aliases"), path('aliases/<int:year>',statistics.aliases, name="aliases"),
path('troggle', frontpage, name="frontpage"), # control panel. Shows recent actions. path('troggle', frontpage, name="frontpage"), # control panel. Shows recent actions.