hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 19:44:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add migration for new interpolation table layout

Browse Source
This commit is contained in:
Sarah Hoffmann
2022-01-27 11:12:40 +01:00
parent e6d855b954
commit 83d2c440d5
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
nominatim/tools/migration.py
View File

@@ -227,3 +227,35 @@ def create_interpolation_index_on_place(conn, **_):
cur.execute("""CREATE INDEX IF NOT EXISTS idx_place_interpolations cur.execute("""CREATE INDEX IF NOT EXISTS idx_place_interpolations
ON place USING gist(geometry) ON place USING gist(geometry)
WHERE osm_type = 'W' and address ? 'interpolation'""") WHERE osm_type = 'W' and address ? 'interpolation'""")
@_migration(4, 0, 99, 2)
def add_step_column_for_interpolation(conn, **_):
""" Add a new column 'step' to the interpolations table which will.
Also convers the data into the stricter format which requires that
startnumbers comply with the odd/even requirements.
"""
with conn.cursor() as cur:
# Mark invalid all interpolations with no intermediate numbers.
cur.execute("""UPDATE location_property_osmline SET startnumber = null
WHERE endnumber - startnumber <= 1 """)
# Align the start numbers where odd/even does not match.
cur.execute("""UPDATE location_property_osmline
SET startnumber = startnumber + 1,
linegeo = ST_LineSubString(linegeo,
1.0 / (endnumber - startnumber)::float,
1)
WHERE (interpolationtype = 'odd' and startnumber % 2 = 0)
or (interpolationtype = 'even' and startnumber % 2 = 1)
""")
# Mark invalid odd/even interpolations with no intermediate numbers.
cur.execute("""UPDATE location_property_osmline SET startnumber = null
WHERE interpolationtype in ('odd', 'even')
and endnumber - startnumber = 2""")
# Finally add the new column and populate it.
cur.execute("ALTER TABLE location_property_osmline ADD COLUMN step SMALLINT")
cur.execute("""UPDATE location_property_osmline
SET step = CASE WHEN interpolationtype = 'all'
THEN 1 ELSE 2 END
""")

2
nominatim/version.py
View File

@@ -24,7 +24,7 @@ Version information for Nominatim.
# patch level when cherry-picking the commit with the migration. # patch level when cherry-picking the commit with the migration.
# #
# Released versions always have a database patch level of 0. # Released versions always have a database patch level of 0.
NOMINATIM_VERSION = (4, 0, 99, 2) NOMINATIM_VERSION = (4, 0, 99, 3)
POSTGRESQL_REQUIRED_VERSION = (9, 5) POSTGRESQL_REQUIRED_VERSION = (9, 5)
POSTGIS_REQUIRED_VERSION = (2, 2) POSTGIS_REQUIRED_VERSION = (2, 2)