Improve Nominatim Provider #806
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * This file is part of the Geocoder package. | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| * | ||
| * @license MIT License | ||
| */ | ||
|
|
||
| namespace Geocoder\Provider\Nominatim\Model; | ||
|
|
||
| use Geocoder\Model\Address; | ||
|
|
||
| /** | ||
| * @author Jonathan Beliën <jbe@geo6.be> | ||
| */ | ||
| final class NominatimAddress extends Address | ||
| { | ||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $attribution; | ||
|
|
||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $class; | ||
|
|
||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $displayName; | ||
|
|
||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $osmType; | ||
|
|
||
| /** | ||
| * @var int|null | ||
| */ | ||
| private $osmId; | ||
|
|
||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $type; | ||
|
|
||
| /** | ||
| * @return null|string | ||
| */ | ||
| public function getAttribution() | ||
| { | ||
| return $this->attribution; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|string $attribution | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withAttribution(string $attribution = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->attribution = $attribution; | ||
|
|
||
| return $new; | ||
| } | ||
|
|
||
| /** | ||
| * @return null|string | ||
| */ | ||
| public function getClass() | ||
| { | ||
| return $this->class; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|string $class | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withClass(string $class = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->class = $class; | ||
|
|
||
| return $new; | ||
| } | ||
|
|
||
| /** | ||
| * @return null|string | ||
| */ | ||
| public function getDisplayName() | ||
| { | ||
| return $this->displayName; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|string $displayName | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withDisplayName(string $displayName = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->displayName = $displayName; | ||
|
|
||
| return $new; | ||
| } | ||
|
|
||
| /** | ||
| * @return null|int | ||
| */ | ||
| public function getOSMId() | ||
| { | ||
| return $this->osmId; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|int $osmId | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withOSMId(int $osmId = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->osmId = $osmId; | ||
|
|
||
| return $new; | ||
| } | ||
|
|
||
| /** | ||
| * @return null|string | ||
| */ | ||
| public function getOSMType() | ||
| { | ||
| return $this->osmType; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|string $osmType | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withOSMType(string $osmType = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->osmType = $osmType; | ||
|
|
||
| return $new; | ||
| } | ||
|
|
||
| /** | ||
| * @return null|string | ||
| */ | ||
| public function getType() | ||
| { | ||
| return $this->type; | ||
| } | ||
|
|
||
| /** | ||
| * @param null|string $type | ||
| * | ||
| * @return NominatimAddress | ||
| */ | ||
| public function withType(string $type = null): self | ||
| { | ||
| $new = clone $this; | ||
| $new->type = $type; | ||
|
|
||
| return $new; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| s:1431:"<?xml version="1.0" encoding="UTF-8" ?> | ||
| <searchresults timestamp='Fri, 29 Dec 17 15:02:42 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='35 avenue jean de bologne 1020 bruxelles' polygon='false' exclude_place_ids='120528821' more_url='https://nominatim.openstreetmap.org/search.php?q=35+avenue+jean+de+bologne+1020+bruxelles&exclude_place_ids=120528821&addressdetails=1&format=xml'> | ||
| <place place_id='120528821' osm_type='way' osm_id='220754533' place_rank='30' boundingbox="50.896294,50.8963934,4.3604816,4.3607151" lat='50.89634435' lon='4.36059848989059' display_name='35, Avenue Jean de Bologne - Jean de Bolognelaan, Heysel - Heizel, Laeken / Laken, Ville de Bruxelles - Stad Brussel, Brussel-Hoofdstad - Bruxelles-Capitale, Région de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest, 1020, België / Belgique / Belgien' class='building' type='yes' importance='0.721'> | ||
| <house_number>35</house_number><road>Avenue Jean de Bologne - Jean de Bolognelaan</road><suburb>Heysel - Heizel</suburb><city_district>Laeken / Laken</city_district><city>Ville de Bruxelles - Stad Brussel</city><county>Brussel-Hoofdstad - Bruxelles-Capitale</county><state>Région de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest</state><postcode>1020</postcode><country>België / Belgique / Belgien</country><country_code>be</country_code></place></searchresults>"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this moved?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seemed more logical to regroup postal code process ;
But I really don't mind putting it back to line 152 ^_^