From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 9 Mar 2015 20:40:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~474
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1812c89c31b6e163a14144ae05fff34b97634367?hp=5c2982adcec6746ed31ac53d5e7efc8a797888e8

Merge remote-tracking branch 'upstream/master'
---

diff --git a/osm2pgsql b/osm2pgsql
index d2afef62..07db15e5 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit d2afef62a4a0d72c547103392cffcdda25687c6e
+Subproject commit 07db15e5e55eca63971a014ddb08bc47cd89f762
diff --git a/utils/setup.php b/utils/setup.php
index c45cc857..fbf902e7 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -613,7 +613,7 @@
 			}
 
 			// Find the last node in the DB
-			$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
+			$iLastOSMID = $oDB->getOne("select max(osm_id) from place where osm_type = 'N'");
 
 			// Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
 			$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";