)
);
- if (isset($aPlace['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
- $sOSMType = formatOSMType($aPlace['osm_type']);
+ if (isset($aPointDetails['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
+ $sOSMType = formatOSMType($aPointDetails['osm_type']);
if ($sOSMType) {
$aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
$aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id'];
$aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
- $aPlace['properties']['geocoding']['name'] = $aPointDetails['placename'];
+ if ($aPointDetails['placename'] !== null) {
+ $aPlace['properties']['geocoding']['name'] = $aPointDetails['placename'];
+ }
if (isset($aPointDetails['address'])) {
- $aFieldMappings = array(
- 'house_number' => 'housenumber',
- 'road' => 'street',
- 'locality' => 'locality',
- 'postcode' => 'postcode',
- 'city' => 'city',
- 'district' => 'district',
- 'county' => 'county',
- 'state' => 'state',
- 'country' => 'country'
- );
-
- $aAddrNames = $aPointDetails['address']->getAddressNames();
- foreach ($aFieldMappings as $sFrom => $sTo) {
- if (isset($aAddrNames[$sFrom])) {
- $aPlace['properties']['geocoding'][$sTo] = $aAddrNames[$sFrom];
- }
- }
+ $aPointDetails['address']->addGeocodeJsonAddressParts(
+ $aPlace['properties']['geocoding']
+ );
$aPlace['properties']['geocoding']['admin']
= $aPointDetails['address']->getAdminLevels();