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

further tests of path expressions for shields

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-07 23:29:43 -07:00
parent 3019787b30
commit 65438f17aa
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/text/symbolizer_helpers.cpp
View file

@ -304,8 +304,6 @@ void text_symbolizer_helper::init_marker()
if (filename.empty()) return;
boost::optional<mapnik::marker_ptr> marker = marker_cache::instance().find(filename, true);
if (!marker) return;
//FIXME - need to test this
//std::string filename = path_processor_type::evaluate(filename_string, feature_);
agg::trans_affine trans;
auto image_transform = get_optional<transform_type>(sym_, keys::image_transform);
if (image_transform) evaluate_transform(trans, feature_, vars_, *image_transform);

24
tests/visual_tests/styles/simple-shield.xml
View file

@ -7,24 +7,24 @@
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
lat,long,name,nr,color,file-token
0,0,Test one,1,#ff0000
0,0.1,Test two,2,red
0,0.2,Test three,3,#00ff00
0,0.3,Test four,4,green
0,0.4,Test five,5,#0000ff
0,0.5,Test six,6,blue
0,0.6,Test seven,7,#000000
0,0.7,Test eight,8,black
0,0.8,Test nine,9,#ffffff
0,0.9,Test ten,10,white
lat,long,name,nr,color,type,empty-string
0,0,Test one,1,#ff0000,svg,
0,0.1,Test two,2,red,svg,
0,0.2,Test three,3,#00ff00,svg,
0,0.3,Test four,4,green,svg,
0,0.4,Test five,5,#0000ff,svg,
0,0.5,Test six,6,blue,svg,
0,0.6,Test seven,7,#000000,svg,
0,0.7,Test eight,8,black,svg,
0,0.8,Test nine,9,#ffffff,svg,
0,0.9,Test ten,10,white,svg,
</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" file="../../data/svg/[file-token]crosshair16x16.svg" horizontal-alignment="middle" vertical-alignment="middle" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</ShieldSymbolizer>
<ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" file="../../data/[type]/[empty-string]crosshair16x16.svg" horizontal-alignment="middle" vertical-alignment="middle" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</ShieldSymbolizer>
<PointSymbolizer allow-overlap="true"/>
</Rule>
</Style>