Rahul's request #22
Merged
Rahul's request #22
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
Supporting queries like "Macau, China" which wouldn't work until this point because Macau has its own country code and doesn't directly related to China in the geonames hierarchy. This prevented Macau, China from being considered a valid parse.
| @@ -192,6 +192,15 @@ trait NameUtils { | |||
| .toList | |||
| def isFeatureBlacklistedforParent(id: Long) = blacklistedParentIds.has(id) | |||
|
|
|||
| private val dependentCountryRelationships = | |||
There was a problem hiding this comment.
I don't think this belongs in NameUtils. The feature-parent-blacklist is here because it affects name formatting, but this affects parsing itself. Just putting it in GeocodeImpl.scala would be cleaner or it's own file/object?
There was a problem hiding this comment.
Moved to new file CountryUtils.scala
1. Creating separate CountryUtils object and file 2. Adding dependent country support to AutocompleteGeocoderImpl.scala, requiring inverse dependent country lookup and country code to geonames id lookup (from countryInfo.txt) 3. Minor correctness/completeness bug fixes 4. Name, style changes
| if (req.debug > 0) { | ||
| logger.ifDebug("checking if %s is an unused parent of %s", | ||
| fid, parse.map(_.fmatch.longId)) | ||
| } | ||
|
|
||
| val isValid = (parse.exists(_.fmatch.scoringFeatures.parentIds.has(fid)) || | ||
| parse.exists(_.fmatch.scoringFeatures.extraRelationIds.has(fid))) && | ||
| parse.exists(_.fmatch.scoringFeatures.extraRelationIds.has(fid)) || | ||
| (featureMatch.fmatch.feature.woeType == YahooWoeType.COUNTRY && parse.exists(p => CountryUtils.getDependentCountryCodesForCountry(fcc).has(p.fmatch.feature.cc)))) && |
There was a problem hiding this comment.
please wrap lines at 80 or 100, 120 if it's really really necessary.
There was a problem hiding this comment.
Maybe add a CountryUtils.doFeatureCountriesMatch
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.
No description provided.