diff --git a/VAGRANT.md b/VAGRANT.md index b10a5ac7..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/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 + 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 diff --git a/docs/api/Output.md b/docs/api/Output.md index 31dd5b3f..07525a98 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", + "ISO3166-2-lvl4": "GB-ENG", "postcode": "SW1A 2DU", "country": "United Kingdom", "country_code": "gb" @@ -126,6 +127,7 @@ formats depending on the API call. Bavaria + DE-BY Germany de @@ -179,6 +181,7 @@ Additional information requested with `addressdetails=1`, `extratags=1` and London Greater London England + GB-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_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 1bd475ad..cfdd0416 100644 --- a/lib-php/AddressDetails.php +++ b/lib-php/AddressDetails.php @@ -92,6 +92,10 @@ class AddressDetails || $aLine['class'] == 'place') ) { $aAddress[$sTypeLabel] = $sName; + + if (!empty($aLine['name'])) { + $this->addSubdivisionCode($aAddress, $aLine['admin_level'], $aLine['name']); + } } } @@ -174,4 +178,14 @@ class AddressDetails { return $this->aAddressLines; } + + private function addSubdivisionCode(&$aAddress, $iAdminLevel, $nameDetails) + { + if (is_string($nameDetails)) { + $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true); + } + if (!empty($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..3f12f1c8 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-lvl8 | LI-09 | Examples: | format | diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature index 8b70dac1..d378d3f8 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-lvl8 | 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-lvl8 | 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 1425be2d..2041dcb4 100644 --- a/test/php/Nominatim/AddressDetailsTest.php +++ b/test/php/Nominatim/AddressDetailsTest.php @@ -86,6 +86,8 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase 'city' => 'London', 'state_district' => 'Greater London', 'state' => 'England', + '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 853a6c07..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, @@ -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", "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, @@ -214,4 +214,4 @@ "rank_address":4, "distance":0, "localname":"gb"} -] \ No newline at end of file +]