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

use 2 spaces identation in xml output

Browse source 
prefer c++11 range based loops for readability
This commit is contained in:
artemp 2014-07-18 21:05:25 +01:00
parent 93d40323c5
commit 8465a78c97
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/save_map.cpp
View file

@ -379,11 +379,8 @@ void serialize_rule( ptree & style_node, const rule & r, bool explicit_defaults)
std::for_each( begin, end , boost::apply_visitor( serializer )); std::for_each( begin, end , boost::apply_visitor( serializer ));
} }
void serialize_style( ptree & map_node, Map::const_style_iterator style_it, bool explicit_defaults ) void serialize_style( ptree & map_node, std::string const& name, feature_type_style const& style, bool explicit_defaults )
{ {
feature_type_style const& style = style_it->second;
std::string const& name = style_it->first;
ptree & style_node = map_node.push_back( ptree & style_node = map_node.push_back(
ptree::value_type("Style", ptree()))->second; ptree::value_type("Style", ptree()))->second;
@ -668,17 +665,14 @@ void serialize_map(ptree & pt, Map const & map, bool explicit_defaults)
serialize_parameters( map_node, map.get_extra_parameters()); serialize_parameters( map_node, map.get_extra_parameters());
Map::const_style_iterator it = map.styles().begin(); for ( auto const& kv : map.styles())
Map::const_style_iterator end = map.styles().end();
for (; it != end; ++it)
{ {
serialize_style( map_node, it, explicit_defaults); serialize_style( map_node, kv.first, kv.second, explicit_defaults);
} }
std::vector<layer> const & layers = map.layers(); for (auto const& layer : map.layers())
for (unsigned i = 0; i < layers.size(); ++i )
{ {
serialize_layer( map_node, layers[i], explicit_defaults ); serialize_layer( map_node, layer, explicit_defaults );
} }
} }
@ -686,7 +680,7 @@ void save_map(Map const & map, std::string const& filename, bool explicit_defaul
{ {
ptree pt; ptree pt;
serialize_map(pt,map,explicit_defaults); serialize_map(pt,map,explicit_defaults);
write_xml(filename,pt,std::locale(),boost::property_tree::xml_writer_make_settings(' ',4)); write_xml(filename,pt,std::locale(),boost::property_tree::xml_writer_make_settings(' ', 2));
} }
std::string save_map_to_string(Map const & map, bool explicit_defaults) std::string save_map_to_string(Map const & map, bool explicit_defaults)
@ -694,7 +688,7 @@ std::string save_map_to_string(Map const & map, bool explicit_defaults)
ptree pt; ptree pt;
serialize_map(pt,map,explicit_defaults); serialize_map(pt,map,explicit_defaults);
std::ostringstream ss; std::ostringstream ss;
write_xml(ss,pt,boost::property_tree::xml_writer_make_settings(' ',4)); write_xml(ss,pt,boost::property_tree::xml_writer_make_settings(' ', 2));
return ss.str(); return ss.str();
} }