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

avoid shapely deprecation warnings

Browse source
This commit is contained in:
Laura Klünder 2022-04-03 17:34:31 +02:00
parent 8f4f6aed6e
commit 495294a886
5 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/mapdata/models/geometry/base.py
View file

@ -115,11 +115,11 @@ class GeometryMixin(SerializableMixin):
return True
if self.geometry is self.orig_geometry:
return False
if not self.geometry.almost_equals(self.orig_geometry, 1):
if not self.geometry.equals_exact(self.orig_geometry, 0.05):
return True
field = self._meta.get_field('geometry')
rounded = field.to_python(field.get_prep_value(self.geometry))
if not rounded.almost_equals(self.orig_geometry, 2):
if not rounded.equals_exact(self.orig_geometry, 0.005):
return True
return False

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

@ -189,8 +189,8 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
if self.altitude2 is None:
return np.full((points.shape[0], ), fill_value=float(self.altitude))
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)
slope = np.array(self.point2.coords) - np.array(self.point1.coords)
distances = (np.sum(((points - np.array(self.point1.coords)) * slope), axis=1) / (slope ** 2).sum()).clip(0, 1)
if self.altitude2 < self.altitude:
min_altitude = float(self.altitude2)
@ -604,7 +604,7 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
num_deleted += 1
continue
if not field.get_final_value(new_area.geometry).almost_equals(candidate.geometry):
if not field.get_final_value(new_area.geometry).equals_exact(candidate.geometry, 0.00001):
num_modified += 1
candidate.geometry = new_area.geometry