From 76c146f3269ff07fdad66cb1d2d74c2acbc2af91 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Tue, 12 Oct 2021 17:35:15 +0200 Subject: [PATCH 1/8] add `state_code` field to response address details --- docs/api/Output.md | 5 ++++- lib-php/AddressDetails.php | 18 ++++++++++++++++++ test/php/Nominatim/AddressDetailsTest.php | 1 + .../address_details_10_downing_street.json | 4 ++-- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/api/Output.md b/docs/api/Output.md index 31dd5b3f..3c541d33 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -28,6 +28,7 @@ a single place (for reverse) of the following format: "city": "London", "state_district": "Greater London", "state": "England", + "state_code": "ENG", "postcode": "SW1A 2DU", "country": "United Kingdom", "country_code": "gb" @@ -126,6 +127,7 @@ formats depending on the API call. Bavaria + BY Germany de @@ -179,6 +181,7 @@ Additional information requested with `addressdetails=1`, `extratags=1` and London Greater London England + ENG SW1A 2DU United Kingdom gb @@ -279,7 +282,7 @@ with a designation label. Per default the following labels may appear: * continent * country, country_code - * region, state, state_district, county + * region, state, state_code, state_district, county * municipality, city, town, village * city_district, district, borough, suburb, subdivision * hamlet, croft, isolated_dwelling diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index 1bd475ad..a1a2a636 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -92,6 +92,10 @@ class AddressDetails || $aLine['class'] == 'place') ) { $aAddress[$sTypeLabel] = $sName; + + if ('state' === $sTypeLabel && !empty($aLine['name'])) { + $this->addStateCode($aAddress, $aLine['name']); + } } } @@ -174,4 +178,18 @@ class AddressDetails { return $this->aAddressLines; } + + /** + * Add `state_code` field to address details to represent second part of ISO 3166-2 country subdivision code + */ + private function addStateCode(&$aAddress, $nameDetails) + { + if (is_string($nameDetails)) { + $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); + } + + if (!empty($nameDetails['ref'])) { + $aAddress['state_code'] = $nameDetails['ref']; + } + } } diff --git a/test/php/Nominatim/AddressDetailsTest.php b/test/php/Nominatim/AddressDetailsTest.php index 1425be2d..4cf36344 100644 --- a/test/php/Nominatim/AddressDetailsTest.php +++ b/test/php/Nominatim/AddressDetailsTest.php @@ -86,6 +86,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase 'city' => 'London', 'state_district' => 'Greater London', 'state' => 'England', + 'state_code' => 'ENG', 'postcode' => 'SW1A 2AA', 'country' => 'United Kingdom', 'country_code' => 'gb' diff --git a/test/php/fixtures/address_details_10_downing_street.json b/test/php/fixtures/address_details_10_downing_street.json index 853a6c07..f56cfd9a 100644 --- a/test/php/fixtures/address_details_10_downing_street.json +++ b/test/php/fixtures/address_details_10_downing_street.json @@ -157,7 +157,7 @@ {"place_id":194325361, "osm_type":"R", "osm_id":58447, - "name":{"name": "England", "name:be": "Англія", "name:br": "Bro-Saoz", "name:ca": "Anglaterra", "name:cs": "Anglie", "name:cy": "Lloegr", "name:de": "England", "name:el": "Αγγλία", "name:en": "England", "name:eo": "Anglujo", "name:es": "Inglaterra", "name:fi": "Englanti", "name:fr": "Angleterre", "name:fy": "Ingelân", "name:ga": "Sasana", "name:gd": "Sasainn", "name:gv": "Sostyn", "name:he": "אנגליה", "name:hu": "Anglia", "name:ia": "Anglaterra", "name:io": "Anglia", "name:it": "Inghilterra", "name:la": "Anglia", "name:lt": "Anglija", "name:nl": "Engeland", "name:pl": "Anglia", "name:pt": "Inglaterra", "name:ru": "Англия", "name:sk": "Anglicko", "name:sv": "England", "name:tr": "İngiltere", "name:uk": "Англія", "name:vi": "Anh", "name:vo": "Linglän", "name:zh": "英格蘭", "name:hsb": "Jendźelska", "name:nds": "England", "name:tok": "ma Inli", "name:tzl": "Anglatzara", "alt_name:eo": "Anglio", "alt_name:ia": "Anglia", "old_name:vi": "Anh Quốc", "alt_name:nds": "Ingland", "name:be-tarask": "Ангельшчына", "name:zh-classical": "英格蘭", "name:zh-simplified": "英格兰", "name:zh-traditional": "英格蘭"}, + "name":{"ref": "ENG", "name": "England", "name:be": "Англія", "name:br": "Bro-Saoz", "name:ca": "Anglaterra", "name:cs": "Anglie", "name:cy": "Lloegr", "name:de": "England", "name:el": "Αγγλία", "name:en": "England", "name:eo": "Anglujo", "name:es": "Inglaterra", "name:fi": "Englanti", "name:fr": "Angleterre", "name:fy": "Ingelân", "name:ga": "Sasana", "name:gd": "Sasainn", "name:gv": "Sostyn", "name:he": "אנגליה", "name:hu": "Anglia", "name:ia": "Anglaterra", "name:io": "Anglia", "name:it": "Inghilterra", "name:la": "Anglia", "name:lt": "Anglija", "name:nl": "Engeland", "name:pl": "Anglia", "name:pt": "Inglaterra", "name:ru": "Англия", "name:sk": "Anglicko", "name:sv": "England", "name:tr": "İngiltere", "name:uk": "Англія", "name:vi": "Anh", "name:vo": "Linglän", "name:zh": "英格蘭", "name:hsb": "Jendźelska", "name:nds": "England", "name:tok": "ma Inli", "name:tzl": "Anglatzara", "alt_name:eo": "Anglio", "alt_name:ia": "Anglia", "old_name:vi": "Anh Quốc", "alt_name:nds": "Ingland", "name:be-tarask": "Ангельшчына", "name:zh-classical": "英格蘭", "name:zh-simplified": "英格兰", "name:zh-traditional": "英格蘭"}, "class":"boundary", "type":"administrative", "admin_level":4, @@ -214,4 +214,4 @@ "rank_address":4, "distance":0, "localname":"gb"} -] \ No newline at end of file +] From 82dbcbb12a1285e7b345e232196b02b9cae35f9a Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Mon, 17 Jan 2022 17:20:06 +0100 Subject: [PATCH 2/8] add `:ISO3166-2` field to response address details --- VAGRANT.md | 2 +- docs/api/Output.md | 2 +- lib-php/AddressDetails.php | 11 +++++------ test/php/Nominatim/AddressDetailsTest.php | 2 +- .../fixtures/address_details_10_downing_street.json | 2 +- vagrant/Install-on-Ubuntu-20.sh | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/VAGRANT.md b/VAGRANT.md index b10a5ac7..d26b8dbd 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -44,7 +44,7 @@ is. # inside the virtual machine: cd build wget --no-verbose --output-document=/tmp/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf - ./utils/setup.php --osm-file /tmp/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log + nominatim import --osm-file /tmp/monaco.osm.pbf ``` To repeat an import you'd need to delete the database first diff --git a/docs/api/Output.md b/docs/api/Output.md index 3c541d33..d3ecf8d7 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -28,7 +28,7 @@ a single place (for reverse) of the following format: "city": "London", "state_district": "Greater London", "state": "England", - "state_code": "ENG", + "ISO3166-2": "GB-ENG", "postcode": "SW1A 2DU", "country": "United Kingdom", "country_code": "gb" diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index a1a2a636..657dc3e2 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -93,8 +93,8 @@ class AddressDetails ) { $aAddress[$sTypeLabel] = $sName; - if ('state' === $sTypeLabel && !empty($aLine['name'])) { - $this->addStateCode($aAddress, $aLine['name']); + if (!empty($aLine['name'])) { + $this->addStateCode($aAddress, $sTypeLabel, $aLine['name']); } } } @@ -182,14 +182,13 @@ class AddressDetails /** * Add `state_code` field to address details to represent second part of ISO 3166-2 country subdivision code */ - private function addStateCode(&$aAddress, $nameDetails) + private function addStateCode(&$aAddress, $sTypeLabel, $nameDetails) { if (is_string($nameDetails)) { $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); } - - if (!empty($nameDetails['ref'])) { - $aAddress['state_code'] = $nameDetails['ref']; + if (!empty($nameDetails['ISO3166-2'])) { + $aAddress["$sTypeLabel:ISO3166-2"] = $nameDetails['ISO3166-2']; } } } diff --git a/test/php/Nominatim/AddressDetailsTest.php b/test/php/Nominatim/AddressDetailsTest.php index 4cf36344..02813286 100644 --- a/test/php/Nominatim/AddressDetailsTest.php +++ b/test/php/Nominatim/AddressDetailsTest.php @@ -86,7 +86,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase 'city' => 'London', 'state_district' => 'Greater London', 'state' => 'England', - 'state_code' => 'ENG', + 'state:ISO3166-2' => 'GB-ENG', 'postcode' => 'SW1A 2AA', 'country' => 'United Kingdom', 'country_code' => 'gb' diff --git a/test/php/fixtures/address_details_10_downing_street.json b/test/php/fixtures/address_details_10_downing_street.json index f56cfd9a..0a56beec 100644 --- a/test/php/fixtures/address_details_10_downing_street.json +++ b/test/php/fixtures/address_details_10_downing_street.json @@ -157,7 +157,7 @@ {"place_id":194325361, "osm_type":"R", "osm_id":58447, - "name":{"ref": "ENG", "name": "England", "name:be": "Англія", "name:br": "Bro-Saoz", "name:ca": "Anglaterra", "name:cs": "Anglie", "name:cy": "Lloegr", "name:de": "England", "name:el": "Αγγλία", "name:en": "England", "name:eo": "Anglujo", "name:es": "Inglaterra", "name:fi": "Englanti", "name:fr": "Angleterre", "name:fy": "Ingelân", "name:ga": "Sasana", "name:gd": "Sasainn", "name:gv": "Sostyn", "name:he": "אנגליה", "name:hu": "Anglia", "name:ia": "Anglaterra", "name:io": "Anglia", "name:it": "Inghilterra", "name:la": "Anglia", "name:lt": "Anglija", "name:nl": "Engeland", "name:pl": "Anglia", "name:pt": "Inglaterra", "name:ru": "Англия", "name:sk": "Anglicko", "name:sv": "England", "name:tr": "İngiltere", "name:uk": "Англія", "name:vi": "Anh", "name:vo": "Linglän", "name:zh": "英格蘭", "name:hsb": "Jendźelska", "name:nds": "England", "name:tok": "ma Inli", "name:tzl": "Anglatzara", "alt_name:eo": "Anglio", "alt_name:ia": "Anglia", "old_name:vi": "Anh Quốc", "alt_name:nds": "Ingland", "name:be-tarask": "Ангельшчына", "name:zh-classical": "英格蘭", "name:zh-simplified": "英格兰", "name:zh-traditional": "英格蘭"}, + "name":{"ref": "ENG", "ISO3166-2": "GB-ENG", "name": "England", "name:be": "Англія", "name:br": "Bro-Saoz", "name:ca": "Anglaterra", "name:cs": "Anglie", "name:cy": "Lloegr", "name:de": "England", "name:el": "Αγγλία", "name:en": "England", "name:eo": "Anglujo", "name:es": "Inglaterra", "name:fi": "Englanti", "name:fr": "Angleterre", "name:fy": "Ingelân", "name:ga": "Sasana", "name:gd": "Sasainn", "name:gv": "Sostyn", "name:he": "אנגליה", "name:hu": "Anglia", "name:ia": "Anglaterra", "name:io": "Anglia", "name:it": "Inghilterra", "name:la": "Anglia", "name:lt": "Anglija", "name:nl": "Engeland", "name:pl": "Anglia", "name:pt": "Inglaterra", "name:ru": "Англия", "name:sk": "Anglicko", "name:sv": "England", "name:tr": "İngiltere", "name:uk": "Англія", "name:vi": "Anh", "name:vo": "Linglän", "name:zh": "英格蘭", "name:hsb": "Jendźelska", "name:nds": "England", "name:tok": "ma Inli", "name:tzl": "Anglatzara", "alt_name:eo": "Anglio", "alt_name:ia": "Anglia", "old_name:vi": "Anh Quốc", "alt_name:nds": "Ingland", "name:be-tarask": "Ангельшчына", "name:zh-classical": "英格蘭", "name:zh-simplified": "英格兰", "name:zh-traditional": "英格蘭"}, "class":"boundary", "type":"administrative", "admin_level":4, diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 68bd6b04..06b8b5b8 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -222,7 +222,7 @@ server { listen 80 default_server; listen [::]:80 default_server; - root $USERHOME/nominatim-project/website; + root $USERHOME/nominatim/website; index search.php index.html; location / { try_files \$uri \$uri/ @php; From 6bee188f2412645360c303d80330b527482cf605 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Wed, 26 Jan 2022 17:40:39 +0100 Subject: [PATCH 3/8] Change the key to `-ISO3166-2` to support xml response correctly --- docs/api/Output.md | 6 +++--- lib-php/AddressDetails.php | 9 +++------ test/php/Nominatim/AddressDetailsTest.php | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/api/Output.md b/docs/api/Output.md index d3ecf8d7..a584d251 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -28,7 +28,7 @@ a single place (for reverse) of the following format: "city": "London", "state_district": "Greater London", "state": "England", - "ISO3166-2": "GB-ENG", + "state-ISO3166-2": "GB-ENG", "postcode": "SW1A 2DU", "country": "United Kingdom", "country_code": "gb" @@ -181,7 +181,7 @@ Additional information requested with `addressdetails=1`, `extratags=1` and London Greater London England - ENG + GB-ENG SW1A 2DU United Kingdom gb @@ -282,7 +282,7 @@ with a designation label. Per default the following labels may appear: * continent * country, country_code - * region, state, state_code, state_district, county + * region, state, state-ISO3166-2, state_district, county, county-ISO3166-2 * municipality, city, town, village * city_district, district, borough, suburb, subdivision * hamlet, croft, isolated_dwelling diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index 657dc3e2..35786d22 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -94,7 +94,7 @@ class AddressDetails $aAddress[$sTypeLabel] = $sName; if (!empty($aLine['name'])) { - $this->addStateCode($aAddress, $sTypeLabel, $aLine['name']); + $this->addSubdivisionCode($aAddress, $sTypeLabel, $aLine['name']); } } } @@ -179,16 +179,13 @@ class AddressDetails return $this->aAddressLines; } - /** - * Add `state_code` field to address details to represent second part of ISO 3166-2 country subdivision code - */ - private function addStateCode(&$aAddress, $sTypeLabel, $nameDetails) + private function addSubdivisionCode(&$aAddress, $sTypeLabel, $nameDetails) { if (is_string($nameDetails)) { $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); } if (!empty($nameDetails['ISO3166-2'])) { - $aAddress["$sTypeLabel:ISO3166-2"] = $nameDetails['ISO3166-2']; + $aAddress["$sTypeLabel-ISO3166-2"] = $nameDetails['ISO3166-2']; } } } diff --git a/test/php/Nominatim/AddressDetailsTest.php b/test/php/Nominatim/AddressDetailsTest.php index 02813286..42a51add 100644 --- a/test/php/Nominatim/AddressDetailsTest.php +++ b/test/php/Nominatim/AddressDetailsTest.php @@ -86,7 +86,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase 'city' => 'London', 'state_district' => 'Greater London', 'state' => 'England', - 'state:ISO3166-2' => 'GB-ENG', + 'state-ISO3166-2' => 'GB-ENG', 'postcode' => 'SW1A 2AA', 'country' => 'United Kingdom', 'country_code' => 'gb' From 665fae8343354d3027bbf03e46d46c4ea88d1c85 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Thu, 10 Mar 2022 10:57:26 +0100 Subject: [PATCH 4/8] Fix API docs and Vagrant instructions to import data --- VAGRANT.md | 4 ++-- docs/api/Output.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VAGRANT.md b/VAGRANT.md index d26b8dbd..789592a9 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -43,8 +43,8 @@ is. ``` # inside the virtual machine: cd build - wget --no-verbose --output-document=/tmp/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf - nominatim import --osm-file /tmp/monaco.osm.pbf + wget --no-verbose --output-document=/tmp/dump.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf + cd /nominatim && nominatim import --osm-file /tmp/dump.osm.pbf ``` To repeat an import you'd need to delete the database first diff --git a/docs/api/Output.md b/docs/api/Output.md index a584d251..2dd2f55a 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -127,7 +127,7 @@ formats depending on the API call. Bavaria - BY + DE-BY Germany de From a79c1bda9b77635e31f228e031ecbb6465f8dff4 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Thu, 10 Mar 2022 10:57:26 +0100 Subject: [PATCH 5/8] Fix API docs and Vagrant instructions to import data --- vagrant/Install-on-Ubuntu-20.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 06b8b5b8..68bd6b04 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -222,7 +222,7 @@ server { listen 80 default_server; listen [::]:80 default_server; - root $USERHOME/nominatim/website; + root $USERHOME/nominatim-project/website; index search.php index.html; location / { try_files \$uri \$uri/ @php; From 78996546758c661488a37aa06d89373ce5747b6b Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Wed, 23 Mar 2022 14:32:03 +0100 Subject: [PATCH 6/8] proper instruction to import data --- VAGRANT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VAGRANT.md b/VAGRANT.md index 789592a9..b0df9a88 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -42,9 +42,9 @@ is. ``` # inside the virtual machine: - cd build - wget --no-verbose --output-document=/tmp/dump.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf - cd /nominatim && nominatim import --osm-file /tmp/dump.osm.pbf + cd nominatim-project + wget --no-verbose --output-document=monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf + nominatim import --osm-file monaco.osm.pbf 2>&1 | tee monaco.$$.log ``` To repeat an import you'd need to delete the database first From 9a56e53d50211be8b34ac1ecddf0e2930f987701 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Wed, 6 Apr 2022 19:24:39 +0200 Subject: [PATCH 7/8] use ISO3166-2-lvl instead of typeLabel prefix --- docs/api/Output.md | 8 ++++---- lib-php/AddressDetails.php | 6 +++--- test/bdd/api/search/params.feature | 1 + test/bdd/api/search/queries.feature | 2 ++ test/php/Nominatim/AddressDetailsTest.php | 3 ++- test/php/fixtures/address_details_10_downing_street.json | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docs/api/Output.md b/docs/api/Output.md index 2dd2f55a..961f48b8 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -28,7 +28,7 @@ a single place (for reverse) of the following format: "city": "London", "state_district": "Greater London", "state": "England", - "state-ISO3166-2": "GB-ENG", + "ISO3166-2-lvl4": "GB-ENG", "postcode": "SW1A 2DU", "country": "United Kingdom", "country_code": "gb" @@ -127,7 +127,7 @@ formats depending on the API call. Bavaria - DE-BY + DE-BY Germany de @@ -181,7 +181,7 @@ Additional information requested with `addressdetails=1`, `extratags=1` and London Greater London England - GB-ENG + GB-ENG SW1A 2DU United Kingdom gb @@ -282,7 +282,7 @@ with a designation label. Per default the following labels may appear: * continent * country, country_code - * region, state, state-ISO3166-2, state_district, county, county-ISO3166-2 + * region, state, state_district, county, ISO3166-2-lvl * municipality, city, town, village * city_district, district, borough, suburb, subdivision * hamlet, croft, isolated_dwelling diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php index 35786d22..cfdd0416 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -94,7 +94,7 @@ class AddressDetails $aAddress[$sTypeLabel] = $sName; if (!empty($aLine['name'])) { - $this->addSubdivisionCode($aAddress, $sTypeLabel, $aLine['name']); + $this->addSubdivisionCode($aAddress, $aLine['admin_level'], $aLine['name']); } } } @@ -179,13 +179,13 @@ class AddressDetails return $this->aAddressLines; } - private function addSubdivisionCode(&$aAddress, $sTypeLabel, $nameDetails) + private function addSubdivisionCode(&$aAddress, $iAdminLevel, $nameDetails) { if (is_string($nameDetails)) { $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); } if (!empty($nameDetails['ISO3166-2'])) { - $aAddress["$sTypeLabel-ISO3166-2"] = $nameDetails['ISO3166-2']; + $aAddress["ISO3166-2-lvl$iAdminLevel"] = $nameDetails['ISO3166-2']; } } } diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature index b3df7d19..cc86e01b 100644 --- a/test/bdd/api/search/params.feature +++ b/test/bdd/api/search/params.feature @@ -34,6 +34,7 @@ Feature: Search queries | postcode | 9495 | | country | Liechtenstein | | country_code | li | + | ISO3166-2-lvl12 | LI-09 | Examples: | format | diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature index 8b70dac1..d141122e 100644 --- a/test/bdd/api/search/queries.feature +++ b/test/bdd/api/search/queries.feature @@ -15,6 +15,7 @@ Feature: Search queries | postcode | 9497 | | country | Liechtenstein | | country_code | li | + | ISO3166-2-lvl10 | LI-10 | Scenario: House number interpolation When sending json search query "Grosssteg 1023, Triesenberg" with address @@ -41,6 +42,7 @@ Feature: Search queries | town | Triesenberg | | country | Liechtenstein | | country_code | li | + | ISO3166-2-lvl10 | LI-10 | Scenario Outline: Housenumber 0 can be found When sending search query "Gnalpstrasse 0" with address diff --git a/test/php/Nominatim/AddressDetailsTest.php b/test/php/Nominatim/AddressDetailsTest.php index 42a51add..2041dcb4 100644 --- a/test/php/Nominatim/AddressDetailsTest.php +++ b/test/php/Nominatim/AddressDetailsTest.php @@ -86,7 +86,8 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase 'city' => 'London', 'state_district' => 'Greater London', 'state' => 'England', - 'state-ISO3166-2' => 'GB-ENG', + 'ISO3166-2-lvl4' => 'GB-ENG', + 'ISO3166-2-lvl6' => 'GB-LND', 'postcode' => 'SW1A 2AA', 'country' => 'United Kingdom', 'country_code' => 'gb' diff --git a/test/php/fixtures/address_details_10_downing_street.json b/test/php/fixtures/address_details_10_downing_street.json index 0a56beec..22d75c2e 100644 --- a/test/php/fixtures/address_details_10_downing_street.json +++ b/test/php/fixtures/address_details_10_downing_street.json @@ -133,7 +133,7 @@ {"place_id":193774423, "osm_type":"R", "osm_id":65606, - "name":{"name": "London", "name:be": "Лондан", "name:ca": "Londres", "name:el": "Λονδίνο", "name:en": "London", "name:eo": "Londono", "name:es": "Londres", "name:fa": "لندن", "name:fi": "Lontoo", "name:fr": "Londres", "name:fy": "Londen", "name:gl": "Londres", "name:hi": "लंदन", "name:lt": "Londonas", "name:nl": "Londen", "name:pl": "Londyn", "name:pt": "Londres", "name:ru": "Лондон", "name:uk": "Лондон", "name:vi": "Luân Đôn", "name:zh": "伦敦", "int_name": "London", "name:szl": "Lůndůn", "name:tzl": "Londra", "name:be-tarask": "Лёндан"}, + "name":{"name": "London", "ISO3166-2": "GB-LND", "name:be": "Лондан", "name:ca": "Londres", "name:el": "Λονδίνο", "name:en": "London", "name:eo": "Londono", "name:es": "Londres", "name:fa": "لندن", "name:fi": "Lontoo", "name:fr": "Londres", "name:fy": "Londen", "name:gl": "Londres", "name:hi": "लंदन", "name:lt": "Londonas", "name:nl": "Londen", "name:pl": "Londyn", "name:pt": "Londres", "name:ru": "Лондон", "name:uk": "Лондон", "name:vi": "Luân Đôn", "name:zh": "伦敦", "int_name": "London", "name:szl": "Lůndůn", "name:tzl": "Londra", "name:be-tarask": "Лёндан"}, "class":"place", "type":"city", "admin_level":6, From d1479072ae6a453edd41e90ee5fbba034d384687 Mon Sep 17 00:00:00 2001 From: Artem Ziablytskyi Date: Thu, 7 Apr 2022 14:09:08 +0200 Subject: [PATCH 8/8] fix bdd tests and docs --- docs/api/Output.md | 4 ++-- test/bdd/api/search/params.feature | 2 +- test/bdd/api/search/queries.feature | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/api/Output.md b/docs/api/Output.md index 961f48b8..07525a98 100644 --- a/docs/api/Output.md +++ b/docs/api/Output.md @@ -127,7 +127,7 @@ formats depending on the API call. Bavaria - DE-BY + DE-BY Germany de @@ -181,7 +181,7 @@ Additional information requested with `addressdetails=1`, `extratags=1` and London Greater London England - GB-ENG + GB-ENG SW1A 2DU United Kingdom gb diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature index cc86e01b..3f12f1c8 100644 --- a/test/bdd/api/search/params.feature +++ b/test/bdd/api/search/params.feature @@ -34,7 +34,7 @@ Feature: Search queries | postcode | 9495 | | country | Liechtenstein | | country_code | li | - | ISO3166-2-lvl12 | LI-09 | + | ISO3166-2-lvl8 | LI-09 | Examples: | format | diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature index d141122e..d378d3f8 100644 --- a/test/bdd/api/search/queries.feature +++ b/test/bdd/api/search/queries.feature @@ -15,7 +15,7 @@ Feature: Search queries | postcode | 9497 | | country | Liechtenstein | | country_code | li | - | ISO3166-2-lvl10 | LI-10 | + | ISO3166-2-lvl8 | LI-10 | Scenario: House number interpolation When sending json search query "Grosssteg 1023, Triesenberg" with address @@ -42,7 +42,7 @@ Feature: Search queries | town | Triesenberg | | country | Liechtenstein | | country_code | li | - | ISO3166-2-lvl10 | LI-10 | + | ISO3166-2-lvl8 | LI-10 | Scenario Outline: Housenumber 0 can be found When sending search query "Gnalpstrasse 0" with address