avoid throwing if Mapnik 2.1 style <Parameters> is encountered in XML

This commit is contained in:
Dane Springmeyer 2012-07-04 11:19:51 -07:00
parent 3b44a88c44
commit 57a3836c50
2 changed files with 6 additions and 0 deletions

View file

@ -13,6 +13,8 @@ For a complete change history, see the SVN log.
Mapnik 2.0.2
------------
- XML: Fixed to avoid throwing if a `<Parameters>` element is encountered (which is supported in >= 2.1.x)
- Support for PostGIS 2.0 in the pgsql2sqlite command (e69c44e/47e5b3c)
- Fixed reference counting of Py_None when returning null attributes from Postgres during UTFGrid encoding, which could cause a Fatal Python error: deallocating None (#1221)

View file

@ -389,6 +389,10 @@ void map_parser::parse_map_include( Map & map, ptree const & include )
}
datasource_templates_[name] = params;
}
else if (v.first == "Parameters")
{
// do not throw in order to support Mapnik 2.1.x stylesheets
}
else if (v.first != "<xmlcomment>" &&
v.first != "<xmlattr>")
{