hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add tests for geocodejson and fix syntax errors

Browse Source
This commit is contained in:
Sarah Hoffmann
2018-07-12 22:00:18 +02:00
parent 25baaf530d
commit be58b929f2
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/template/address-geocodejson.php
View File

@@ -76,6 +76,6 @@ if (empty($aPlace)) {
'licence' => 'ODbL', 'licence' => 'ODbL',
'query' => $sQuery 'query' => $sQuery
), ),
'features' => $aFilteredPlaces 'features' => [$aFilteredPlaces]
)); ));
} }

4
lib/template/search-geocodejson.php
View File

@@ -9,8 +9,8 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
) )
); );
if (isset($aPlace['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id']; if (isset($aPointDetails['place_id'])) $aPlace['properties']['geocoding']['place_id'] = $aPointDetails['place_id'];
$sOSMType = formatOSMType($aPlace['osm_type']); $sOSMType = formatOSMType($aPointDetails['osm_type']);
if ($sOSMType) { if ($sOSMType) {
$aPlace['properties']['geocoding']['osm_type'] = $sOSMType; $aPlace['properties']['geocoding']['osm_type'] = $sOSMType;
$aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id']; $aPlace['properties']['geocoding']['osm_id'] = $aPointDetails['osm_id'];

4
test/bdd/api/reverse/simple.feature
View File

@@ -48,6 +48,10 @@ Feature: Simple Reverse Tests
| param | value | | param | value |
| <parameter> | <value> | | <parameter> | <value> |
Then the result is valid geojson Then the result is valid geojson
When sending geocodejson reverse coordinates 53.603,10.041
| param | value |
| <parameter> | <value> |
Then the result is valid geocodejson
Examples: Examples:
| parameter | value | | parameter | value |

4
test/bdd/api/search/simple.feature
View File

@@ -27,6 +27,10 @@ Feature: Simple Tests
| param | value | | param | value |
| <parameter> | <value> | | <parameter> | <value> |
Then at least 1 result is returned Then at least 1 result is returned
When sending geocodejson search query "Hamburg"
| param | value |
| <parameter> | <value> |
Then at least 1 result is returned
Examples: Examples:
| parameter | value | | parameter | value |

6
test/bdd/steps/queries.py
View File

@@ -114,6 +114,9 @@ class SearchResponse(GenericResponse):
self.parse_json() self.parse_json()
self.result = geojson_results_to_json_results(self.result) self.result = geojson_results_to_json_results(self.result)
def parse_geocodejson(self):
return self.parse_geojson()
def parse_html(self): def parse_html(self):
content, errors = tidy_document(self.page, content, errors = tidy_document(self.page,
options={'char-encoding' : 'utf8'}) options={'char-encoding' : 'utf8'})
@@ -195,6 +198,9 @@ class ReverseResponse(GenericResponse):
return return
self.result = geojson_results_to_json_results(self.result[0]) self.result = geojson_results_to_json_results(self.result[0])
def parse_geocodejson(self):
return self.parse_geojson()
def parse_xml(self): def parse_xml(self):
et = ET.fromstring(self.page) et = ET.fromstring(self.page)