hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean and update tests for postcodes

Browse Source
This commit is contained in:
AntoJvlt
2021-06-08 22:39:04 +02:00
committed by root
parent 47fb7cd3a8
commit 1c175e3a67
2 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nominatim/tools/postcodes.py
View File

@@ -9,7 +9,7 @@ from math import isfinite
from psycopg2.extras import execute_values
from nominatim.db.connection import _Connection, connect
from nominatim.db.connection import connect
LOG = logging.getLogger()
@@ -169,7 +169,7 @@ def update_postcodes(dsn, project_dir, tokenizer):
SELECT
COALESCE(plx.country_code, get_country_code(ST_Centroid(pl.geometry))) as cc,
token_normalized_postcode(pl.address->'postcode') as pc,
ST_Centroid(ST_Collect(ST_Centroid(pl.geometry))) as centroid
COALESCE(ST_Centroid(ST_Collect(plx.centroid)), ST_Centroid(ST_Collect(ST_Centroid(pl.geometry)))) as centroid
FROM place AS pl LEFT OUTER JOIN placex AS plx ON pl.osm_id = plx.osm_id AND pl.osm_type = plx.osm_type
WHERE pl.address ? 'postcode' AND pl.geometry IS NOT null
GROUP BY cc, pc
@@ -203,5 +203,5 @@ def can_compute(dsn):
Check that the place table exists so that
postcodes can be computed.
"""
with _Connection(dsn) as conn:
with connect(dsn) as conn:
return conn.table_exists('place')