Skip to content

Commit

Permalink
Change allotments color and pattern (#3548)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeisenbe authored and kocio-pl committed Dec 19, 2018
1 parent b0c16f2 commit 5208585
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 8 deletions.
6 changes: 2 additions & 4 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -2372,11 +2372,9 @@
}
[feature = 'landuse_meadow'],
[feature = 'natural_grassland'],
[feature = 'landuse_grass'] {
text-fill: darken(@grass, 50%);
}
[feature = 'landuse_grass'],
[feature = 'landuse_allotments'] {
text-fill: darken(@allotments, 50%);
text-fill: darken(@grass, 50%);
}
[feature = 'landuse_farmyard'] {
text-fill: darken(@farmyard, 50%);
Expand Down
7 changes: 3 additions & 4 deletions landcover.mss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// --- Parks, woods, other green things ---

@grass: #cdebb0; // also grassland, meadow, common, village_green, garden
@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, common, village_green, garden, allotments
@scrub: #c8d7ab; // Lch(84,24,122)
@forest: #add19e; // Lch(80,30,135)
@forest-text: #46673b; // Lch(40,30,135)
Expand Down Expand Up @@ -38,7 +38,6 @@

// --- Other ----

@allotments: #eecfb3; // Lch(85,19,70)
@bare_ground: #eee5dc;
@campsite: #def6c0; // also caravan_site, picnic_site
@cemetery: #aacbaf; // also grave_yard
Expand Down Expand Up @@ -302,11 +301,11 @@

[feature = 'landuse_allotments'] {
[zoom >= 10] {
polygon-fill: @allotments;
polygon-fill: @grass;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
[zoom >= 14] {
[zoom >= 13] {
polygon-pattern-file: url('symbols/allotments.png');
polygon-pattern-alignment: global;
[way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
Expand Down
Binary file modified symbols/allotments.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions symbols/generating_patterns/allotments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Pattern file for allotments was generated in two steps.

SVG file is generated using JSDotPattern generator (http://www.imagico.de/map/jsdotpattern.php) using these options:

- symbol definition: pixel
- offset: 8 8
- scale: 0.25
- symbol pattern (foreground color): #f2faeb
- point generation
- distance: 4
- regular square dot pattern
- rendering: render (px aligned)
- pattern size: 64

(direct link: x,64,jdp34225;gs,4,32,32;rd,1,0,0,pixel,0.25,8,8,0,jdp4911,f2faeb,cdebb0;)

This generates file allotments.svg

However, since SVG files are not properly handled by Mapnik, the file was converted to png with alpha channel: symbols/allotments.png

9 changes: 9 additions & 0 deletions symbols/generating_patterns/allotments.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5208585

Please sign in to comment.