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

finish updating marker tests - closes #1304

Browse source
This commit is contained in:
Dane Springmeyer 2012-07-12 19:21:04 -07:00
parent 34aa050521
commit 214b24ed12
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/load_map.cpp
View file

@ -991,7 +991,8 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& node)
optional<std::string> marker_type = node.get_opt_attr<std::string>("marker-type");
if (marker_type)
{
MAPNIK_LOG_ERROR(markers_symbolizer) << "'marker-type' is deprecated and will be removed in Mapnik 3.x, use file='shape://<type>' to specify known svg shapes";
// TODO - before Mapnik 2.1 release change this from WARN TO ERROR
MAPNIK_LOG_WARN(markers_symbolizer) << "'marker-type' is deprecated and will be removed in Mapnik 3.x, use file='shape://<type>' to specify known svg shapes";
// back compatibility with Mapnik 2.0.0
if (!marker_type->empty() && filename.empty())
{

11
tests/python_tests/object_test.py
View file

@ -127,15 +127,14 @@ def test_markersymbolizer_init():
p = mapnik.MarkersSymbolizer()
eq_(p.allow_overlap, False)
eq_(p.opacity,1)
eq_(p.filename,'')
eq_(p.marker_type,mapnik.marker_type.ARROW)
eq_(p.placement,mapnik.marker_placement.LINE_PLACEMENT)
eq_(p.fill,mapnik.Color(0,0,255))
eq_(p.filename,'shape://ellipse')
eq_(p.placement,mapnik.marker_placement.POINT_PLACEMENT)
eq_(p.fill,None)
eq_(p.ignore_placement,False)
eq_(p.spacing,100)
eq_(p.max_error,0.2)
eq_(str(p.width),'10.0')
eq_(str(p.height),'10.0')
eq_(p.width,None)
eq_(p.height,None)
p.width = mapnik.Expression('12')
p.height = mapnik.Expression('12')