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

Lua changes for targeted disputed borders fixes #2065

Merged
merged 77 commits into from
Mar 18, 2022

Conversation

jeffdefacto
Copy link
Contributor

Lua updates to support disputed borders

tgrigsby-sc and others added 30 commits February 4, 2022 14:28
…isputed relations. This should hopefully convert affected borders to kind=disputed_reference_line.
…acking' into travisg/20220204-disputed_by-unpacking
@jeffdefacto jeffdefacto requested a review from tgrigsby-sc March 18, 2022 18:53
osm2pgsql.lua Show resolved Hide resolved
osm2pgsql.lua Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Show resolved Hide resolved
osm2pgsql.lua Show resolved Hide resolved
osm2pgsql.lua Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
osm2pgsql.lua Outdated Show resolved Hide resolved
@@ -643,7 +813,11 @@ function osm2pgsql.process_relation(object)
-- Adds tags to redefine Israel admin 4 boundaries for Palestine.
if type == 'boundary' and (object.tags.admin_level == '4') and object.tags['ISO3166-2'] then
if osm2pgsql.has_prefix(object.tags['ISO3166-2'], 'IL-') then
output_hstore['admin_level:PS'] = '6'
output_hstore['admin_level:BD'] = '8'
Copy link
Member

Choose a reason for hiding this comment

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

This will require a style sheet change, which is ok.

But I think a better result would be kind:xx = unrecognized in the output tiles because we want a way to turn them off while still showing locality lines elsewhere. Is there a different way you can tag these here to achieve that result?

Copy link
Member

Choose a reason for hiding this comment

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

Can stay.

osm2pgsql.lua Outdated
@@ -658,6 +832,42 @@ function osm2pgsql.process_relation(object)
output_hstore['admin_level'] = '4'
end

-- Turn off West Bank and Judea and Samaria relations for everyone but Israel
if type == 'boundary' and object.tags.wikidata == 'Q36678' then
output_hstore['admin_level:AR'] = '8'
Copy link
Member

Choose a reason for hiding this comment

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

This will require a style sheet change, which is ok.

But I think a better result would be kind:xx = unrecognized in the output tiles because we want a way to turn them off while still showing locality lines elsewhere. Is there a different way you can tag these here to achieve that result?

Copy link
Member

Choose a reason for hiding this comment

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

Please turn this one off entirely, for all viewpoints. This means Israel won't see it, for now. But we'll followup with more complex solution.

if object.tags.place and object.tags.wikidata == 'Q1246' then
output_hstore['disputed_by'] = 'CN;GR;IN;RU'
Copy link
Member

Choose a reason for hiding this comment

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

For all other countries we consider we'd end up with kind:XX = country for the other Natural Earth POVs.

@tgrigsby-sc tgrigsby-sc changed the title Junderwood/lua changes Lua changes for targeted disputed borders fixes Mar 18, 2022
@jeffdefacto jeffdefacto merged commit 7160df5 into master Mar 18, 2022
@jeffdefacto jeffdefacto deleted the junderwood/lua_changes branch March 18, 2022 23:36
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.

3 participants