hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt frontend to new interpolation table layout

Browse Source
This commit is contained in:
Sarah Hoffmann
2022-01-26 21:24:24 +01:00
parent 4b28b4fed4
commit 6b89624f33
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/PlaceLookup.php
View File

@@ -405,7 +405,7 @@ class PlaceLookup
$sSQL .= ' CASE '; // interpolate the housenumbers here $sSQL .= ' CASE '; // interpolate the housenumbers here
$sSQL .= ' WHEN startnumber != endnumber '; $sSQL .= ' WHEN startnumber != endnumber ';
$sSQL .= ' THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) '; $sSQL .= ' THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ';
$sSQL .= ' ELSE ST_LineInterpolatePoint(linegeo, 0.5) '; $sSQL .= ' ELSE linegeo ';
$sSQL .= ' END as centroid, '; $sSQL .= ' END as centroid, ';
$sSQL .= ' parent_place_id, '; $sSQL .= ' parent_place_id, ';
$sSQL .= ' housenumber_for_place '; $sSQL .= ' housenumber_for_place ';

10
lib-php/ReverseGeocode.php
View File

@@ -64,8 +64,8 @@ class ReverseGeocode
{ {
Debug::newFunction('lookupInterpolation'); Debug::newFunction('lookupInterpolation');
$sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,'; $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search,';
$sSQL .= ' ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction,'; $sSQL .= ' (endnumber - startnumber) * ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fhnr,';
$sSQL .= ' startnumber, endnumber, interpolationtype,'; $sSQL .= ' startnumber, endnumber, step,';
$sSQL .= ' ST_Distance(linegeo,'.$sPointSQL.') as distance'; $sSQL .= ' ST_Distance(linegeo,'.$sPointSQL.') as distance';
$sSQL .= ' FROM location_property_osmline'; $sSQL .= ' FROM location_property_osmline';
$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')'; $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
@@ -363,7 +363,11 @@ class ReverseGeocode
if ($aHouse) { if ($aHouse) {
$oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE); $oResult = new Result($aHouse['place_id'], Result::TABLE_OSMLINE);
$oResult->iHouseNumber = closestHouseNumber($aHouse); $iRndNum = max(0, round($aHouse['fhnr'] / $aHouse['step']) * $aHouse['step']);
$oResult->iHouseNumber = $aHouse['startnumber'] + $iRndNum;
if ($oResult->iHouseNumber > $aHouse['endnumber']) {
$oResult->iHouseNumber = $aHouse['endnumber'];
}
$aPlace = $aHouse; $aPlace = $aHouse;
} }
} }

15
lib-php/SearchDescription.php
View File

@@ -769,18 +769,9 @@ class SearchDescription
// if nothing found, search in the interpolation line table // if nothing found, search in the interpolation line table
$sSQL = 'SELECT distinct place_id FROM location_property_osmline'; $sSQL = 'SELECT distinct place_id FROM location_property_osmline';
$sSQL .= ' WHERE startnumber is not NULL'; $sSQL .= ' WHERE startnumber is not NULL';
$sSQL .= ' AND parent_place_id in ('.$sRoadPlaceIDs.') AND ('; $sSQL .= ' and parent_place_id in ('.$sRoadPlaceIDs.')';
if ($iHousenumber % 2 == 0) { $sSQL .= ' and ('.$iHousenumber.' - startnumber) % step = 0';
// If housenumber is even, look for housenumber in streets $sSQL .= ' and '.$iHousenumber.' between startnumber and endnumber';
// with interpolationtype even or all.
$sSQL .= "interpolationtype='even'";
} else {
// Else look for housenumber with interpolationtype odd or all.
$sSQL .= "interpolationtype='odd'";
}
$sSQL .= " or interpolationtype='all') and ";
$sSQL .= $iHousenumber.'>=startnumber and ';
$sSQL .= $iHousenumber.'<=endnumber';
$sSQL .= $this->oContext->excludeSQL(' AND place_id'); $sSQL .= $this->oContext->excludeSQL(' AND place_id');
Debug::printSQL($sSQL); Debug::printSQL($sSQL);

6
test/bdd/db/import/interpolation.feature
View File

@@ -347,7 +347,7 @@ Feature: Import of address interpolations
Given the places Given the places
| osm | class | type | housenr | geometry | | osm | class | type | housenr | geometry |
| N1 | place | house | 0 | 1 1 | | N1 | place | house | 0 | 1 1 |
| N2 | place | house | 8 | 1 1.001 | | N2 | place | house | 10 | 1 1.001 |
And the places And the places
| osm | class | type | addr+interpolation | geometry | | osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001 | | W1 | place | houses | even | 1 1, 1 1.001 |
@@ -357,8 +357,8 @@ Feature: Import of address interpolations
When importing When importing
Then W1 expands to interpolation Then W1 expands to interpolation
| start | end | geometry | | start | end | geometry |
| 2 | 6 | 1 0002, 1 1.0008 | | 2 | 8 | 1 1.0002, 1 1.0008 |
When sending jsonv2 reverse coordinates 1,1 When sending jsonv2 reverse coordinates 1,1
Then results contain Then results contain
| ID | osm_type | osm_id | type | display_name | | ID | osm_type | osm_id | type | display_name |
| 0 | way | 1 | house | 0 | | 0 | node | 1 | house | 0 |