Add country code to incident metadata #3169
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
mandeepsandhu
force-pushed
the
incident_country_code
branch
from
882cfa4
to
b6bb9ee
Compare
mandeepsandhu
commented
Jun 24, 2021
run_route_scripts/run_with_server.py
Outdated
| @@ -85,7 +85,8 @@ def make_request(post_body): | |||
| parser.add_argument('--output-dir', type=str, help='The directory in which to place the result of each request') | |||
| parser.add_argument('--concurrency', type=int, help='The number of processes to use to make requests', default=multiprocessing.cpu_count()) | |||
| parser.add_argument('--format', type=str, help='Supports csv, json, raw and null output formats', default='csv') | |||
| parser.add_argument('--headers', type=str, help='Additional http headers to send with the requests. Follows the http header spec, eg. some-header-name: some-header-value', action='append', nargs='*') | |||
| parser.add_argument('--headers', type=str, help='Additional http headers to send with the requests. Follows the http\ | |||
There was a problem hiding this comment.
This accidentally crept in. This script is currently broken in master. But I remember a PR from either @kevinkreiser or @merkispavel that fixed it (can't find the PR right now though :/ )
mandeepsandhu
commented
Jun 24, 2021
mandeepsandhu
commented
Jun 24, 2021
src/tyr/route_serializer_osrm.cc
Outdated
| auto country_iso3 = iso2_to_iso3.find(admin.country_code()); | ||
| if (country_iso3 != iso2_to_iso3.end()) { | ||
| admin_map->emplace("iso_3166_1_alpha3", country_iso3->second); | ||
| auto country_iso3 = valhalla::tyr::get_iso_3166_1_alpha3(admin.country_code()); |
There was a problem hiding this comment.
Moved the lookup to a util function.
mandeepsandhu
commented
Jun 24, 2021
mandeepsandhu
commented
Jun 24, 2021
| {"DEF", {{"highway", "primary"}}}, {"GHI", {{"highway", "primary"}}}, | ||
| {"ADG", {{"highway", "motorway"}}}, {"BE", {{"highway", "secondary"}}}, | ||
| {"EH", {{"highway", "tertiary"}}}, | ||
| {"AB", {{"highway", "tertiary"}, {"driving_side", "left"}}}, |
There was a problem hiding this comment.
Had to add driving side since we're no longer using admin db and instead manually setting certain admin attributes.
purew
reviewed
Jun 24, 2021
purew
reviewed
Jun 24, 2021
purew
reviewed
Jun 24, 2021
mandeepsandhu
force-pushed
the
incident_country_code
branch
from
b6bb9ee
to
a13d977
Compare
mandeepsandhu
force-pushed
the
incident_country_code
branch
from
89706af
to
3b298a2
Compare
|
@kevinkreiser @purew this is ready for review. gist of changes:
|
Added country code (iso 2 & 3 char) to incident metadata. Also renamed the existing country code attribute in incident metadata from iso_3166_1_alpha2 to iso_3166_1 to be consistent with similar attribute when serializing admins in route response.
mandeepsandhu
force-pushed
the
incident_country_code
branch
from
3b298a2
to
aa116b9
Compare
purew
approved these changes
Jun 28, 2021
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.
Added country code (iso 2 & 3 char) to incident metadata.