ingest/apply-geolocation-rules: update general rules logic #55
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
victorlin
requested changes
Jun 14, 2022
joverlee521
force-pushed
the
apply-geolocation-update
branch
from
7de4dda
to
33a8979
Compare
Closed
Previously, we would backfill `rule_traversal` with wildcards ("*")
if we could not find a matching rule for a particular `raw_geolocation`.
This would NOT work for cases where there are partial rule matches AND
wildcard rules that match. I realized the flaw in this logic
while responding to @victorlin's post-merge review:
#41 (comment)
This commit updates the logic for when there are no matching rules. The
`rule_traversal` is reset to the last index that is currently not a
wildcard rule, and then change this value to a wildcard. This allows the
recursive function to try different iterations of `rule_traversal` with
different combinations of raw values and wildcards.
joverlee521
force-pushed
the
apply-geolocation-update
branch
from
33a8979
to
0f6e1c2
Compare
victorlin
approved these changes
Jun 17, 2022
Co-authored-by: Victor Lin <13424970+victorlin@users.noreply.github.com>
|
Anything still blocking this from being merged? @joverlee521 @victorlin? |
|
There is one difference after running this, Ciudad Autonoma de Buenos Aires turns into Buenos Aires, I think that's on purpose, so I'll merge. |
Thanks for checking in on this @corneliusroemer! Yes, this is an expected change of this PR since the updated logic now allows for these partial match rules to work: (This is a rule pulled from ncov-ingest) |
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.
Previously, we would backfill
rule_traversalwith "*" general rulesif we could not find a matching rule for a particular
raw_geolocation.This would NOT work for cases where the "*" general rules preceded
actual geolocations such as "*/*/*/D". I realized the flaw in this logic
while responding to @victorlin's post-merge review:
#41 (comment)
This commit updates the logic to reset
rule_traversalto the lastindex that is currently not a "*" general rule, then change this value
to a "*". This allows the recursive function to try different iterations
of
rule_traversalwith different combinations of raw values and "*"s.