prepare for 3.4.1 release

update osm2pgsql (exclude country and postcode from address tags)
typo - fixes openstreetmap#1606
2026-02-14 18:37:58 +00:00 · 2019-12-28 22:53:38 +01:00 · 2019-12-28 22:41:33 +01:00 · 2019-12-28 22:41:19 +01:00 · 2019-12-28 22:40:46 +01:00
7 changed files with 12 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ project(nominatim)

 set(NOMINATIM_VERSION_MAJOR 3)
 set(NOMINATIM_VERSION_MINOR 4)
-set(NOMINATIM_VERSION_PATCH 0)
+set(NOMINATIM_VERSION_PATCH 1)

 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")

--- a/6
+++ b/6
@@ -1,3 +1,9 @@
+3.4.1
+ * update osm2pgsql
+    * move deletion to copy thread (fixes deadlock in updates)
+    * fix filtering where valid address objects got dropped
+ * fix typo in import styles
+
 3.4.0

 * increase required version for PostgreSQL(9.3), PostGIS(2.2) and PHP(7.0)
--- a/2
+++ b/2
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -73,7 +73,7 @@
    }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
              "addr:country", "addr:country", "addr:country_code"],
    "values" : {
        "" : "country"
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -42,7 +42,7 @@
    }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
              "addr:country", "addr:country", "addr:country_code"],
    "values" : {
        "" : "country"
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -186,7 +186,7 @@
    }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
              "addr:country", "addr:country", "addr:country_code"],
    "values" : {
        "" : "country"
--- a/settings/import-street.style
+++ b/settings/import-street.style
@@ -42,7 +42,7 @@
    }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
              "addr:country", "addr:country", "addr:country_code"],
    "values" : {
        "" : "country"
Author	SHA1	Message	Date
Sarah Hoffmann	e4ecbef61e	prepare for 3.4.1 release	2019-12-28 22:53:38 +01:00
Sarah Hoffmann	23dd49a5a2	update osm2pgsql (exclude country and postcode from address tags)	2019-12-28 22:41:33 +01:00
Francesc Hervada-Sala	0c85f88be8	typo - fixes openstreetmap#1606	2019-12-28 22:41:19 +01:00
Sarah Hoffmann	7829a05002	update osm2pgsql (deletion and address updates)	2019-12-28 22:40:46 +01:00