search/reverse/lookup with geojson,geocodejson output

lib/Geocode.php

@@ -249,6 +249,11 @@ class Geocode
         $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType);
         $this->oPlaceLookup->setIncludeAddressDetails(false);
         $this->oPlaceLookup->setIncludePolygonAsPoints($oParams->getBool('polygon'));
+
+        if ($oParams->getString('format', '') == 'geocodejson') {
+            $this->oPlaceLookup->setAddressDetails(true);
+            $this->oPlaceLookup->setAddressAdminLevels(true);
+        }
     }
 
     public function setQueryFromParams($oParams)

lib/PlaceLookup.php

@@ -11,6 +11,7 @@ class PlaceLookup
     protected $aLangPrefOrderSql = "''";
 
     protected $bAddressDetails = false;
+    protected $bAddressAdminLevels = false;
     protected $bExtraTags = false;
     protected $bNameDetails = false;
 
@@ -42,6 +43,16 @@ class PlaceLookup
         $this->bIncludePolygonAsPoints = $b;
     }
 
+    public function setAddressDetails($b = true)
+    {
+        $this->bAddressDetails = $b;
+    }
+
+    public function setAddressAdminLevels($b = true)
+    {
+        $this->bAddressAdminLevels = $b;
+    }
+
     public function loadParamArray($oParams, $sGeomType = null)
     {
         $aLangs = $oParams->getPreferredLanguages();
@@ -54,17 +65,21 @@ class PlaceLookup
 
         $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);
@@ -429,6 +444,13 @@ class PlaceLookup
                 );
             }
 
+            if ($this->bAddressAdminLevels) {
+                $aPlace['aAddressAdminLevels'] = $this->getAddressAdminLevels(
+                    $aPlace['place_id'],
+                    $aPlace['housenumber']
+                );
+            }
+
             if ($this->bExtraTags) {
                 if ($aPlace['extra']) {
                     $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
@@ -514,6 +536,33 @@ class PlaceLookup
         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,
+            false,
+            $sHousenumber === null ? -1 : $sHousenumber
+        );
+
+        $aAddress = array();
+        foreach ($aAddressLines as $aLine) {
+            if (isset($aLine['admin_level'])) {
+                $aAddress['level'.$aLine['admin_level']] = $aLine['localname'];
+            }
+        }
+        return $aAddress;
+    }
 
 
     /* returns an array which will contain the keys

lib/template/address-geocodejson.php

@@ -0,0 +1,77 @@
+<?php
+
+// https://github.com/geocoders/geocodejson-spec/
+
+$aFilteredPlaces = array();
+
+if (empty($aPlace)) {
+    if (isset($sError))
+        $aFilteredPlaces['error'] = $sError;
+    else $aFilteredPlaces['error'] = 'Unable to geocode';
+    javascript_renderData($aFilteredPlaces);
+} else {
+    $aFilteredPlaces = array(
+                        'type' => 'Feature',
+                        'properties' => array(
+                                         'geocoding' => array()
+                                        )
+                       );
+
+    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['geocoding']['place_id'] = $aPlace['place_id'];
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    if ($sOSMType) {
+        $aFilteredPlaces['properties']['geocoding']['osm_type'] = $sOSMType;
+        $aFilteredPlaces['properties']['geocoding']['osm_id'] = $aPlace['osm_id'];
+    }
+
+    $aFilteredPlaces['properties']['geocoding']['type'] = $aPlace['type'];
+
+    $aFilteredPlaces['properties']['geocoding']['accuracy'] = (int) $fDistance;
+
+    $aFilteredPlaces['properties']['geocoding']['label'] = $aPlace['langaddress'];
+
+    $aFilteredPlaces['properties']['geocoding']['name'] = $aPlace['placename'];
+
+    $aFieldMappings = array(
+                       'house_number' => 'housenumber',
+                       'road' => 'street',
+                       'locality' => 'locality',
+                       'postcode' => 'postcode',
+                       'city' => 'city',
+                       'district' => 'district',
+                       'county' => 'county',
+                       'state' => 'state',
+                       'country' => 'country'
+                      );
+
+    foreach ($aFieldMappings as $sFrom => $sTo) {
+        if (isset($aPlace['aAddress'][$sFrom])) {
+            $aFilteredPlaces['properties']['geocoding'][$sTo] = $aPlace['aAddress'][$sFrom];
+        }
+    }
+
+    $aFilteredPlaces['properties']['geocoding']['admin'] = $aPlace['aAddressAdminLevels'];
+
+    if (isset($aPlace['asgeojson'])) {
+        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson']);
+    } else {
+        $aFilteredPlaces['geometry'] = array(
+                                        'type' => 'Point',
+                                        'coordinates' => array(
+                                                          (float) $aPlace['lon'],
+                                                          (float) $aPlace['lat']
+                                                         )
+                                       );
+    }
+
+    javascript_renderData(array(
+                           'type' => 'FeatureCollection',
+                           'geocoding' => array(
+                                           'version' => '0.1.0',
+                                           'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                                           'licence' => 'ODbL',
+                                           'query' => $sQuery
+                                          ),
+                           'features' => $aFilteredPlaces
+                          ));
+}

lib/template/address-geojson.php

@@ -0,0 +1,67 @@
+<?php
+
+$aFilteredPlaces = array();
+
+if (empty($aPlace)) {
+    if (isset($sError))
+        $aFilteredPlaces['error'] = $sError;
+    else $aFilteredPlaces['error'] = 'Unable to geocode';
+    javascript_renderData($aFilteredPlaces);
+} else {
+    $aFilteredPlaces = array(
+                        'type' => 'Feature',
+                        'properties' => array()
+                       );
+
+    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    if ($sOSMType) {
+        $aFilteredPlaces['properties']['osm_type'] = $sOSMType;
+        $aFilteredPlaces['properties']['osm_id'] = $aPlace['osm_id'];
+    }
+
+    $aFilteredPlaces['properties']['place_rank'] = $aPlace['rank_search'];
+
+    $aFilteredPlaces['properties']['category'] = $aPlace['class'];
+    $aFilteredPlaces['properties']['type'] = $aPlace['type'];
+
+    $aFilteredPlaces['properties']['importance'] = $aPlace['importance'];
+
+    $aFilteredPlaces['properties']['addresstype'] = strtolower($aPlace['addresstype']);
+
+    $aFilteredPlaces['properties']['name'] = $aPlace['placename'];
+
+    $aFilteredPlaces['properties']['display_name'] = $aPlace['langaddress'];
+
+    if (isset($aPlace['aAddress'])) $aFilteredPlaces['properties']['address'] = $aPlace['aAddress'];
+    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['properties']['extratags'] = $aPlace['sExtraTags'];
+    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['properties']['namedetails'] = $aPlace['sNameDetails'];
+
+    if (isset($aPlace['aBoundingBox'])) {
+        $aFilteredPlaces['bbox'] = array(
+                                    (float) $aPlace['aBoundingBox'][2], // minlon
+                                    (float) $aPlace['aBoundingBox'][0], // minlat
+                                    (float) $aPlace['aBoundingBox'][3], // maxlon
+                                    (float) $aPlace['aBoundingBox'][1]  // maxlat
+                                   );
+    }
+
+    if (isset($aPlace['asgeojson'])) {
+        $aFilteredPlaces['geometry'] = json_decode($aPlace['asgeojson']);
+    } else {
+        $aFilteredPlaces['geometry'] = array(
+                                        'type' => 'Point',
+                                        'coordinates' => array(
+                                                          (float) $aPlace['lon'],
+                                                          (float) $aPlace['lat']
+                                                         )
+                                       );
+    }
+
+
+    javascript_renderData(array(
+                           'type' => 'FeatureCollection',
+                           'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                           'features' => array($aFilteredPlaces)
+                          ));
+}

lib/template/address-json.php

@@ -17,7 +17,7 @@ if (empty($aPlace)) {
     if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
     if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 
-    if ($sOutputFormat == 'jsonv2') {
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
         $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
 
         $aFilteredPlaces['category'] = $aPlace['class'];

lib/template/search-geocodejson.php

@@ -0,0 +1,69 @@
+<?php
+
+$aFilteredPlaces = array();
+foreach ($aSearchResults as $iResNum => $aPointDetails) {
+    $aPlace = array(
+               'type' => 'Feature',
+               'properties' => array(
+                                'geocoding' => array()
+                               )
+              );
+
+    if (isset($aPlace['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    if ($sOSMType) {
+        $aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
+        $aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id'];
+    }
+
+    $aPlace['properties']['geocoding']['type'] = $aPointDetails['type'];
+
+    $aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
+
+    $aPlace['properties']['geocoding']['name'] = $aPointDetails['placename'];
+
+    $aFieldMappings = array(
+                       'house_number' => 'housenumber',
+                       'road' => 'street',
+                       'locality' => 'locality',
+                       'postcode' => 'postcode',
+                       'city' => 'city',
+                       'district' => 'district',
+                       'county' => 'county',
+                       'state' => 'state',
+                       'country' => 'country'
+                      );
+
+    foreach ($aFieldMappings as $sFrom => $sTo) {
+        if (isset($aPointDetails['aAddress'][$sFrom])) {
+            $aPlace['properties']['geocoding'][$sTo] = $aPointDetails['aAddress'][$sFrom];
+        }
+    }
+
+    $aPlace['properties']['geocoding']['admin'] = $aPointDetails['aAddressAdminLevels'];
+
+    if (isset($aPointDetails['asgeojson'])) {
+        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson']);
+    } else {
+        $aPlace['geometry'] = array(
+                               'type' => 'Point',
+                               'coordinates' => array(
+                                                 (float) $aPointDetails['lon'],
+                                                 (float) $aPointDetails['lat']
+                                                )
+                              );
+    }
+    $aFilteredPlaces[] = $aPlace;
+}
+
+
+javascript_renderData(array(
+                       'type' => 'FeatureCollection',
+                       'geocoding' => array(
+                                       'version' => '0.1.0',
+                                       'attribution' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                                       'licence' => 'ODbL',
+                                       'query' => $sQuery
+                                      ),
+                       'features' => $aFilteredPlaces
+                      ));

lib/template/search-geojson.php

@@ -0,0 +1,71 @@
+<?php
+
+$aFilteredPlaces = array();
+foreach ($aSearchResults as $iResNum => $aPointDetails) {
+    $aPlace = array(
+               'type' => 'Feature',
+               'properties' => array(
+                                'place_id'=>$aPointDetails['place_id'],
+                               )
+              );
+    
+    $sOSMType = formatOSMType($aPointDetails['osm_type']);
+    if ($sOSMType) {
+        $aPlace['properties']['osm_type'] = $sOSMType;
+        $aPlace['properties']['osm_id'] = $aPointDetails['osm_id'];
+    }
+
+    if (isset($aPointDetails['aBoundingBox'])) {
+        $aPlace['bbox'] = array(
+                           (float) $aPointDetails['aBoundingBox'][2], // minlon
+                           (float) $aPointDetails['aBoundingBox'][0], // minlat
+                           (float) $aPointDetails['aBoundingBox'][3], // maxlon
+                           (float) $aPointDetails['aBoundingBox'][1]  // maxlat
+                          );
+    }
+
+    if (isset($aPointDetails['zoom'])) {
+        $aPlace['properties']['zoom'] = $aPointDetails['zoom'];
+    }
+
+    $aPlace['properties']['display_name'] = $aPointDetails['name'];
+
+    $aPlace['properties']['place_rank'] = $aPointDetails['rank_search'];
+    $aPlace['properties']['category'] = $aPointDetails['class'];
+
+    $aPlace['properties']['type'] = $aPointDetails['type'];
+
+    $aPlace['properties']['importance'] = $aPointDetails['importance'];
+
+    if (isset($aPointDetails['icon']) && $aPointDetails['icon']) {
+        $aPlace['properties']['icon'] = $aPointDetails['icon'];
+    }
+
+    if (isset($aPointDetails['address']) && !empty($aPointDetails['address'])) {
+        $aPlace['properties']['address'] = $aPointDetails['address'];
+    }
+
+    if (isset($aPointDetails['asgeojson'])) {
+        $aPlace['geometry'] = json_decode($aPointDetails['asgeojson']);
+    } else {
+        $aPlace['geometry'] = array(
+                               'type' => 'Point',
+                               'coordinates' => array(
+                                                 (float) $aPointDetails['lon'],
+                                                 (float) $aPointDetails['lat']
+                                                )
+                              );
+    }
+
+
+    if (isset($aPointDetails['sExtraTags'])) $aPlace['properties']['extratags'] = $aPointDetails['sExtraTags'];
+    if (isset($aPointDetails['sNameDetails'])) $aPlace['properties']['namedetails'] = $aPointDetails['sNameDetails'];
+
+    $aFilteredPlaces[] = $aPlace;
+}
+
+javascript_renderData(array(
+                       'type' => 'FeatureCollection',
+                       'licence' => 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
+                       'features' => $aFilteredPlaces
+                      ));

lib/template/search-json.php

@@ -27,9 +27,10 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
 
     $aPlace['lat'] = $aPointDetails['lat'];
     $aPlace['lon'] = $aPointDetails['lon'];
+
     $aPlace['display_name'] = $aPointDetails['name'];
 
-    if ($sOutputFormat == 'jsonv2') {
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
         $aPlace['place_rank'] = $aPointDetails['rank_search'];
         $aPlace['category'] = $aPointDetails['class'];
     } else {