sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

we are targeting 2014 so rollback 2013 CTP workarounds

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-04 18:26:17 +00:00
parent eed46b87cf
commit 038cc41cd4
2 changed files with 1 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/group/group_rule.hpp
View file

@ -40,7 +40,7 @@ struct MAPNIK_DECL group_rule
{ {
using symbolizers = std::vector<symbolizer>; using symbolizers = std::vector<symbolizer>;
group_rule(const expression_ptr& filter = expression_ptr(new expr_node), group_rule(const expression_ptr& filter =std::make_shared<mapnik::expr_node>(true),
const expression_ptr& repeat_key = expression_ptr()); const expression_ptr& repeat_key = expression_ptr());
group_rule &operator=(const group_rule &rhs); group_rule &operator=(const group_rule &rhs);

41
src/load_map.cpp
View file

@ -777,46 +777,6 @@ void map_parser::parse_symbolizers(rule & rule, xml_node const & node)
rule.reserve(node.size()); rule.reserve(node.size());
for (auto const& sym_node : node) for (auto const& sym_node : node)
{ {
#if defined(_MSC_VER) && _MSC_VER <= 1800
std::string const& name = sym_node.name();
if (name == "PointSymbolizer") {
parse_point_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "LinePatternSymbolizer") {
parse_line_pattern_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "PolygonPatternSymbolizer") {
parse_polygon_pattern_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "TextSymbolizer") {
parse_text_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "ShieldSymbolizer") {
parse_shield_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "LineSymbolizer") {
parse_line_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "PolygonSymbolizer") {
parse_polygon_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "BuildingSymbolizer") {
parse_building_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "RasterSymbolizer") {
parse_raster_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "MarkersSymbolizer") {
parse_markers_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "GroupSymbolizer") {
parse_group_symbolizer(rule, sym_node);
sym_node.set_processed(true);
} else if (name == "DebugSymbolizer") {
parse_debug_symbolizer(rule, sym_node);
sym_node.set_processed(true);
}
#else
switch (name2int(sym_node.name().c_str())) switch (name2int(sym_node.name().c_str()))
{ {
case name2int("PointSymbolizer"): case name2int("PointSymbolizer"):
@ -870,7 +830,6 @@ void map_parser::parse_symbolizers(rule & rule, xml_node const & node)
default: default:
break; break;
} }
#endif
} }
} }