X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/320d488627b1a5674458cbef644c6731882b2a23..f00baba40c6f73ba8e637ac4cea60d59a11692f4:/lib/lib.php?ds=sidebyside diff --git a/lib/lib.php b/lib/lib.php index 39bc90d7..3a6166a6 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -1,7 +1,5 @@ getAll($sSQL)); - if ($bRaw) return $aAddressLines; - //echo "
"; - //var_dump($aAddressLines); - $aAddress = array(); - $aFallback = array(); - foreach ($aAddressLines as $aLine) { - $bFallback = false; - $aTypeLabel = Nominatim\ClassTypes\getInfo($aLine); - - if ($aTypeLabel === false) { - $aTypeLabel = Nominatim\ClassTypes\getFallbackInfo($aLine); - $bFallback = true; - } - - if ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])) { - $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); - $sTypeLabel = str_replace(' ', '_', $sTypeLabel); - if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { - $aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber']; - } - $aFallback[$sTypeLabel] = $bFallback; - } } - return $aAddress; } - function addQuotes($s) { return "'".$s."'"; @@ -211,10 +177,10 @@ function geometryText2Points($geometry_as_text, $fRadius) // preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER); // - } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) { +/* } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) { // preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER); - // + */ } elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#', $geometry_as_text, $aMatch)) { // $aPolyPoints = createPointsAroundCenter($aMatch[1], $aMatch[2], $fRadius);