Introduce enum for Photon's address type #517
Merged
Conversation
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
The enum lists the possible address fields that Photon may index and output. It is also responsible for mapping Nominatim's address rank values to the address type. PhotonDoc uses the type to define its address in a map instead of having lots of separate fields. That simplifies code in a number of places. The commit also disallows adding an address part with the same level as the place object itself. Fixes komoot#499.
karussell
reviewed
Nov 24, 2020
| * @param addressFieldName The name of the address tag to use (without the 'addr:' prefix). | ||
| * | ||
| * @return 'existingField' potentially with the name field replaced. If existingField was null and | ||
| * the address field could be found, then a new map with the address as single entry is returned. | ||
| */ | ||
| private Map<String, String> extractAddress(Map<String, String> existingField, String addressFieldName) { | ||
| private void extractAddress(AddressType addressType, String addressFieldName) { |
There was a problem hiding this comment.
Could you get addressFieldName also from addressType.getName? Then you could remove it from the parameter list.
BTW: thanks for introducing me to EnumMap - really interesting :)
There was a problem hiding this comment.
The mapping between the GeocodeJSON names and the OSM addr:* tag names is not exactly 1:1. suburb and neighbourhood are already different and we might even add more variants (like 'province' for 'state'). We could add the mapping into the new AddressType enum as an extra field though. Something for an extra PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The enum lists the possible address fields that Photon may index and output. It is also responsible for mapping Nominatim's address rank values to the address type. This should now be the only place where raw Nominatim address rank numbers are used.
PhotonDoc uses the type to define its address in a map instead of having lots of separate fields. That simplifies code in a number
of places.
The commit also disallows adding an address part with the same level as the place object itself. CC @hendrikmoree
Fixes #499.