remove distinct, causes nearest feature results to be badly reordered

[nominatim.git] / lib / lib.php
diff --git a/lib/lib.php b/lib/lib.php

index 1564a83cceffa45dc4a1f65ef29cce3d87cb0608..74430cf7b9d3094e4dbdf00c83b98098a682826b 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -7,7 +7,7 @@
                 echo "<html><body><h1>Internal Server Error</h1>";
                 echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
                 echo "<p><b>Details:</b> ".$sError,"</p>";
                 echo "<html><body><h1>Internal Server Error</h1>";
                 echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
                 echo "<p><b>Details:</b> ".$sError,"</p>";
-               echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above an the URL you used.</p>';
+               echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
                 if (CONST_Debug)
                 {
                         echo "<hr><h2>Debugging Information</h2><br>";
                 if (CONST_Debug)
                 {
                         echo "<hr><h2>Debugging Information</h2><br>";
@@ -57,6 +57,20 @@
                 return sizeof($aMatches[0]);
         }
  
                 return sizeof($aMatches[0]);
         }
  
+       function getTotalMemoryMB()
+       {
+               $sCPU = file_get_contents('/proc/meminfo');
+               preg_match('#MemTotal: +([0-9]+) kB#', $sCPU, $aMatches);
+               return (int)($aMatches[1]/1024);
+       }
+
+       function getCacheMemoryMB()
+       {
+               $sCPU = file_get_contents('/proc/meminfo');
+               preg_match('#Cached: +([0-9]+) kB#', $sCPU, $aMatches);
+               return (int)($aMatches[1]/1024);
+       }
+
         function bySearchRank($a, $b)
         {
                 if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
         function bySearchRank($a, $b)
         {
                 if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
@@ -320,7 +334,7 @@
  
   'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
   'railway:station' => array('label'=>'Station','frequency'=>3431,'icon'=>'transport_train_station2', 'defdiameter' => 0.01,),
  
   'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
   'railway:station' => array('label'=>'Station','frequency'=>3431,'icon'=>'transport_train_station2', 'defdiameter' => 0.01,),
- 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship3',),
+ 'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship_unknown3',),
   'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',),
   'amenity:bar' => array('label'=>'Bar','frequency'=>164,'icon'=>'food_bar',),
   'amenity:university' => array('label'=>'University','frequency'=>607,'icon'=>'education_university',),
   'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',),
   'amenity:bar' => array('label'=>'Bar','frequency'=>164,'icon'=>'food_bar',),
   'amenity:university' => array('label'=>'University','frequency'=>607,'icon'=>'education_university',),
@@ -350,7 +364,7 @@
   'tourism:motel' => array('label'=>'Motel','frequency'=>43,'icon'=>'',),
   'amenity:cinema' => array('label'=>'Cinema','frequency'=>277,'icon'=>'tourist_cinema',),
   'tourism:information' => array('label'=>'Information','frequency'=>224,'icon'=>'amenity_information',),
   'tourism:motel' => array('label'=>'Motel','frequency'=>43,'icon'=>'',),
   'amenity:cinema' => array('label'=>'Cinema','frequency'=>277,'icon'=>'tourist_cinema',),
   'tourism:information' => array('label'=>'Information','frequency'=>224,'icon'=>'amenity_information',),
- 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'art_gallery2',),
+ 'tourism:artwork' => array('label'=>'Artwork','frequency'=>171,'icon'=>'tourist_art_gallery2',),
   'historic:archaeological_site' => array('label'=>'Archaeological Site','frequency'=>407,'icon'=>'tourist_archaeological2',),
   'amenity:doctors' => array('label'=>'Doctors','frequency'=>581,'icon'=>'health_doctors',),
   'leisure:sports_centre' => array('label'=>'Sports Centre','frequency'=>767,'icon'=>'sport_leisure_centre',),
   'historic:archaeological_site' => array('label'=>'Archaeological Site','frequency'=>407,'icon'=>'tourist_archaeological2',),
   'amenity:doctors' => array('label'=>'Doctors','frequency'=>581,'icon'=>'health_doctors',),
   'leisure:sports_centre' => array('label'=>'Sports Centre','frequency'=>767,'icon'=>'sport_leisure_centre',),