Skip to content

Commit

Permalink
Change allotments color and add outline (gravitystorm#3625)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeisenbe authored and kocio-pl committed Jan 12, 2019
1 parent 16db0b8 commit e62b414
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 32 deletions.
6 changes: 4 additions & 2 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -2479,10 +2479,12 @@
}
[feature = 'landuse_meadow'],
[feature = 'natural_grassland'],
[feature = 'landuse_grass'],
[feature = 'landuse_allotments'] {
[feature = 'landuse_grass'] {
text-fill: darken(@grass, 50%);
}
[feature = 'landuse_allotments'] {
text-fill: darken(@allotments, 50%);
}
[feature = 'landuse_farmyard'] {
text-fill: darken(@farmyard, 50%);
}
Expand Down
12 changes: 10 additions & 2 deletions landcover.mss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// --- Parks, woods, other green things ---

@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, common, village_green, garden, allotments
@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, common, village_green, garden
@scrub: #c8d7ab; // Lch(84,24,122)
@forest: #add19e; // Lch(80,30,135)
@forest-text: #46673b; // Lch(40,30,135)
@park: #c8facc; // Lch(94,30,145)
@allotments: #c9e1bf; // Lch(87,20,135)
@orchard: #aedfa3; // also vineyard, plant_nursery

// --- "Base" landuses ---
Expand Down Expand Up @@ -301,7 +302,7 @@

[feature = 'landuse_allotments'] {
[zoom >= 10] {
polygon-fill: @grass;
polygon-fill: @allotments;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
Expand All @@ -311,6 +312,13 @@
[way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
[way_pixels >= 64] { polygon-pattern-gamma: 0.3; }
}
[zoom >= 16] {
line-width: 0.5;
line-color: desaturate(darken(@allotments, 10%), 10%);
[name != null] {
line-width: 0.7;
}
}
}

[feature = 'landuse_forest'],
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.
21 changes: 2 additions & 19 deletions symbols/generating_patterns/allotments.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
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
The allotments pattern is based on allotments.svg

However, since SVG patterns is not properly handled by Mapnik at this time, the SVG file was converted to a PNG file with alpha channel, allotments.png
47 changes: 38 additions & 9 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 e62b414

Please sign in to comment.