-
Notifications
You must be signed in to change notification settings - Fork 823
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor buildings code Replace the old buildings SQL and MSS. This involves resulting changes to landcover stylings to handle landcover which was previously in buildings.mss. Stops rendering supermarkets in a crazy pink to fix #520. Superceeds #550. Moves the rendering of train station areas to landcover. Fixes #327. Fixes #389 Removes outline differences based on a distinction that no one fully understands. Superceeds #533. Fixes #68 Rebased in 6b2a4de by math1985 <[email protected]>
- Loading branch information
Showing
4 changed files
with
64 additions
and
72 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,58 +1,35 @@ | ||
@building: #bca9a9; | ||
@station: #d4aaaa; | ||
@supermarket: pink; | ||
@placeOfWorship: #777; | ||
@terminal: #cc99ff; | ||
@building-fill: #dcd5c6; | ||
@building-line: darken(@building-fill, 10%); | ||
|
||
#buildings-lz { | ||
[zoom >= 10] { | ||
[railway = 'station']::railway, | ||
[building = 'station'] { | ||
polygon-fill: @station; | ||
polygon-clip: false; | ||
} | ||
@building-aeroway-fill: #cc99ff; | ||
@building-aeroway-line: darken(@building-aeroway-fill,15%); | ||
|
||
[building = 'supermarket'] { | ||
polygon-fill: @supermarket; | ||
polygon-opacity: 0.5; | ||
polygon-clip: false; | ||
} | ||
|
||
[amenity = 'place_of_worship']::amenity { | ||
polygon-opacity: 0.5; | ||
polygon-fill: @placeOfWorship; | ||
polygon-clip: false; | ||
[zoom >= 15] { | ||
polygon-opacity: 0.9; | ||
polygon-fill: lighten(@placeOfWorship, 20%); | ||
line-width: 0.3; | ||
line-color: darken(@placeOfWorship, 40%); | ||
} | ||
} | ||
#buildings-major { | ||
[zoom >= 10][zoom < 12] { | ||
polygon-fill: @building-fill; | ||
polygon-clip: false; | ||
} | ||
} | ||
|
||
#buildings { | ||
[building = 'INT-light'][zoom >= 12] { | ||
polygon-fill: @building; | ||
polygon-opacity: 0.7; | ||
[zoom >= 12] { | ||
/* Set the base styling for buildings. We'll need to reset the fill and | ||
line colours for more specialized building rendering lower down, but | ||
not the clipping or line-width. | ||
*/ | ||
polygon-fill: @building-fill; | ||
polygon-clip: false; | ||
} | ||
[building != 'INT-light'][building != ''][zoom >= 12] { | ||
polygon-fill: @building; | ||
polygon-opacity: 0.9; | ||
polygon-clip: false; | ||
[zoom >= 16] { | ||
line-color: saturate(darken(@building, 50%), 10%); | ||
line-width: 0.2; | ||
[zoom >= 15] { | ||
line-color: @building-line; | ||
line-width: .75; | ||
line-clip: false; | ||
} | ||
} | ||
[aeroway = 'terminal'][zoom >= 12]::aeroway { | ||
polygon-fill: @terminal; | ||
polygon-clip: false; | ||
[zoom >= 14] { | ||
line-color: saturate(darken(@terminal, 50%), 20%); | ||
line-width: 0.2; | ||
[aeroway = 'terminal'] { | ||
polygon-fill: @building-aeroway-fill; | ||
[zoom >= 15] { | ||
line-color: @building-aeroway-line; | ||
} | ||
} | ||
} | ||
} |
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
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
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