Merge remote-tracking branch 'upstream/master'

diff --git a/osm2pgsql b/osm2pgsql
index d2afef62a4a0d72c547103392cffcdda25687c6e..07db15e5e55eca63971a014ddb08bc47cd89f762 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit d2afef62a4a0d72c547103392cffcdda25687c6e
+Subproject commit 07db15e5e55eca63971a014ddb08bc47cd89f762

diff --git a/utils/setup.php b/utils/setup.php
index c45cc857ac422bc87b3d26be85045fd20afef4f0..fbf902e72509d989384b31edc304e6f9e51ac6e3 100755 (executable)
--- 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";