From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 5 Oct 2020 16:14:29 +0000 (+0200)
Subject: Merge pull request #1995 from lonvia/update-osm2pgsql
X-Git-Tag: v3.6.0~59
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cd997ff0589f583b0712d6652e614320a7c8a917?hp=6b8ce1ee74303ac8d3c7738774c98cecd020f7d5

Merge pull request #1995 from lonvia/update-osm2pgsql

update to latest osm2pgsql version
---

diff --git a/osm2pgsql b/osm2pgsql
index b8af2b24..acbec68b 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit b8af2b242f55b4f31abac9ba428d4ccf6aa51cd0
+Subproject commit acbec68bbf94dafae103663801d55291cf8f227e
diff --git a/sql/tables.sql b/sql/tables.sql
index cf51cbe6..5686bcd2 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -260,3 +260,6 @@ CREATE TABLE wikipedia_redirect (
 );
 ALTER TABLE ONLY wikipedia_redirect ADD CONSTRAINT wikipedia_redirect_pkey PRIMARY KEY (language, from_title);
 
+-- osm2pgsql does not create indexes on the middle tables for Nominatim
+-- Add one for lookup of associated street relations.
+CREATE INDEX planet_osm_rels_parts_associated_idx ON planet_osm_rels USING gin(parts) WHERE tags @> ARRAY['associatedStreet'];