From cc4a7f04dadfeede1cb8b9908e535f91299fe94e Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 2 Nov 2023 01:05:36 +0200 Subject: improves stations srtm report --- core/models/survex.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'core/models/survex.py') diff --git a/core/models/survex.py b/core/models/survex.py index 7af8570..4c2c109 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -75,16 +75,25 @@ class SurvexStation(models.Model): return utmToLatLng(33, self.x, self.y, northernHemisphere=True)[1] def srtm_alt(self): - return height_from_utm(self.x, self.y) # height, distance from reference point + """Caches the srtm data so that searches are not done twice on the same page""" + if not hasattr(self,"srtm"): + self.srtm = height_from_utm(self.x, self.y) # height, distance from reference point + return self.srtm # (nearest point, nearest distance) def srtm_diff(self): - alt, ref = height_from_utm(self.x, self.y) # height, distance from reference point + alt, ref = self.srtm_alt() diff = alt - self.z if diff >= 0: - diff_str = f"+{diff:.0f}" + colour = "blue" else: - diff_str = f"{diff:.0f}" + colour = "red" + + if abs(diff) > 60: + weight = "bold" + else: + weight = "normal" + diff_str = f"{diff:.0f}" return diff_str, ref -- cgit v1.2.3