expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-03 09:21:48 +01:00
Code Issues 18 Projects 3 Activity

fine tuning search for SRTM point

Browse Source
This commit is contained in:
Philip Sargent 2023-11-05 22:59:02 +02:00
parent c0687615a4
commit df79bdb711
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/models/survex.py
View File

@ -7,7 +7,7 @@ from pathlib import Path
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from troggle.core.utils import height_from_utm from troggle.core.utils import height_from_utm, throw
# from troggle.core.models.troggle import DataIssue # circular import. Hmm # from troggle.core.models.troggle import DataIssue # circular import. Hmm
@ -100,8 +100,16 @@ class SurvexStation(models.Model):
weight = "bold" weight = "bold"
else: else:
weight = "normal" weight = "normal"
diff_str = f"<span style='color:{colour}; font-weight:{weight}'>{sign}{diff:.0f}</span>" diff_str = f"<span style='color:{colour}; font-weight:{weight}'>{sign}{diff:.0f}</span>"
if ref >= throw:
colour = "grey"
weight = "normal"
diff = "XX"
ref = float("nan")
diff_str = f"<span style='color:{colour}'>XX</span>"
return diff_str, ref return diff_str, ref

14
core/utils.py
View File

@ -38,6 +38,8 @@ TROG = {"pagecache": {"expedition": {}}, "caves": {"gcavelookup": {}, "gcavecoun
alphabet = [] alphabet = []
sha = hashlib.new('sha256') sha = hashlib.new('sha256')
throw = 35.0
# This is module-level executable. This is a Bad Thing. Especially when it touches the file system. # This is module-level executable. This is a Bad Thing. Especially when it touches the file system.
try: try:
logging.basicConfig(level=logging.DEBUG, filename=settings.LOGFILE, filemode="w") logging.basicConfig(level=logging.DEBUG, filename=settings.LOGFILE, filemode="w")
@ -299,21 +301,25 @@ def find_nearest_point(points, target_point):
In our dataset, the survey stations are all within 30m of an srtm reference point. In our dataset, the survey stations are all within 30m of an srtm reference point.
So we can safely ignore points more than 100m away in either x or y directions. So we can safely ignore points more than 100m away in either x or y directions.
This is not true for the 1624 and 1627 areas though.
TO DO: store this list twice, once sorted by x and once sorted by y, TO DO: store this list twice, once sorted by x and once sorted by y,
do a bounding box search for a set of nearby points before doing the exhaustive pythagorean distance search.""" do a bounding box search for a set of nearby points before doing the exhaustive pythagorean distance search."""
nearest_distance_squared = float("inf") nearest_distance_squared = float("inf")
nearest_point = None nearest_point = None
x_target, y_target = target_point x_target, y_target = target_point
max_ds = throw * throw # 1089 = 33 x 33
for point in points: for point in points:
x, y, z = point x, y, z = point
if z < 0: if z < 0:
distance_squared = 1000000.0 # ie ignore it distance_squared = 1000000.0 # ie ignore it
else: else:
if x - x_target > 100: if x - x_target > throw:
distance_squared = 10000 distance_squared = max_ds
elif y - y_target > 100: elif y - y_target > throw:
distance_squared = 10000 distance_squared = max_ds
else: else:
distance_squared = math.pow(x - x_target, 2) + math.pow(y - y_target, 2) distance_squared = math.pow(x - x_target, 2) + math.pow(y - y_target, 2)