Replace custom Almost with stdlib math.isclose

This commit is contained in:
Miroslav Šedivý
2025-03-05 20:35:01 +01:00
parent 1b44fe2555
commit cd64788a58
3 changed files with 3 additions and 15 deletions

View File

@@ -7,14 +7,13 @@
"""
Functions to facilitate accessing and comparing the content of DB tables.
"""
import math
import re
import json
import psycopg
from psycopg import sql as pysql
from steps.check_functions import Almost
ID_REGEX = re.compile(r"(?P<typ>[NRW])(?P<oid>\d+)(:(?P<cls>\w+))?")
class NominatimID:
@@ -166,7 +165,7 @@ class DBRow:
else:
x, y = self.context.osm.grid_node(int(expected))
return Almost(float(x)) == self.db_row['cx'] and Almost(float(y)) == self.db_row['cy']
return math.isclose(float(x), self.db_row['cx']) and math.isclose(float(y), self.db_row['cy'])
def _has_geometry(self, expected):
geom = self.context.osm.parse_geometry(expected)