From 2c55e7d017e95c3b43efeb3129fdcc3be27e035f Mon Sep 17 00:00:00 2001 From: Komzpa Date: Wed, 10 Aug 2011 03:15:05 +0300 Subject: [PATCH] fixed fill-* --- src/komap.py | 4 ++-- src/styles/osmosnimki-maps.mapcss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komap.py b/src/komap.py index e83eb79..a519d56 100644 --- a/src/komap.py +++ b/src/komap.py @@ -342,11 +342,11 @@ if options.renderer == "mapnik": continue - if "width" in entry["style"] or "line-style" in entry["style"]: + if "width" in entry["style"] or "line-style" in entry["style"] or (("fill-color" in entry["style"] or "fill-image" in entry["style"]) and layer_type == "polygon"): xml += xml_rule_start() xml += x_scale xml += xml_filter(entry["rulestring"]) - if entry["type"] in ("way", "area", "polygon"): + if layer_type == "polygon": if "fill-color" in entry["style"]: xml += xml_polygonsymbolizer(entry["style"].get("fill-color", "black"), entry["style"].get("fill-opacity", "1")) if "fill-image" in entry["style"]: diff --git a/src/styles/osmosnimki-maps.mapcss b/src/styles/osmosnimki-maps.mapcss index e7b7131..2801639 100644 --- a/src/styles/osmosnimki-maps.mapcss +++ b/src/styles/osmosnimki-maps.mapcss @@ -853,7 +853,7 @@ node|z7-[place=ocean] node|z-6[place=sea] {text:name; text-offset:0; font-size:8; font-family: DejaVu Sans Oblique; text-halo-radius:1; text-color:#4976d1;text-halo-color:#ffffff;-x-mapnik-min-distance:0} -node|z7-[place=sea] +node|z7-9[place=sea] {text:name; text-offset:0; font-size:10; font-family: DejaVu Sans Oblique; text-halo-radius:1; text-color:#4976d1;text-halo-color:#ffffff;-x-mapnik-min-distance:0} node|z3-4[natural=peak][ele>4500]