protected $aLangPrefOrderSql = "''";
protected $bAddressDetails = false;
+ protected $bAddressAdminLevels = false;
protected $bExtraTags = false;
protected $bNameDetails = false;
$this->bIncludePolygonAsPoints = $b;
}
+ public function setAddressAdminLevels($b = true)
+ {
+ $this->bAddressAdminLevels = $b;
+ }
+
public function loadParamArray($oParams, $sGeomType = null)
{
$aLangs = $oParams->getPreferredLanguages();
$this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);
- if ($sGeomType === null || $sGeomType == 'text') {
- $this->bIncludePolygonAsText = $oParams->getBool('polygon_text');
- }
if ($sGeomType === null || $sGeomType == 'geojson') {
$this->bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson');
+ $this->bIncludePolygonAsPoints = false;
}
- if ($sGeomType === null || $sGeomType == 'kml') {
- $this->bIncludePolygonAsKML = $oParams->getBool('polygon_kml');
- }
- if ($sGeomType === null || $sGeomType == 'svg') {
- $this->bIncludePolygonAsSVG = $oParams->getBool('polygon_svg');
+
+ if ($oParams->getString('format', '') !== 'geojson') {
+ if ($sGeomType === null || $sGeomType == 'text') {
+ $this->bIncludePolygonAsText = $oParams->getBool('polygon_text');
+ }
+ if ($sGeomType === null || $sGeomType == 'kml') {
+ $this->bIncludePolygonAsKML = $oParams->getBool('polygon_kml');
+ }
+ if ($sGeomType === null || $sGeomType == 'svg') {
+ $this->bIncludePolygonAsSVG = $oParams->getBool('polygon_svg');
+ }
}
$this->fPolygonSimplificationThreshold
= $oParams->getFloat('polygon_threshold', 0.0);
Debug::printSQL($sSQL);
$aPlaces = chksql($this->oDB->getAll($sSQL), 'Could not lookup place');
- $aClassType = getClassTypes();
foreach ($aPlaces as &$aPlace) {
if ($this->bAddressDetails) {
// to get addressdetails for tiger data, the housenumber is needed
);
}
+ if ($this->bAddressAdminLevels) {
+ $aPlace['aAddressAdminLevels'] = $this->getAddressAdminLevels(
+ $aPlace['place_id'],
+ $aPlace['housenumber']
+ );
+ }
+
if ($this->bExtraTags) {
if ($aPlace['extra']) {
$aPlace['sExtraTags'] = json_decode($aPlace['extra']);
}
}
- $sAddressType = '';
- $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
- if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) {
- $sAddressType = $aClassType[$aClassType]['simplelabel'];
- } else {
- $sClassType = $aPlace['class'].':'.$aPlace['type'];
- if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
- $sAddressType = $aClassType[$sClassType]['simplelabel'];
- else $sAddressType = $aPlace['class'];
- }
-
- $aPlace['addresstype'] = $sAddressType;
+ $aPlace['addresstype'] = ClassTypes\getProperty(
+ $aPlace,
+ 'simplelabel',
+ $aPlace['class']
+ );
}
Debug::printVar('Places', $aPlaces);
$aAddress = array();
$aFallback = array();
- $aClassType = getClassTypes();
foreach ($aAddressLines as $aLine) {
$bFallback = false;
- $aTypeLabel = false;
- if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) {
- $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
- } elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) {
- $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
- } elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) {
- $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
- $bFallback = true;
- } else {
- $aTypeLabel = array('simplelabel' => 'address'.$aLine['rank_address']);
+ $aTypeLabel = ClassTypes\getInfo($aLine);
+
+ if ($aTypeLabel === false) {
+ $aTypeLabel = ClassTypes\getFallbackInfo($aLine);
$bFallback = true;
}
- if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber']))) {
+
+ 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') {
return $aAddress;
}
+ /* "Downing Street, London"
+ * [
+ * "level15" => "Covent Garden",
+ * "level8" => "Westminster",
+ * "level6" => "London",
+ * "level5" => "Greater London",
+ * "level4" => "England",
+ * "level2" => "United Kingdom"
+ * ]
+ */
+
+ public function getAddressAdminLevels($iPlaceID, $sHousenumber = null)
+ {
+ $aAddressLines = $this->getAddressDetails(
+ $iPlaceID,
+ true,
+ $sHousenumber === null ? -1 : $sHousenumber
+ );
+
+ $aAddress = array();
+ foreach ($aAddressLines as $aLine) {
+ if (isset($aLine['admin_level'])
+ && $aLine['admin_level'] < 15
+ && !isset($aAddress['level'.$aLine['admin_level']])) {
+ $aAddress['level'.$aLine['admin_level']] = $aLine['localname'];
+ }
+ }
+ return $aAddress;
+ }
/* returns an array which will contain the keys
// Get the bounding box and outline polygon
$sSQL = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
if ($fLonReverse != null && $fLatReverse != null) {
- $sSQL .= ' CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN';
- $sSQL .= ' ST_Y(closest_point)';
- $sSQL .= ' ELSE ST_Y(centroid) ';
- $sSQL .= ' END as centrelat, ';
- $sSQL .= ' CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN';
- $sSQL .= ' ST_X(closest_point)';
- $sSQL .= ' ELSE ST_X(centroid) ';
- $sSQL .= ' END as centrelon, ';
+ $sSQL .= ' ST_Y(closest_point) as centrelat,';
+ $sSQL .= ' ST_X(closest_point) as centrelon,';
} else {
$sSQL .= ' ST_Y(centroid) as centrelat, ST_X(centroid) as centrelon,';
}
if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ',ST_AsText(geometry) as astext';
if ($fLonReverse != null && $fLatReverse != null) {
$sFrom = ' from (SELECT * , CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN ';
- $sFrom .=' ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326)) END AS closest_point';
+ $sFrom .=' ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))';
+ $sFrom .=' ELSE centroid END AS closest_point';
$sFrom .= ' from placex where place_id = '.$iPlaceID.') as plx';
} else {
$sFrom = ' from placex where place_id = '.$iPlaceID;
projects / nominatim.git / blobdiff