Merge remote-tracking branch 'upstream/master'

diff --git a/utils/setup.php b/utils/setup.php
index f8da1970e73eb2448b2f8969290609a8eaf2ea25..d2d4381ef82b6ed1d3893ea340018be6ecb2647e 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -514,10 +514,10 @@
                }
 
                // Find the last node in the DB
-               $iLastOSMID = $oDB->getOne("select max(osm_id) as osm_id from place where osm_type = 'N'");
+               $iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
 
                // 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;
+               $sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
                $sLastNodeXML = file_get_contents($sLastNodeURL);
                preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
                $iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);

diff --git a/website/search.php b/website/search.php
index d0c45c70636b7822598600577bd73cea1a4314f4..5733dde48a8f08b6e9f909b2b02c8633e0d64415 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -309,7 +309,7 @@
                                $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
                        }
 
-                       preg_match_all('/\\[([a-zA-Z]*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
+                       preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
                        $aSpecialTerms = array();
                        if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity'])
                        {