update to latest osm2pgsql version

The latest version of osm2pgsql no longer creates indexes on
the members of planet_osm_rels. So we do that ourselves.
Given that we only need to access associated street relations,
the index can become quite a bit smaller.

diff --git a/osm2pgsql b/osm2pgsql
index b8af2b242f55b4f31abac9ba428d4ccf6aa51cd0..acbec68bbf94dafae103663801d55291cf8f227e 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit b8af2b242f55b4f31abac9ba428d4ccf6aa51cd0
+Subproject commit acbec68bbf94dafae103663801d55291cf8f227e

diff --git a/sql/tables.sql b/sql/tables.sql
index cf51cbe68b058ca6b066d2da226bc42271d9a486..5686bcd22c002fea652599cbe1417aaaa2d93073 100644 (file)
--- 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'];