2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

if an altitudearea is a ramp, never give altitudes outside the altitude range

Browse source
This commit is contained in:
Laura Klünder 2018-12-12 21:53:41 +01:00
parent 1c6e916823
commit a7bcb63b51
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/c3nav/mapdata/models/geometry/level.py
View file

@ -179,7 +179,18 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
slope = np.array(self.point2) - np.array(self.point1)
distances = (np.sum(((points - np.array(self.point1)) * slope), axis=1) / (slope ** 2).sum()).clip(0, 1)
return float(self.altitude) + distances*(float(self.altitude2)-float(self.altitude))
if self.altitude2 < self.altitude:
min_altitude = float(self.altitude2)
max_altitude = float(self.altitude)
else:
min_altitude = float(self.altitude)
max_altitude = float(self.altitude2)
return np.clip(
float(self.altitude) + distances*(float(self.altitude2)-float(self.altitude)),
a_min=min_altitude, a_max=max_altitude
)
@classmethod
def recalculate(cls):