From 72399f0b239a114d4cc16d3d493ee8ff2f6ac60a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 28 Jan 2011 20:47:09 +0000 Subject: [PATCH] fix reading of height value for building_symbolizer --- src/load_map.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/load_map.cpp b/src/load_map.cpp index 1b9b832db..2b9abd117 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -21,6 +21,7 @@ *****************************************************************************/ // mapnik #include +#include #include #include @@ -1376,6 +1377,11 @@ void map_parser::parse_line_symbolizer( rule_type & rule, ptree const & sym ) float opacity = get_css(css, css_name); strk.set_opacity(opacity); } + else if (css_name == "stroke-offset") + { + float offset = get_css(css, css_name); + strk.set_offset(offset); + } else if (css_name == "stroke-linejoin") { line_join_e line_join = get_css(css, css_name); @@ -1447,6 +1453,9 @@ void map_parser::parse_line_symbolizer( rule_type & rule, ptree const & sym ) // stroke-opacity optional opacity = get_opt_attr(sym, "stroke-opacity"); if (opacity) strk.set_opacity(*opacity); + // stroke-offset + optional offset = get_opt_attr(sym, "stroke-offset"); + if (offset) strk.set_offset(*offset); // stroke-linejoin optional line_join = get_opt_attr(sym, "stroke-linejoin"); if (line_join) strk.set_line_join(*line_join); @@ -1632,7 +1641,7 @@ void map_parser::parse_building_symbolizer( rule_type & rule, ptree const & sym if (opacity) building_sym.set_opacity(*opacity); // height optional height = get_opt_attr(sym, "height"); - if (opacity) building_sym.set_height(*height); + if (height) building_sym.set_height(*height); rule.append(building_sym); }