details support json output

lib/template/details-json.php

@@ -0,0 +1,41 @@
+<?php
+
+$aPlaceDetails = $aPointDetails;
+
+$aPlaceDetails['geojson'] = json_decode($aPointDetails['asgeojson']);
+unset($aPlaceDetails['asgeojson']);
+
+if ($aAddressLines) {
+    $aPlaceDetails['address_lines'] = $aAddressLines;
+}
+
+if ($aLinkedLines) {
+    $aPlaceDetails['linked_lines'] = $aLinkedLines;
+}
+
+if ($aPlaceSearchNameKeywords) {
+    $aPlaceDetails['place_search_name_keywords'] = $aPlaceSearchNameKeywords;
+}
+
+if ($aPlaceSearchAddressKeywords) {
+    $aPlaceDetails['place_search_address_keywords'] = $aPlaceSearchAddressKeywords;
+}
+
+if ($aParentOfLines) {
+    $aPlaceDetails['parentof_lines'] = $aParentOfLines;
+
+    if ($bGroupParents) {
+        $aGroupedAddressLines = [];
+        foreach ($aParentOfLines as $aAddressLine) {
+            if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+            else $sType = $aAddressLine['type'];
+
+            if (!isset($aGroupedAddressLines[$sType]))
+                $aGroupedAddressLines[$sType] = [];
+            $aGroupedAddressLines[$sType][] = $aAddressLine;
+        }
+        $aPlaceDetails['parentof_lines'] = $aGroupedAddressLines;
+    }
+}
+
+javascript_renderData($aPlaceDetails);

test/bdd/api/details/simple.feature

@@ -18,3 +18,36 @@ Feature: Object details
             | keywords |
             | 1 |
         Then the result is valid html
+
+    Scenario: JSON Details
+        When sending json details query for W78099902
+        Then the result is valid json
+        And result has not attributes place_search_name_keywords,place_search_address_keywords,address_lines,linked_lines,parentof_lines
+
+    Scenario: JSON Details with keywords
+        When sending json details query for W78099902
+            | keywords |
+            | 1 |
+        Then the result is valid json
+        And result has attributes place_search_name_keywords,place_search_address_keywords
+
+    Scenario: JSON Details with addressdetails
+        When sending json details query for W78099902
+            | addressdetails |
+            | 1 |
+        Then the result is valid json
+        And result has attributes address_lines
+
+    Scenario: JSON Details with linkedplaces
+        When sending json details query for R123924
+            | linkedplaces |
+            | 1 |
+        Then the result is valid json
+        And result has attributes linked_lines
+
+    Scenario: JSON Details with childplaces
+        When sending json details query for W78099902
+            | childplaces |
+            | 1 |
+        Then the result is valid json
+        And result has attributes parentof_lines

test/bdd/steps/queries.py

@@ -232,6 +232,10 @@ class DetailsResponse(GenericResponse):
                                         options={'char-encoding' : 'utf8'})
         self.result = {}
 
+    def parse_json(self):
+        self.result = [json.JSONDecoder(object_pairs_hook=OrderedDict).decode(self.page)]
+
+
 @when(u'searching for "(?P<query>.*)"(?P<dups> with dups)?')
 def query_cmd(context, query, dups):
     """ Query directly via PHP script.
@@ -379,7 +383,12 @@ def website_details_request(context, fmt, query):
         params['place_id'] = query
     outp, status = send_api_query('details', params, fmt, context)
 
-    context.response = DetailsResponse(outp, 'html', status)
+    if fmt is None:
+        outfmt = 'html'
+    else:
+        outfmt = fmt.strip()
+
+    context.response = DetailsResponse(outp, outfmt, status)
 
 @when(u'sending (?P<fmt>\S+ )?lookup query for (?P<query>.*)')
 def website_lookup_request(context, fmt, query):

website/details.php

@@ -9,7 +9,8 @@ ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 
-$sOutputFormat = 'html';
+$sOutputFormat = $oParams->getSet('format', array('html', 'json'), 'html');
+
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 $sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']';
 
@@ -18,6 +19,12 @@ $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osmid', -1);
 $sClass = $oParams->getString('class');
 
+
+$bIncludeAddressDetails = ($sOutputFormat == 'html') ? 1 : $oParams->getBool('addressdetails');
+$bIncludeLinkedPlaces = ($sOutputFormat == 'html') ? 1 : $oParams->getBool('linkedplaces');
+$bIncludeChildPlaces = ($sOutputFormat == 'html') ? 1 : $oParams->getBool('childplaces');
+$bGroupParents = $oParams->getBool('group_parents', 0);
+
 $oDB =& getDB();
 
 if ($sOsmType && $iOsmId > 0) {
@@ -154,9 +161,14 @@ if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout
 }
 
 // Address
+$aAddressLines = false;
+if ($bIncludeAddressDetails) {
     $aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, true);
+}
 
 // Linked places
+$aLinkedLines = false;
+if ($bIncludeLinkedPlaces) {
     $sSQL = 'SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,';
     $sSQL .= ' admin_level, rank_address, ';
     $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
@@ -180,8 +192,11 @@ $aLinkedLines = $oDB->getAll($sSQL);
     if (PEAR::isError($aLinkedLines)) { // possible timeout
         $aLinkedLines = [];
     }
+}
 
 // All places this is an imediate parent of
+$aParentOfLines = false;
+if ($bIncludeChildPlaces) {
     $sSQL = 'SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,';
     $sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
     $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
@@ -211,6 +226,7 @@ $aParentOfLines = $oDB->getAll($sSQL);
     if (PEAR::isError($aParentOfLines)) { // possible timeout
         $aParentOfLines = [];
     }
+}
 
 $aPlaceSearchNameKeywords = false;
 $aPlaceSearchAddressKeywords = false;