Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wales and Scotland name change #3746

Merged
merged 5 commits into from
Sep 14, 2022
Merged

Wales and Scotland name change #3746

merged 5 commits into from
Sep 14, 2022

Conversation

gknisely
Copy link
Member

@gknisely gknisely commented Sep 12, 2022

Issue

Wales and Scotland had a name change. We need to come up with a better design and handle name changes. Not sure what to do yet. Anyhow #fixes #3135 Added a small test showing how just one user inputted access can shut off country access overrides.

Tasklist

Requirements / Relations

Link any requirements here. Other pull requests this PR is based on?

@gknisely gknisely changed the title Wales scotland fix Wales and Scotland name change Sep 12, 2022
@@ -64,7 +64,7 @@ drive_on_right = {
["South Africa"] = "false",
["Sri Lanka"] = "false",
["Suriname"] = "false",
["Scotland"] = "false",
["Alba / Scotland"] = "false",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesnt this mean that someone converting an older planet will also get screwed? i think the compatible fix would be to include both variants right? just support both for a time. its a bit of baggage to carry but its better than getting bug reports :D

@@ -191,7 +191,7 @@ function rels_proc (kv, nokeys)
end
end
end
if kv["name"] == "England" or kv["name"] == "Scotland" or kv["name"] == "Wales" or kv["name"] == "Northern Ireland" then
if kv["name"] == "England" or kv["name"] == "Alba / Scotland" or kv["name"] == "Cymru / Wales" or kv["name"] == "Northern Ireland" then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesnt this mean that someone converting an older planet will also get screwed? i think the compatible fix would be to include both variants right? just support both for a time. its a bit of baggage to carry but its better than getting bug reports :D

@kevinkreiser Yeah I had the following, but was concerned folks would complain. Thoughts?

if kv["name"] == "Alba / Scotland" then
   kv["name"] = "Scotland"
end

if kv["name"] == "Cymru / Wales" then
   kv["name"] = "Wales"
end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO fine fix:)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had actually meant just leave both checks in and use whichever we find. Which means doing it at the other places where you have changes as well. Basically support both names all the way through the code

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinkreiser If I don't do the lua change I posted, then we will have to have support for both here too https://github.com/valhalla/valhalla/pull/3746/files#diff-687f31f02c6bb0a624827f33f233de7302f94e2c5c1099b33931752ff40d94aaR135

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep I know that's what I'm suggesting

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know when those relations changed? If it was a long while ago then just ignore my comment. If it was recent then it's a pretty huge gotcha to have to know to use the bleeding edge changeset

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinkreiser Scotland was 8 months ago and Wales I am not sure as it keeps timing out on me.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok cool then we can just ship it as is. we'll assume wales was also a while ago. sorry for the noise i just didnt want to knowingly put a gotcha in there

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinkreiser np. thanks for the feedback

nilsnolde
nilsnolde previously approved these changes Sep 13, 2022
@nilsnolde
Copy link
Member

urgh.. windows fails with some vcpkg idiocy.. can someone pls re-trigger that workflow, hoping it's just a hiccup? lint build is the usual coverage fail

kevinkreiser
kevinkreiser previously approved these changes Sep 13, 2022
@gknisely gknisely dismissed stale reviews from kevinkreiser and nilsnolde via 51a6c2e September 13, 2022 13:49
@gknisely gknisely merged commit 52f869e into master Sep 14, 2022
@gknisely gknisely deleted the Wales_Scotland_fix branch September 14, 2022 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bridleways with foot=true tag results in edges without bicycle access
3 participants