Skip to content

Commit

Permalink
Added craft cider.
Browse files Browse the repository at this point in the history
  • Loading branch information
SomeoneElseOSM committed May 4, 2022
1 parent 219c7d8 commit eb95f2a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog.md
@@ -1,6 +1,9 @@
# Changes made to this rendering
This page describes changes made [here](https://github.com/SomeoneElseOSM/SomeoneElse-style), [here](https://github.com/SomeoneElseOSM/SomeoneElse-style-legend) and [here](https://github.com/SomeoneElseOSM/openstreetmap-carto-AJT), and visible [here](//map.atownsend.org.uk/maps/map/map.html).

## As yet unreleased
Added craft cider.

## 21/04/2022
Render pitch=line as a white line.
Render old_name on farmland if name is not set.
Expand Down
18 changes: 17 additions & 1 deletion style.lua
Expand Up @@ -2061,14 +2061,16 @@ function filter_tags_generic(keyvalues, nokeys)
( keyvalues["amenity"] == nil ) and
( keyvalues["tourism"] ~= "hotel" )) then
keyvalues["real_ale"] = nil
keyvalues["real_cider"] = nil
end

-- ----------------------------------------------------------------------------
-- Remove "shop" tag on industrial or craft breweries.
-- We pick one thing to display them as, and in this case it's "brewery".
-- ----------------------------------------------------------------------------
if ((( keyvalues["industrial"] == "brewery" ) or
( keyvalues["craft"] == "brewery" )) and
( keyvalues["craft"] == "brewery" ) or
( keyvalues["craft"] == "cider" )) and
( keyvalues["shop"] ~= nil )) then
keyvalues["shop"] = nil
end
Expand Down Expand Up @@ -7055,6 +7057,20 @@ function filter_tags_generic(keyvalues, nokeys)
keyvalues["amenity"] = "fire_extinguisher"
end

-- ----------------------------------------------------------------------------
-- Craft cider
-- Also remove tourism tag (we want to display brewery in preference to
-- attraction or museum).
-- ----------------------------------------------------------------------------
if (( keyvalues["craft"] == "cider" ) or
(( keyvalues["craft"] == "brewery" ) and
( keyvalues["product"] == "cider" ))) then
keyvalues["landuse"] = "unnamedcommercial"
keyvalues["office"] = "craftcider"
keyvalues["craft"] = nil
keyvalues["tourism"] = nil
end

-- ----------------------------------------------------------------------------
-- Craft breweries
-- Also remove tourism tag (we want to display brewery in preference to
Expand Down

0 comments on commit eb95f2a

Please sign in to comment.