AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 std-options check-news])
dnl Additional macro definitions are in here
+m4_include([m4/ax_lib_postgresql_svr.m4])
AC_CONFIG_MACRO_DIR([osm2pgsql/m4])
dnl Generate configuration header file
then
AC_MSG_ERROR([postgresql client library not found])
fi
+AX_LIB_POSTGRESQL_SVR(9.0)
if test ! -f "$POSTGRESQL_PGXS"
then
AC_MSG_ERROR([postgresql server development library not found])
protected $aLangPrefOrder = array();
protected $bIncludeAddressDetails = false;
+ protected $bIncludeExtraTags = false;
+ protected $bIncludeNameDetails = false;
protected $bIncludePolygonAsPoints = false;
protected $bIncludePolygonAsText = false;
return $this->bIncludeAddressDetails;
}
+ function getIncludeExtraTags()
+ {
+ return $this->bIncludeExtraTags;
+ }
+
+ function getIncludeNameDetails()
+ {
+ return $this->bIncludeNameDetails;
+ }
+
function setIncludePolygonAsPoints($b = true)
{
$this->bIncludePolygonAsPoints = $b;
function loadParamArray($aParams)
{
if (isset($aParams['addressdetails'])) $this->bIncludeAddressDetails = (bool)$aParams['addressdetails'];
+ if ((float) CONST_Postgresql_Version > 9.2)
+ {
+ if (isset($aParams['extratags'])) $this->bIncludeExtraTags = (bool)$aParams['extratags'];
+ if (isset($aParams['namedetails'])) $this->bIncludeNameDetails = (bool)$aParams['namedetails'];
+ }
if (isset($aParams['bounded'])) $this->bBoundedSearch = (bool)$aParams['bounded'];
if (isset($aParams['dedupe'])) $this->bDeDupe = (bool)$aParams['dedupe'];
$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
+ if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text as extra,";
+ if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text as names,";
$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
$sSQL .= $sImportanceSQL."coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
$sSQL .= ",langaddress ";
$sSQL .= ",placename ";
$sSQL .= ",ref ";
+ if ($this->bIncludeExtraTags) $sSQL .= ",extratags";
+ if ($this->bIncludeNameDetails) $sSQL .= ",name";
$sSQL .= ",extratags->'place' ";
if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
$sSQL .= "null as placename,";
$sSQL .= "null as ref,";
+ if ($this->bIncludeExtraTags) $sSQL .= "null as extra,";
+ if ($this->bIncludeNameDetails) $sSQL .= "null as names,";
$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
$sSQL .= $sImportanceSQL."-1.15 as importance, ";
$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, ";
$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
$sSQL .= "null as placename,";
$sSQL .= "null as ref,";
+ if ($this->bIncludeExtraTags) $sSQL .= "null as extra,";
+ if ($this->bIncludeNameDetails) $sSQL .= "null as names,";
$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
$sSQL .= $sImportanceSQL."-1.10 as importance, ";
$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.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)
+ {
+ if ($aResult['extra'])
+ {
+ $aResult['sExtraTags'] = json_decode($aResult['extra']);
+ }
+ else
+ {
+ $aResult['sExtraTags'] = (object) array();
+ }
+ }
+
+ if ($this->bIncludeNameDetails)
+ {
+ if ($aResult['names'])
+ {
+ $aResult['sNameDetails'] = json_decode($aResult['names']);
+ }
+ else
+ {
+ $aResult['sNameDetails'] = (object) array();
+ }
+ }
+
// Adjust importance for the number of exact string matches in the result
$aResult['importance'] = max(0.001,$aResult['importance']);
$iCountWords = 0;
{
$aResult['foundorder'] += 0.01;
}
+ if (CONST_Debug) { var_dump($aResult); }
$aSearchResults[$iResNum] = $aResult;
}
uasort($aSearchResults, 'byImportance');
protected $iPlaceID;
- protected $bIsTiger = false;
+ protected $sType = false;
protected $aLangPrefOrder = array();
protected $bAddressDetails = false;
+ protected $bExtraTags = false;
+
+ protected $bNameDetails = false;
+
function PlaceLookup(&$oDB)
{
$this->oDB =& $oDB;
$this->bAddressDetails = $bAddressDetails;
}
+ function setIncludeExtraTags($bExtraTags = false)
+ {
+ if ((float) CONST_Postgresql_Version > 9.2)
+ {
+ $this->bExtraTags = $bExtraTags;
+ }
+ }
+
+ function setIncludeNameDetails($bNameDetails = false)
+ {
+ if ((float) CONST_Postgresql_Version > 9.2)
+ {
+ $this->bNameDetails = $bNameDetails;
+ }
+ }
+
function setPlaceID($iPlaceID)
{
$this->iPlaceID = $iPlaceID;
$this->iPlaceID = $this->oDB->getOne($sSQL);
}
- function setIsTiger($b = false)
+ function lookupPlace($details)
{
- $this->bIsTiger = $b;
+ if (isset($details['place_id'])) $this->iPlaceID = $details['place_id'];
+ if (isset($details['type'])) $this->sType = $details['type'];
+ if (isset($details['osm_type']) && isset($details['osm_id']))
+ {
+ $this->setOSMID($details['osm_type'], $details['osm_id']);
+ }
+
+ return $this->lookup();
}
function lookup()
$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
- $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search, ";
- $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
- $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
- $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
- $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
- $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,";
- $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon";
- $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
-
-
- if ($this->bIsTiger)
+ if ($this->sType == 'tiger')
{
$sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,";
- $sSQL .= " 'us' as country_code, null as extratags, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+ $sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
$sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
$sSQL .= " null as placename,";
$sSQL .= " null as ref,";
+ if ($this->bExtraTags) $sSQL .= " null as extra,";
+ if ($this->bNameDetails) $sSQL .= " null as names,";
$sSQL .= " st_y(centroid) as lat,";
$sSQL .= " st_x(centroid) as lon";
$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
}
+ else
+ {
+ $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, parent_place_id, linked_place_id, rank_address, rank_search, ";
+ $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
+ $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+ $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+ $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+ if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,";
+ if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,";
+ $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,";
+ $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon";
+ $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
+ }
$aPlace = $this->oDB->getRow($sSQL);
$aPlace['aAddress'] = $aAddress;
}
+ if ($this->bExtraTags)
+ {
+ if ($aPlace['extra'])
+ {
+ $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+ }
+ else
+ {
+ $aPlace['sExtraTags'] = (object) array();
+ }
+ }
+
+ if ($this->bNameDetails)
+ {
+ if ($aPlace['names'])
+ {
+ $aPlace['sNameDetails'] = json_decode($aPlace['names']);
+ }
+ else
+ {
+ $aPlace['sNameDetails'] = (object) array();
+ }
+ }
$aClassType = getClassTypes();
$sAddressType = '';
function getAddressNames()
{
- $aAddressLines = $this->getAddressDetails(false);;
+ $aAddressLines = $this->getAddressDetails(false);
$aAddress = array();
$aFallback = array();
protected $aLangPrefOrder = array();
- protected $bShowAddressDetails = true;
-
function ReverseGeocode(&$oDB)
{
$this->oDB =& $oDB;
$this->aLangPrefOrder = $aLangPref;
}
- function setIncludeAddressDetails($bAddressDetails = true)
- {
- $this->bAddressDetails = $bAddressDetails;
- }
-
function setLatLon($fLat, $fLon)
{
$this->fLat = (float)$fLat;
}
}
- $oPlaceLookup = new PlaceLookup($this->oDB);
- $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder);
- $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails);
- $oPlaceLookup->setPlaceId($iPlaceID);
- $oPlaceLookup->setIsTiger($bPlaceIsTiger);
-
- return $oPlaceLookup->lookup();
+ return array('place_id' => $iPlaceID,
+ 'type' => $bPlaceIsTiger ? 'tiger' : 'osm');
}
}
?>
exit;
}
+ function getParamBool($name, $default=false)
+ {
+ if (!isset($_GET[$name])) return $default;
+
+ return (bool) $_GET[$name];
+ }
function fail($sError, $sUserError = false)
{
}
- function javascript_renderData($xVal)
+ function javascript_renderData($xVal, $iOptions = 0)
{
header("Access-Control-Allow-Origin: *");
- $iOptions = 0;
if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400)
- $iOptions = JSON_UNESCAPED_UNICODE;
+ $iOptions |= JSON_UNESCAPED_UNICODE;
$jsonout = json_encode($xVal, $iOptions);
if( ! isset($_GET['json_callback']))
}
// degrees decimal seconds
// N 40 26 46 W 79 58 56
- // N 40° 26′ 46″ W, 79° 58′ 56″
+ // N 40° 26′ 46″, W 79° 58′ 56″
// 1 2 3 4 5 6 7 8
elseif (preg_match('/\\b([NS])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*[, ]+([EW])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*\\b/', $sQuery, $aData))
{
}
else
{
- if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+ if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
if ($sOSMType)
if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
- if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+ if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+ if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+ if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
}
javascript_renderData($aFilteredPlaces);
$aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
- $aFilteredPlaces['category'] = $aPlace['class'];
- $aFilteredPlaces['type'] = $aPlace['type'];
+ $aFilteredPlaces['category'] = $aPlace['class'];
+ $aFilteredPlaces['type'] = $aPlace['type'];
$aFilteredPlaces['importance'] = $aPlace['importance'];
- $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+ $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
$aFilteredPlaces['display_name'] = $aPlace['langaddress'];
- $aFilteredPlaces['name'] = $aPlace['placename'];
- if ($bShowAddressDetails && $aPlace['aAddress'] && sizeof($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+ $aFilteredPlaces['name'] = $aPlace['placename'];
+
+ if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+ if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+ if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
}
javascript_renderData($aFilteredPlaces);
if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
- if ($bShowAddressDetails) {
+ if (isset($aPlace['aAddress']))
+ {
echo "<addressparts>";
foreach($aPlace['aAddress'] as $sKey => $sValue)
{
}
echo "</addressparts>";
}
+
+ if (isset($aPlace['sExtraTags']))
+ {
+ echo "<extratags>";
+ foreach ($aPlace['sExtraTags'] as $sKey => $sValue)
+ {
+ echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+ }
+ echo "</extratags>";
+ }
+
+ if (isset($aPlace['sNameDetails']))
+ {
+ echo "<namedetails>";
+ foreach ($aPlace['sNameDetails'] as $sKey => $sValue)
+ {
+ echo '<name desc="'.htmlspecialchars($sKey).'">';
+ echo htmlspecialchars($sValue);
+ echo "</name>";
+ }
+ echo "</namedetails>";
+ }
}
echo "</reversegeocode>";
$aPlace['geokml'] = $aPointDetails['askml'];
}
+ if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+ if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+
$aFilteredPlaces[] = $aPlace;
}
$aPlace['geokml'] = $aPointDetails['askml'];
}
+ if (isset($aPointDetails['sExtraTags'])) $aPlace['extratags'] = $aPointDetails['sExtraTags'];
+ if (isset($aPointDetails['sNameDetails'])) $aPlace['namedetails'] = $aPointDetails['sNameDetails'];
+
$aFilteredPlaces[] = $aPlace;
}
- javascript_renderData($aFilteredPlaces, array('geojson'));
+ javascript_renderData($aFilteredPlaces);
echo " icon='".htmlspecialchars($aResult['icon'], ENT_QUOTES)."'";
}
- if (isset($aResult['address']) || isset($aResult['askml']))
- {
- echo ">";
- }
+ $bHasDelim = false;
if (isset($aResult['askml']))
{
+ if (!$bHasDelim)
+ {
+ $bHasDelim = true;
+ echo ">";
+ }
echo "\n<geokml>";
echo $aResult['askml'];
echo "</geokml>";
}
+ if (isset($aResult['sExtraTags']))
+ {
+ if (!$bHasDelim)
+ {
+ $bHasDelim = true;
+ echo ">";
+ }
+ echo "\n<extratags>";
+ foreach ($aResult['sExtraTags'] as $sKey => $sValue)
+ {
+ echo '<tag key="'.htmlspecialchars($sKey).'" value="'.htmlspecialchars($sValue).'"/>';
+ }
+ echo "</extratags>";
+ }
+
+ if (isset($aResult['sNameDetails']))
+ {
+ if (!$bHasDelim)
+ {
+ $bHasDelim = true;
+ echo ">";
+ }
+ echo "\n<namedetails>";
+ foreach ($aResult['sNameDetails'] as $sKey => $sValue)
+ {
+ echo '<name desc="'.htmlspecialchars($sKey).'">';
+ echo htmlspecialchars($sValue);
+ echo "</name>";
+ }
+ echo "</namedetails>";
+ }
+
if (isset($aResult['address']))
{
+ if (!$bHasDelim)
+ {
+ $bHasDelim = true;
+ echo ">";
+ }
echo "\n";
foreach($aResult['address'] as $sKey => $sValue)
{
}
}
- if (isset($aResult['address']) || isset($aResult['askml']))
+ if ($bHasDelim)
{
echo "</place>";
}
--- /dev/null
+# SYNOPSIS
+#
+# AX_LIB_POSTGRESQL_SVR([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+# This macro provides tests of availability of PostgreSQL server library
+#
+# This macro calls:
+#
+# AC_SUBST(POSTGRESQL_PGXS)
+# AC_SUBST(POSTGRESQL_SERVER_CFLAGS)
+#
+# LICENSE
+#
+# Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2015 Sarah Hoffmann <lonia@denofr.de>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+AC_DEFUN([AX_LIB_POSTGRESQL_SVR],
+[
+ AC_ARG_WITH([postgresql],
+ AC_HELP_STRING([--with-postgresql-svr=@<:@ARG@:>@],
+ [use PostgreSQL server library @<:@default=yes@:>@, optionally specify path to pg_config]
+ ),
+ [
+ if test "$withval" = "no"; then
+ want_postgresql="no"
+ elif test "$withval" = "yes"; then
+ want_postgresql="yes"
+ else
+ want_postgresql="yes"
+ PG_CONFIG="$withval"
+ fi
+ ],
+ [want_postgresql="yes"]
+ )
+
+ dnl
+ dnl Check PostgreSQL server libraries
+ dnl
+
+ if test "$want_postgresql" = "yes"; then
+
+ if test -z "$PG_CONFIG" -o test; then
+ AC_PATH_PROG([PG_CONFIG], [pg_config], [])
+ fi
+
+ if test ! -x "$PG_CONFIG"; then
+ AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an exectuable file])
+ PG_CONFIG="no"
+ found_postgresql="no"
+ fi
+
+ if test "$PG_CONFIG" != "no"; then
+ AC_MSG_CHECKING([for PostgreSQL server libraries])
+
+ POSTGRESQL_SERVER_CFLAGS="-I`$PG_CONFIG --includedir-server`"
+
+ POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+
+ POSTGRESQL_PGXS=`$PG_CONFIG --pgxs`
+ if test -f "$POSTGRESQL_PGXS"
+ then
+ found_postgresql="yes"
+ AC_MSG_RESULT([yes])
+ fi
+ else
+ found_postgresql="no"
+ AC_MSG_RESULT([no])
+ fi
+ fi
+
+ dnl
+ dnl Check if required version of PostgreSQL is available
+ dnl
+
+
+ postgresql_version_req=ifelse([$1], [], [], [$1])
+
+ if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
+
+ AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
+
+ dnl Decompose required version string of PostgreSQL
+ dnl and calculate its number representation
+ postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
+ postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+ postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+ if test "x$postgresql_version_req_micro" = "x"; then
+ postgresql_version_req_micro="0"
+ fi
+
+ postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
+ \+ $postgresql_version_req_minor \* 1000 \
+ \+ $postgresql_version_req_micro`
+
+ dnl Decompose version string of installed PostgreSQL
+ dnl and calculate its number representation
+ postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
+ postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
+ postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+ if test "x$postgresql_version_micro" = "x"; then
+ postgresql_version_micro="0"
+ fi
+
+ postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
+ \+ $postgresql_version_minor \* 1000 \
+ \+ $postgresql_version_micro`
+
+ postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
+ if test "$postgresql_version_check" = "1"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+
+ AC_SUBST([POSTGRESQL_PGXS])
+ AC_SUBST([POSTGRESQL_SERVER_CFLAGS])
+])
+
nominatim_SOURCES = export.c geometry.cpp import.c index.c input.c nominatim.c postgresql.c sprompt.c
-AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DVERSION='"@PACKAGE_VERSION@"'
-AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@
+AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CPPFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DVERSION='"@PACKAGE_VERSION@"'
+AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CPPFLAGS@ @XML_CPPFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@
nominatim_LDADD = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ @XML_LIBS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ -lz
-Subproject commit 07db15e5e55eca63971a014ddb08bc47cd89f762
+Subproject commit 8179cdb67e70d7fb5605ab6ddedfd0bd3347db47
@define('CONST_Search_TryDroppedAddressTerms', false);
@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
+ // If set to true, then reverse order of queries will be tried by default.
+ // When set to false only selected languages alloow reverse search.
+ @define('CONST_Search_ReversePlanForAll', true);
@define('CONST_Places_Max_ID_count', 50);
END;
$$ LANGUAGE plpgsql;
+
CREATE OR REPLACE FUNCTION get_name_by_language(name hstore, languagepref TEXT[]) RETURNS TEXT
AS $$
DECLARE
- search TEXT[];
- found BOOLEAN;
+ result TEXT;
BEGIN
-
IF name is null THEN
RETURN null;
END IF;
- search := languagepref;
-
- FOR j IN 1..array_upper(search, 1) LOOP
- IF name ? search[j] AND trim(name->search[j]) != '' THEN
- return trim(name->search[j]);
+ FOR j IN 1..array_upper(languagepref,1) LOOP
+ IF name ? languagepref[j] THEN
+ result := trim(name->languagepref[j]);
+ IF result != '' THEN
+ return result;
+ END IF;
END IF;
END LOOP;
-- anything will do as a fallback - just take the first name type thing there is
- search := avals(name);
- RETURN search[1];
+ RETURN trim((avals(name))[1]);
END;
$$
LANGUAGE plpgsql IMMUTABLE;
| 0 | Kings Estate Drive | 84128 | us
And result 0 has attributes osm_id,osm_type
+ Scenario Outline: Reverse Geocoding with extratags
+ Given the request parameters
+ | extratags
+ | 1
+ When looking up <format> coordinates 48.86093,2.2978
+ Then result 0 has attributes extratags
+
+ Examples:
+ | format
+ | xml
+ | json
+ | jsonv2
+
+ Scenario Outline: Reverse Geocoding with namedetails
+ Given the request parameters
+ | namedetails
+ | 1
+ When looking up <format> coordinates 48.86093,2.2978
+ Then result 0 has attributes namedetails
+
+ Examples:
+ | format
+ | xml
+ | json
+ | jsonv2
Then result addresses contain
| ID | city
| 0 | Chicago
-
+
Scenario: No POI search with unbounded viewbox
Given the request parameters
| viewbox
| 0.5
| 999
| nan
+
+ Scenario Outline: Search with extratags
+ Given the request parameters
+ | extratags
+ | 1
+ When sending <format> search query "Hauptstr"
+ Then result 0 has attributes extratags
+ And result 1 has attributes extratags
+
+ Examples:
+ | format
+ | xml
+ | json
+ | jsonv2
+
+ Scenario Outline: Search with namedetails
+ Given the request parameters
+ | namedetails
+ | 1
+ When sending <format> search query "Hauptstr"
+ Then result 0 has attributes namedetails
+ And result 1 has attributes namedetails
+
+ Examples:
+ | format
+ | xml
+ | json
+ | jsonv2
| limit | 1000
| dedupe | 1
| dedupe | 0
+ | extratags | 1
+ | extratags | 0
+ | namedetails | 1
+ | namedetails | 0
Scenario: Search with invalid output format
Given the request parameters
| my:ref
| br:name
| name:prefix
+ | name:source
Scenario: Special character in name tag
Given the osm nodes:
| id | tags
- | 1 | 'highway' : 'yes', 'name: de' : 'Foo', 'name' : 'real'
- | 2 | 'highway' : 'yes', 'name:\nde' : 'Foo', 'name' : 'real'
- | 3 | 'highway' : 'yes', 'name:\tde' : 'Foo', 'name:\\' : 'real'
+ | 1 | 'highway' : 'yes', 'name: de' : 'Foo', 'name' : 'real1'
+ | 2 | 'highway' : 'yes', 'name:
de' : 'Foo', 'name' : 'real2'
+ | 3 | 'highway' : 'yes', 'name:	de' : 'Foo', 'name:\\' : 'real3'
When loading osm data
Then table place contains
| object | name
- | N1 | 'name:_de' : 'Foo', 'name' : 'real'
- | N2 | 'name:_de' : 'Foo', 'name' : 'real'
- | N3 | 'name:_de' : 'Foo', 'name:\\\\' : 'real'
+ | N1 | 'name: de' : 'Foo', 'name' : 'real1'
+ | N2 | 'name: de' : 'Foo', 'name' : 'real2'
+ | N3 | 'name: de' : 'Foo', 'name:\\\\' : 'real3'
Scenario Outline: Included places
Given the osm nodes:
| boundary | administrative
| waterway | stream
+ Scenario: Footways are not included if they are sidewalks
+ Given the osm nodes:
+ | id | tags
+ | 2 | 'highway' : 'footway', 'name' : 'To Hell', 'footway' : 'sidewalk'
+ | 23 | 'highway' : 'footway', 'name' : 'x'
+ When loading osm data
+ Then table place has no entry for N2
+
Scenario: named junctions are included if there is no other tag
Given the osm nodes:
| id | tags
Then table place contains
| object | class | type | isin
| N10 | place | village | Feebourgh county
- | N11 | place | village | Alabama,Feebourgh county
+ | N11 | place | village | Feebourgh county,Alabama
| N12 | place | village | Feebourgh county
Scenario Outline: Import of address tags
| locality
| wikipedia
| wikipedia:de
+ | wikidata
+ | name:prefix
+ | name:botanical
+ | name:etymology:wikidata
Scenario: buildings
Given the osm nodes:
newresult = OrderedDict(node.attributes.items())
assert_not_in('address', newresult)
assert_not_in('geokml', newresult)
+ assert_not_in('extratags', newresult)
+ assert_not_in('namedetails', newresult)
address = OrderedDict()
for sub in node.childNodes:
if sub.nodeName == 'geokml':
newresult['geokml'] = sub.childNodes[0].toxml()
+ elif sub.nodeName == 'extratags':
+ newresult['extratags'] = {}
+ for tag in sub.childNodes:
+ assert_equals(tag.nodeName, 'tag')
+ attrs = dict(tag.attributes.items())
+ assert_in('key', attrs)
+ assert_in('value', attrs)
+ newresult['extratags'][attrs['key']] = attrs['value']
+ elif sub.nodeName == 'namedetails':
+ newresult['namedetails'] = {}
+ for tag in sub.childNodes:
+ assert_equals(tag.nodeName, 'name')
+ attrs = dict(tag.attributes.items())
+ assert_in('desc', attrs)
+ newresult['namedetails'][attrs['desc']] = tag.firstChild.nodeValue.strip()
+
elif sub.nodeName == '#text':
pass
else:
for sub in node.childNodes:
address[sub.nodeName] = sub.firstChild.nodeValue.strip()
world.results[0]['address'] = address
+ elif node.nodeName == 'extratags':
+ world.results[0]['extratags'] = {}
+ for tag in node.childNodes:
+ assert_equals(tag.nodeName, 'tag')
+ attrs = dict(tag.attributes.items())
+ assert_in('key', attrs)
+ assert_in('value', attrs)
+ world.results[0]['extratags'][attrs['key']] = attrs['value']
+ elif node.nodeName == 'namedetails':
+ world.results[0]['namedetails'] = {}
+ for tag in node.childNodes:
+ assert_equals(tag.nodeName, 'name')
+ attrs = dict(tag.attributes.items())
+ assert_in('desc', attrs)
+ world.results[0]['namedetails'][attrs['desc']] = tag.firstChild.nodeValue.strip()
elif node.nodeName == "#text":
pass
else:
_parse_xml()
elif world.response_format == 'json':
world.results = json.JSONDecoder(object_pairs_hook=OrderedDict).decode(world.page)
+ if world.request_type == 'reverse':
+ world.results = (world.results,)
else:
assert False, "Unknown page format: %s" % (world.response_format)
logger = logging.getLogger(__name__)
def api_call(requesttype):
+ world.request_type = requesttype
world.json_callback = None
data = urllib.urlencode(world.params)
url = "%s/%s?%s" % (world.config.base_url, requesttype, data)
world.osm2pgsql.sort(cmp=_sort_xml_entries)
# create a OSM file in /tmp
- with tempfile.NamedTemporaryFile(dir='/tmp', delete=False) as fd:
+ with tempfile.NamedTemporaryFile(dir='/tmp', suffix='.osm', delete=False) as fd:
fname = fd.name
fd.write("<?xml version='1.0' encoding='UTF-8'?>\n")
fd.write('<osm version="0.6" generator="test-nominatim" timestamp="2014-08-26T20:22:02Z">\n')
world.run_nominatim_script('setup', 'index', 'index-noanalyse')
world.run_nominatim_script('setup', 'create-functions', 'create-partition-functions', 'enable-diff-updates')
- with tempfile.NamedTemporaryFile(dir='/tmp', delete=False) as fd:
+ with tempfile.NamedTemporaryFile(dir='/tmp', suffix='.osc', delete=False) as fd:
fname = fd.name
fd.write("<?xml version='1.0' encoding='UTF-8'?>\n")
fd.write('<osmChange version="0.6" generator="Osmosis 0.43.1">\n')
array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'),
array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'),
+ array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
);
getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
}
// Assume we can steal all the cache memory in the box (unless told otherwise)
- $iCacheMemory = (isset($aCMDResult['osm2pgsql-cache'])?$aCMDResult['osm2pgsql-cache']:getCacheMemoryMB());
- if ($iCacheMemory > getTotalMemoryMB())
+ if (isset($aCMDResult['osm2pgsql-cache']))
+ {
+ $iCacheMemory = $aCMDResult['osm2pgsql-cache'];
+ }
+ else
{
$iCacheMemory = getCacheMemoryMB();
- echo "WARNING: resetting cache memory to $iCacheMemory\n";
}
$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
} else {
- pgsqlRunScript('CREATE EXTENSION postgis');
+ pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');
}
if ($fPostgisVersion < 2.1) {
// Function was renamed in 2.1 and throws an annoying deprecation warning
$osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
if (CONST_Tablespace_Place_Index)
$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
- $osm2pgsql .= ' -lsc -O gazetteer --hstore';
+ $osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
$osm2pgsql .= ' -C '.$iCacheMemory;
$osm2pgsql .= ' -P '.$aDSNInfo['port'];
$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
}
- if ($aCMDResult['osmosis-init'] || $aCMDResult['all'])
+ if ($aCMDResult['osmosis-init'] || ($aCMDResult['all'] && !$aCMDResult['drop'])) // no use doing osmosis-init when dropping update tables
{
$bDidSomething = true;
$oDB =& getDB();
}
}
+ if ($aCMDResult['drop'])
+ {
+ // The implementation is potentially a bit dangerous because it uses
+ // a positive selection of tables to keep, and deletes everything else.
+ // Including any tables that the unsuspecting user might have manually
+ // created. USE AT YOUR OWN PERIL.
+ $bDidSomething = true;
+
+ // tables we want to keep. everything else goes.
+ $aKeepTables = array(
+ "*columns",
+ "import_polygon_*",
+ "import_status",
+ "place_addressline",
+ "location_property*",
+ "placex",
+ "search_name",
+ "seq_*",
+ "word",
+ "query_log",
+ "new_query_log",
+ "gb_postcode",
+ "spatial_ref_sys",
+ "country_name",
+ "place_classtype_*"
+ );
+
+ $oDB =& getDB();
+ $aDropTables = array();
+ $aHaveTables = $oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
+ if (PEAR::isError($aHaveTables))
+ {
+ fail($aPartitions->getMessage());
+ }
+ foreach($aHaveTables as $sTable)
+ {
+ $bFound = false;
+ foreach ($aKeepTables as $sKeep)
+ {
+ if (fnmatch($sKeep, $sTable))
+ {
+ $bFound = true;
+ break;
+ }
+ }
+ if (!$bFound) array_push($aDropTables, $sTable);
+ }
+
+ foreach ($aDropTables as $sDrop)
+ {
+ if ($aCMDResult['verbose']) echo "dropping table $sDrop\n";
+ @pg_query($oDB->connection, "DROP TABLE $sDrop CASCADE");
+ // ignore warnings/errors as they might be caused by a table having
+ // been deleted already by CASCADE
+ }
+
+ if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+ {
+ if ($aCMDResult['verbose']) echo "deleting ".CONST_Osm2pgsql_Flatnode_File."\n";
+ unlink(CONST_Osm2pgsql_Flatnode_File);
+ }
+ }
+
if (!$bDidSomething)
{
showUsage($aCMDOptions, true);
$iCacheMemory = getCacheMemoryMB();
echo "WARNING: resetting cache memory to $iCacheMemory\n";
}
- $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+ $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
if (!is_null(CONST_Osm2pgsql_Flatnode_File))
{
$sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
$sOutputFormat = $_GET['format'];
}
- // Show address breakdown
- $bShowAddressDetails = true;
- if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
-
// Preferred language
$aLangPrefOrder = getPreferredLanguages();
{
$oPlaceLookup = new PlaceLookup($oDB);
$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
- $oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
+ $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+ $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+ $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
$aOsmIds = explode(',', $_GET['osm_ids']);
$sOutputFormat = $_GET['format'];
}
- // Show address breakdown
- $bShowAddressDetails = true;
- if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
-
// Preferred language
$aLangPrefOrder = getPreferredLanguages();
$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
+
if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
{
- $oPlaceLookup = new PlaceLookup($oDB);
- $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
- $oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails);
- $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
-
- $aPlace = $oPlaceLookup->lookup();
+ $aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']);
}
else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
{
$oReverseGeocode = new ReverseGeocode($oDB);
$oReverseGeocode->setLanguagePreference($aLangPrefOrder);
- $oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails);
$oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
$oReverseGeocode->setZoom(@$_GET['zoom']);
- $aPlace = $oReverseGeocode->lookup();
+ $aLookup = $oReverseGeocode->lookup();
+ if (CONST_Debug) var_dump($aLookup);
+ }
+ else
+ {
+ $aLookup = null;
+ }
+
+ if ($aLookup)
+ {
+ $oPlaceLookup = new PlaceLookup($oDB);
+ $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+ $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+ $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+ $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+
+ $aPlace = $oPlaceLookup->lookupPlace($aLookup);
}
else
{
$aPlace = null;
}
- if (CONST_Debug) exit;
+
+ if (CONST_Debug)
+ {
+ var_dump($aPlace);
+ exit;
+ }
include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
$aLangPrefOrder = getPreferredLanguages();
$oGeocode->setLanguagePreference($aLangPrefOrder);
- if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
- if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
+ if (CONST_Search_ReversePlanForAll
+ || isset($aLangPrefOrder['name:de'])
+ || isset($aLangPrefOrder['name:ru'])
+ || isset($aLangPrefOrder['name:ja'])
+ || isset($aLangPrefOrder['name:pl']))
+ {
+ $oGeocode->setReverseInPlan(true);
+ }
// Format for output
$sOutputFormat = 'html';
$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
- $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+ $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
if ($bShowPolygons) $sMoreURL .= '&polygon=1';
if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
+ if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1';
+ if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1';
if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
$sMoreURL .= '&q='.urlencode($sQuery);
exit;
}
- $oDB =& getDB();
+ $oDB =& DB::connect(CONST_Database_DSN, false);
if (!$oDB || PEAR::isError($oDB))
{
statusError("No database");
projects / nominatim.git / commitdiff