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

change tiger housenumber format to save as lines instead of points and thus new interpolation

Browse Source
This commit is contained in:
Markus Gail
2016-03-07 11:07:33 +01:00
parent a50bf1c944
commit bc449e10be
5 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/Geocode.php
View File

@@ -47,6 +47,10 @@
protected $sQuery = false; protected $sQuery = false;
protected $aStructuredQuery = false; protected $aStructuredQuery = false;
//for Tiger housenumber interpolation
protected $searchedHousenumber=-1;
protected $housenumberFound=false;
function Geocode(&$oDB) function Geocode(&$oDB)
{ {
$this->oDB =& $oDB; $this->oDB =& $oDB;
@@ -432,21 +436,29 @@
if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
{ {
$sSQL .= " union "; //query also location_property_tiger_line and location_property_aux
$sSQL .= "select 'T' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id,'us' as country_code,"; //Tiger search only if it was searched for a housenumber (searchedHousenumber >=0) and if it was found (housenumberFound = true)
$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; //only Tiger housenumbers need to be interpolated, because they are saved as lines with start- and endnumber, the common osm housenumbers are usually saved as points
$sSQL .= "null as placename,"; if($this->searchedHousenumber>=0 && $this->housenumberFound){
$sSQL .= "null as ref,"; $sSQL .= "union ";
if ($this->bIncludeExtraTags) $sSQL .= "null as extra,"; $sSQL .= "select 'T' as osm_type, place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id,'us' as country_code";
if ($this->bIncludeNameDetails) $sSQL .= "null as names,"; $sSQL .= ", get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress ";
$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, "; $sSQL .= ", null as placename";
$sSQL .= $sImportanceSQL."-1.15 as importance, "; $sSQL .= ", null as ref";
$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, "; if ($this->bIncludeExtraTags) $sSQL .= ", null as extra";
$sSQL .= "null as extra_place "; if ($this->bIncludeNameDetails) $sSQL .= ", null as names";
$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) "; $sSQL .= ", avg(st_x(point)) as lon, avg(st_y(point)) as lat";
$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank "; $sSQL .= $sImportanceSQL.", -1.15 as importance ";
$sSQL .= "group by place_id"; $sSQL .= ", 1.0 as addressimportance "; //not sure how the addressimportance is/should be calculated for Tiger data
if (!$this->bDeDupe) $sSQL .= ",place_id "; $sSQL .= ", null as extra_place ";
$sSQL .= " from (select place_id";
//interpolate the Tiger housenumbers here
$sSQL .= ",ST_LineInterpolatePoint(linegeo, ($this->searchedHousenumber::float-startnumber::float)/(endnumber-startnumber)::float) as point, parent_place_id ";
$sSQL .= "from location_property_tiger_line where place_id in ($sPlaceIDs) ";
$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
$sSQL .= " group by place_id"; //why group by place_id, isnt place_id unique?
if (!$this->bDeDupe) $sSQL .= ",place_id ";
}
$sSQL .= " union "; $sSQL .= " union ";
$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id,'us' as country_code,"; $sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id,'us' as country_code,";
$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
@@ -1392,6 +1404,7 @@
//var_Dump($aPlaceIDs); //var_Dump($aPlaceIDs);
//exit; //exit;
//now search for housenumber, if housenumber provided
if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
{ {
$aRoadPlaceIDs = $aPlaceIDs; $aRoadPlaceIDs = $aPlaceIDs;
@@ -1408,7 +1421,7 @@
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $this->oDB->getCol($sSQL); $aPlaceIDs = $this->oDB->getCol($sSQL);
// If not try the aux fallback table // If nothing found try the aux fallback table
if (!sizeof($aPlaceIDs)) if (!sizeof($aPlaceIDs))
{ {
$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
@@ -1420,27 +1433,43 @@
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $this->oDB->getCol($sSQL); $aPlaceIDs = $this->oDB->getCol($sSQL);
} }
//if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger_line)
if (!sizeof($aPlaceIDs)) if (!sizeof($aPlaceIDs))
{ {
$sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'"; //$sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
if (sizeof($this->aExcludePlaceIDs)) //new query for lines, not housenumbers anymore
$this->searchedHousenumber = intval($aSearch['sHouseNumber']);
if($this->searchedHousenumber%2==0){
//if housenumber is even, look for housenumber in streets with interpolationtype even or all
$sSQL = "select distinct place_id from location_property_tiger_line where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='even' or interpolationtype='all') and ".$this->searchedHousenumber.">=startnumber and ".$this->searchedHousenumber."<=endnumber";
}else{
//look for housenumber in streets with interpolationtype odd or all
$sSQL = "select distinct place_id from location_property_tiger_line where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='odd' or interpolationtype='all') and ".$this->searchedHousenumber.">=startnumber and ".$this->searchedHousenumber."<=endnumber";
}
if (sizeof($this->aExcludePlaceIDs))
{ {
$sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")"; $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
} }
//$sSQL .= " limit $this->iLimit"; //$sSQL .= " limit $this->iLimit";
if (CONST_Debug) var_dump($sSQL); if (CONST_Debug) var_dump($sSQL);
$aPlaceIDs = $this->oDB->getCol($sSQL); //get place IDs
$aPlaceIDs = $this->oDB->getCol($sSQL,0);
} }
// Fallback to the road // Fallback to the road (if no housenumber was found)
if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber'])) if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))
{ {
$aPlaceIDs = $aRoadPlaceIDs; $aPlaceIDs = $aRoadPlaceIDs;
} //set to false, if no housenumbers were found
$this->housenumberFound=false;
}else{
//housenumber was found
$this->housenumberFound=true;
}
} }
if ($aSearch['sClass'] && sizeof($aPlaceIDs)) if ($aSearch['sClass'] && sizeof($aPlaceIDs))
{ {
$sPlaceIDs = join(',',$aPlaceIDs); $sPlaceIDs = join(',',$aPlaceIDs);
@@ -1676,16 +1705,17 @@
{ {
$aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label']; $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
} }
/* Implement this function later. if tag '&addressdetails=1' is set in query
if ($this->bIncludeAddressDetails) if ($this->bIncludeAddressDetails)
{ {
* getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql
$aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']); $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);
if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city']))
{ {
$aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']); $aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']);
} }
} }
*/
if ($this->bIncludeExtraTags) if ($this->bIncludeExtraTags)
{ {
if ($aResult['extra']) if ($aResult['extra'])

2
settings/settings.php
View File

@@ -86,7 +86,7 @@
@define('CONST_BulkUserIPs', ''); @define('CONST_BulkUserIPs', '');
@define('CONST_BlockMessage', ''); // additional info to show for blocked IPs @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); @define('CONST_Website_BaseURL', 'http://localhost/nominatim/');
@define('CONST_Tile_Default', 'Mapnik'); @define('CONST_Tile_Default', 'Mapnik');
@define('CONST_Default_Language', false); @define('CONST_Default_Language', false);

7
sql/tiger_import_finish.sql
View File

@@ -1,4 +1,5 @@
CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber) {ts:aux-index}; --index only on parent_place_id
CREATE INDEX idx_location_property_tiger_parent_place_id_imp ON location_property_tiger_import (parent_place_id) {ts:aux-index};
CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index}; CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
GRANT SELECT ON location_property_tiger_import TO "{www-user}"; GRANT SELECT ON location_property_tiger_import TO "{www-user}";
@@ -6,7 +7,7 @@ GRANT SELECT ON location_property_tiger_import TO "{www-user}";
DROP TABLE IF EXISTS location_property_tiger; DROP TABLE IF EXISTS location_property_tiger;
ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger; ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id; ALTER INDEX idx_location_property_tiger_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id; ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
DROP FUNCTION tigger_create_interpolation (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text); DROP FUNCTION tiger_line_import (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);

19
sql/tiger_import_start.sql
View File

@@ -1,17 +1,14 @@
DROP TABLE IF EXISTS location_property_tiger_import; DROP TABLE IF EXISTS location_property_tiger_import;
CREATE TABLE location_property_tiger_import () INHERITS (location_property) {ts:aux-data}; CREATE TABLE location_property_tiger_import (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, street TEXT, isin TEXT, postcode TEXT);
CREATE OR REPLACE FUNCTION tigger_create_interpolation(linegeo GEOMETRY, in_startnumber INTEGER, CREATE OR REPLACE FUNCTION tiger_line_import(linegeo GEOMETRY, in_startnumber INTEGER,
in_endnumber INTEGER, interpolationtype TEXT, in_endnumber INTEGER, interpolationtype TEXT,
in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER in_street TEXT, in_isin TEXT, in_postcode TEXT) RETURNS INTEGER
AS $$ AS $$
DECLARE DECLARE
startnumber INTEGER; startnumber INTEGER;
endnumber INTEGER; endnumber INTEGER;
stepsize INTEGER; stepsize INTEGER;
housenum INTEGER;
newpoints INTEGER;
numberrange INTEGER; numberrange INTEGER;
rangestartnumber INTEGER; rangestartnumber INTEGER;
place_centroid GEOMETRY; place_centroid GEOMETRY;
@@ -75,15 +72,11 @@ BEGIN
END LOOP; END LOOP;
END IF; END IF;
newpoints := 0; --insert street(line) into import table
FOR housenum IN startnumber..endnumber BY stepsize LOOP insert into location_property_tiger_import (linegeo, place_id, partition, parent_place_id, startnumber, endnumber, interpolationtype, street, isin, postcode)
insert into location_property_tiger_import (place_id, partition, parent_place_id, housenumber, postcode, centroid) values (linegeo, nextval('seq_place'), out_partition, out_parent_place_id, startnumber, endnumber, interpolationtype, in_street, in_isin, in_postcode);
values (nextval('seq_place'), out_partition, out_parent_place_id, housenum, in_postcode,
ST_LineInterpolatePoint(linegeo, (housenum::float-rangestartnumber::float)/numberrange::float));
newpoints := newpoints + 1;
END LOOP;
RETURN newpoints; RETURN 1;
END; END;
$$ $$
LANGUAGE plpgsql; LANGUAGE plpgsql;

6
utils/tigerAddressImport.py
View File

@@ -3893,8 +3893,8 @@ def addressways(waylist, nodelist, first_id):
# ret.append( "<tag k=\"source\" v=\"%s_import_v%s_%s\" />" % (iSource, VERSION, import_guid) ) # ret.append( "<tag k=\"source\" v=\"%s_import_v%s_%s\" />" % (iSource, VERSION, import_guid) )
# ret.append( "<tag k=\"attribution\" v=\"%s\" />" % (iAttrib) ) # ret.append( "<tag k=\"attribution\" v=\"%s\" />" % (iAttrib) )
# ret.append( "</way>" ) # ret.append( "</way>" )
# call new tiger_line_import function to save the lines in the DB.
ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % ret.append( "select tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" %
( ",".join(rlinestring), rfromadd.replace("'", "''"), rtoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipr.replace("'", "''") ) ) ( ",".join(rlinestring), rfromadd.replace("'", "''"), rtoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipr.replace("'", "''") ) )
if left: if left:
@@ -3919,7 +3919,7 @@ def addressways(waylist, nodelist, first_id):
interpolationtype = "all"; interpolationtype = "all";
else: else:
interpolationtype = "all"; interpolationtype = "all";
ret.append( "select tigger_create_interpolation(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" % ret.append( "select tiger_line_import(ST_GeomFromText('LINESTRING(%s)',4326), '%s', '%s', '%s', '%s', '%s', '%s');" %
( ",".join(llinestring), lfromadd.replace("'", "''"), ltoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipl.replace("'", "''") ) ) ( ",".join(llinestring), lfromadd.replace("'", "''"), ltoadd.replace("'", "''"), interpolationtype.replace("'", "''"), name.replace("'", "''"), county.replace("'", "''"), zipl.replace("'", "''") ) )
return ret return ret