X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8f2746fe24d51cab464960c2679da5b09e7da882..87907916ff06741bd4627101d30e6e11b8ea1a1a:/nominatim/tools/postcodes.py?ds=sidebyside diff --git a/nominatim/tools/postcodes.py b/nominatim/tools/postcodes.py index 9bcdf2e5..195d407e 100644 --- a/nominatim/tools/postcodes.py +++ b/nominatim/tools/postcodes.py @@ -5,6 +5,7 @@ of artificial postcode centroids. import csv import gzip import logging +from math import isfinite from psycopg2.extras import execute_values @@ -12,6 +13,17 @@ from nominatim.db.connection import connect LOG = logging.getLogger() +def _to_float(num, max_value): + """ Convert the number in string into a float. The number is expected + to be in the range of [-max_value, max_value]. Otherwise rises a + ValueError. + """ + num = float(num) + if not isfinite(num) or num <= -max_value or num >= max_value: + raise ValueError() + + return num + class _CountryPostcodesCollector: """ Collector for postcodes of a single country. """ @@ -108,7 +120,8 @@ class _CountryPostcodesCollector: postcode = analyzer.normalize_postcode(row['postcode']) if postcode not in self.collected: try: - self.collected[postcode] = (float(row['lon']), float(row['lat'])) + self.collected[postcode] = (_to_float(row['lon'], 180), + _to_float(row['lat'], 90)) except ValueError: LOG.warning("Bad coordinates %s, %s in %s country postcode file.", row['lat'], row['lon'], self.country)