diff --git a/landcover.mss b/landcover.mss index 207da89010..ac872e17fb 100644 --- a/landcover.mss +++ b/landcover.mss @@ -130,34 +130,8 @@ [way_pixels >= 64] { polygon-pattern-gamma: 0.3; } } - [feature = 'landuse_vineyard'] { - [zoom >= 10] { - polygon-fill: @orchard; - [way_pixels >= 4] { polygon-gamma: 0.75; } - [way_pixels >= 64] { polygon-gamma: 0.3; } - } - [zoom >= 14] { - polygon-pattern-file: url('symbols/vineyard.png'); - polygon-pattern-alignment: global; - [way_pixels >= 4] { polygon-pattern-gamma: 0.75; } - [way_pixels >= 64] { polygon-pattern-gamma: 0.3; } - } - } - - [feature = 'landuse_orchard'] { - [zoom >= 10] { - polygon-fill: @orchard; - [way_pixels >= 4] { polygon-gamma: 0.75; } - [way_pixels >= 64] { polygon-gamma: 0.3; } - } - [zoom >= 14] { - polygon-pattern-file: url('symbols/orchard.png'); - polygon-pattern-alignment: global; - [way_pixels >= 4] { polygon-pattern-gamma: 0.75; } - [way_pixels >= 64] { polygon-pattern-gamma: 0.3; } - } - } - + [feature = 'landuse_orchard'], + [feature = 'landuse_vineyard'], [feature = 'landuse_plant_nursery'] { [zoom >= 10] { polygon-fill: @orchard; @@ -165,7 +139,9 @@ [way_pixels >= 64] { polygon-gamma: 0.3; } } [zoom >= 14] { - polygon-pattern-file: url('symbols/plant_nursery.png'); + [feature = 'landuse_orchard'] { polygon-pattern-file: url('symbols/orchard.png'); } + [feature = 'landuse_vineyard'] { polygon-pattern-file: url('symbols/vineyard.png'); } + [feature = 'landuse_plant_nursery'] { polygon-pattern-file: url('symbols/plant_nursery.png'); } polygon-pattern-alignment: global; [way_pixels >= 4] { polygon-pattern-gamma: 0.75; } [way_pixels >= 64] { polygon-pattern-gamma: 0.3; } diff --git a/symbols/generating_patterns/plant_nursery.md b/symbols/generating_patterns/plant_nursery.md index 8c2cd3477f..f7cc7fc344 100644 --- a/symbols/generating_patterns/plant_nursery.md +++ b/symbols/generating_patterns/plant_nursery.md @@ -1,5 +1,16 @@ This pattern is generated by jsdotpattern script through this link: -http://www.imagico.de/map/jsdotpattern.php#x,128,jdp32360;gv,6,32,32;rd,1,0,0,pixel,0.125,4,4,0,jdp23814,749d6c,aedea3; +http://www.imagico.de/map/jsdotpattern.php#x,128,jdp32360;gv,8,32,32;rd,1,0,0,pixel,0.125,4,4,0,jdp23814,749d6c,aedea3; -Since exported SVG file is not properly handled by Mapnik, it was converted to PNG file with alpha channel. +distance: 8 +pattern: regular rotated triangular +pattern size: 128 + +shape: pixel +offset: 4 4 +scale: 0.125 + +render (inlined & aligned) + +Since exported SVG file is not properly handled by Mapnik, it was converted +to PNG file with alpha channel with GIMP. diff --git a/symbols/generating_patterns/plant_nursery.svg b/symbols/generating_patterns/plant_nursery.svg index 27491ca438..212716ed2c 100644 --- a/symbols/generating_patterns/plant_nursery.svg +++ b/symbols/generating_patterns/plant_nursery.svg @@ -3,7 +3,7 @@ - + - + Created with Snap \ No newline at end of file diff --git a/symbols/plant_nursery.png b/symbols/plant_nursery.png index 90b46aa98b..9b3b9fb39f 100644 Binary files a/symbols/plant_nursery.png and b/symbols/plant_nursery.png differ