diff --git a/landcover.mss b/landcover.mss index 207da89010..0b494c0282 100644 --- a/landcover.mss +++ b/landcover.mss @@ -621,7 +621,7 @@ #landcover-area-symbols { [int_wetland != null][zoom >= 10] { - polygon-pattern-file: url('symbols/wetland.svg'); + polygon-pattern-file: url('symbols/wetland.png'); polygon-pattern-alignment: global; } [natural = 'reef'][zoom >= 10] { @@ -656,7 +656,7 @@ [natural = 'beach'], [natural = 'shoal'] { [surface = 'sand'] { - polygon-pattern-file: url('symbols/beach.svg'); + polygon-pattern-file: url('symbols/beach.png'); polygon-pattern-alignment: global; } [surface = 'gravel'], diff --git a/symbols/beach.png b/symbols/beach.png new file mode 100644 index 0000000000..0e8948cb74 Binary files /dev/null and b/symbols/beach.png differ diff --git a/symbols/beach.svg b/symbols/beach.svg deleted file mode 100755 index 06a44ee272..0000000000 --- a/symbols/beach.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - Created with Snap - diff --git a/symbols/generating_patterns/beach.md b/symbols/generating_patterns/beach.md index d28a13f021..b025103748 100644 --- a/symbols/generating_patterns/beach.md +++ b/symbols/generating_patterns/beach.md @@ -1,9 +1,11 @@ -Pattern file for beach is generated in two steps. -In the first step visit [jsdotpattern (command sequence is recorded)](http://www.imagico.de/map/jsdotpattern.php#x,128,jdp59980;g,2.25,16,16;rx,250,2,8,8;rx,250,2,8,8;s,jdp58799;s,jdp49103;rx,250,2,8,8;rd,0,0,1,scree,0.1,5,10,0,jdp31724,dbb677,fff1ba;) +The beach and reef patterns are rasterized and colored versions of the provided SVGs -Use "get pattern SVG data" (it is expected that background will be transparent, background colour in jsdotpattern is only for display). +``` +convert -depth 8 beach.svg beach_raw.png +convert -depth 8 reef.svg reef_raw.png -Generated SVG image is sanitized for use with Mapnik by the script svg_pattern.sh from the jsdotpattern repository at http://github.com/imagico/jsdotpattern. - -The final file is beach.svg \ No newline at end of file +convert -depth 8 -size 128x128 xc:"#685d45" \( beach_raw.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - beach.png +convert -depth 8 -size 256x256 xc:"#969696" \( reef_raw.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - beach_coarse.png +convert -depth 8 -size 256x256 xc:"#549ccd" \( reef_raw.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - reef.png +``` diff --git a/symbols/generating_patterns/beach.svg b/symbols/generating_patterns/beach.svg new file mode 100644 index 0000000000..8bd0b8a82d --- /dev/null +++ b/symbols/generating_patterns/beach.svg @@ -0,0 +1,9 @@ + + + + + + + + + Created with Snap \ No newline at end of file diff --git a/symbols/generating_patterns/reef.md b/symbols/generating_patterns/reef.md deleted file mode 100644 index fe1e3c8b22..0000000000 --- a/symbols/generating_patterns/reef.md +++ /dev/null @@ -1,9 +0,0 @@ - -The reef patterns are rasterized and colored versions of the provided SVG - -``` -convert -depth 8 reef.svg reef_raw.png - -convert -depth 8 -size 256x256 xc:"#969696" \( reef_raw.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - beach_coarse.png -convert -depth 8 -size 256x256 xc:"#549ccd" \( reef_raw.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - reef.png -``` diff --git a/symbols/mud.png b/symbols/mud.png new file mode 100644 index 0000000000..a5aafae79e Binary files /dev/null and b/symbols/mud.png differ diff --git a/symbols/wetland.png b/symbols/wetland.png new file mode 100644 index 0000000000..2fcf189c7d Binary files /dev/null and b/symbols/wetland.png differ diff --git a/symbols/wetland.svg b/symbols/wetland.svg deleted file mode 100644 index 6103d7084a..0000000000 --- a/symbols/wetland.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - -