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.

Sign up for GitHub

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

Jump to bottom

Set polygon/linestring differently for some key values differently than the key in default style.lua #346

Closed
wants to merge 9 commits into from
Closed

Set polygon/linestring differently for some key values differently than the key in default style.lua #346

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc7a0cd
Allow polygon/linestring decision to be set by value in lua
matthijsmelissen Apr 28, 2015
fda1392
Extended list of key/value combinations to be treated as linestring
matthijsmelissen Apr 29, 2015
b13e7ce
Fix bug in allowing polygon/linestring decision to be set by value in…
matthijsmelissen Feb 21, 2016
1d404a3
Treat objects with both a polygon-key and a linestring-key+value as p…
matthijsmelissen Feb 22, 2016
bce43fd
Treat junction=yes as polygon tag.
matthijsmelissen Feb 23, 2016
7403835
Delete accidentally commited stamp-h1 file
matthijsmelissen Feb 23, 2016
f47ceaa
Some code optimalization
matthijsmelissen Feb 23, 2016
9feabb7
Use boolean instead of int to check whether multipolygon has polygontags
matthijsmelissen Feb 23, 2016
3c1d1c6
Treat leisure=track as linestring by default
matthijsmelissen Apr 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 78 additions & 8 deletions style.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,32 @@ polygon_keys = { 'building', 'landuse', 'amenity', 'harbour', 'historic', 'leisu
'public_transport', 'shop', 'sport', 'tourism', 'waterway',
'wetland', 'water', 'aeroway' }

-- Objects with any of the following key/value combinations will be treated as polygon
polygon_values = {
{'highway', 'services'},
{'junction', 'yes'}
}

-- Objects with any of the following key/value combinations will be treated as linestring
linestring_values = {
{'leisure', 'track'},
{'man_made', 'embankment'},
{'man_made', 'breakwater'},
{'man_made', 'groyne'},
{'natural', 'cliff'},
{'natural', 'tree_row'},
{'historic', 'citywalls'},
{'waterway', 'derelict_canal'},
{'waterway', 'ditch'},
{'waterway', 'drain'},
{'waterway', 'river'},
{'waterway', 'stream'},
{'waterway', 'wadi'},
{'waterway', 'weir'},
{'power', 'line'},
{'power', 'minor_line'}
}

-- Objects without any of the following keys will be deleted
generic_keys = {'access','addr:housename','addr:housenumber','addr:interpolation','admin_level','aerialway','aeroway','amenity','area','barrier',
'bicycle','brand','bridge','boundary','building','capital','construction','covered','culvert','cutting','denomination','disused','ele',
Expand Down Expand Up @@ -119,14 +145,34 @@ function filter_tags_way (keyvalues, numberofkeys)
return filter, keyvalues, polygon, roads
end

-- Treat objects with a key in polygon_keys as polygon
-- Treat objects with a key in polygon_keys as polygon
for i,k in ipairs(polygon_keys) do
if keyvalues[k] then
polygon=1
break
polygontag = 1
-- However, if the key/value combination occurs in linestring_values, do not treat the object as polygon
for index,tag in pairs(linestring_values) do
if k == tag[1] and keyvalues[k] == tag[2] then
polygontag = 0
break
end
end
if polygontag == 1 then
polygon = 1
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe you forgot a break here. Further, I don't quite see what is the use of 'polygontag'. Setting 'polygon' directly should have the same effect.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lonvia If I'm not mistaken, setting 'polygon' directly is not quite the same. Consider an object tagged with a polygon key, like building=yes, and a linestring tag, like historic=citywalls. The outer loop will be run at least twice, once for k=building and once for k=historic. The proposed code sets 'polygontag' and 'polygon' to 1 in the loop with k=building. In the loop with k=historic, 'polygontag' will be set to 0 because historic=citywalls is in linestring_values. However, 'polygon' will remain 1. This is not equivalent to setting 'polygon' directly, because in that case, 'polygon' would also be set to 0 in the loop for k=building.

I admit the code is rather hard to read, perhaps there is a cleaner way to accomplish the same.

break
end
end
end

-- Treat objects with a key/value combination in polygon_values as polygon
if polygon == 0 then
for index,tag in pairs(polygon_values) do
if keyvalues[tag[1]] == tag[2] then
polygon=1
break
end
end
end

-- Treat objects tagged as area=yes, area=1, or area=true as polygon,
-- and treat objects tagged as area=no, area=0, or area=false not as polygon
if ((keyvalues["area"] == "yes") or (keyvalues["area"] == "1") or (keyvalues["area"] == "true")) then
Expand Down Expand Up @@ -167,15 +213,39 @@ function filter_tags_relation_member (keyvalues, keyvaluemembers, roles, memberc
elseif (type == "multipolygon") then
-- Treat as polygon
polygon = 1
polytagcount = 0;
-- Count the number of polygon tags of the object
haspolygontags = false
-- Count the number of polygon tags
-- First count keys in polygon_keys
for i,k in ipairs(polygon_keys) do
if keyvalues[k] then
polytagcount = polytagcount + 1
polygontag = 1
-- However, if the key/value combination occurs in linestring_values, do not count the object as polygon
for index,tag in pairs(linestring_values) do
if k == tag[1] and keyvalues[k] == tag[2] then
polygontag = 0
break
end
end
if polygontag == 1 then
haspolygontags = true
break
end
end
end

-- Treat objects with a key/value combination in polygon_values as polygon
if not haspolygontags then
for index,tag in pairs(polygon_values) do
if keyvalues[tag[1]] == tag[2] then
haspolygontags = true
break
end
end
end
-- If there are no polygon tags, add tags from all outer elements to the multipolygon itself
if (polytagcount == 0) then

-- If the multipolygon has no polygon keys or polygon key/value combinations,
-- add tags from all outer elements to the multipolygon itself
if not haspolygontags then
for i = 1,membercount do
if (roles[i] == "outer") then
for k,v in pairs(keyvaluemembers[i]) do
Expand Down