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

return without rendering if label placement algorithm returns false indicating a degenerate geometry - closes #1423 and refs #1424

Browse source
This commit is contained in:
Dane Springmeyer 2012-08-21 12:51:39 -07:00
parent ac313cf907
commit 0eff77c03e
6 changed files with 75 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/mapnik/grid/grid_marker_helpers.hpp
View file

@ -78,15 +78,17 @@ struct raster_markers_rasterizer_dispatch_grid
box2d<double> bbox_(0,0, src_.width(),src_.height()); box2d<double> bbox_(0,0, src_.width(),src_.height());
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y); matrix.translate(x,y);
@ -207,15 +209,17 @@ struct vector_markers_rasterizer_dispatch_grid
marker_placement_e placement_method = sym_.get_marker_placement(); marker_placement_e placement_method = sym_.get_marker_placement();
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y); matrix.translate(x,y);

24
include/mapnik/marker_helpers.hpp
View file

@ -87,15 +87,17 @@ struct vector_markers_rasterizer_dispatch
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y); matrix.translate(x,y);
@ -117,7 +119,9 @@ struct vector_markers_rasterizer_dispatch
sym_.get_spacing() * scale_factor_, sym_.get_spacing() * scale_factor_,
sym_.get_max_error(), sym_.get_max_error(),
sym_.get_allow_overlap()); sym_.get_allow_overlap());
double x, y, angle; double x = 0;
double y = 0;
double angle = 0;
while (placement.get_point(x, y, angle)) while (placement.get_point(x, y, angle))
{ {
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
@ -179,15 +183,17 @@ struct raster_markers_rasterizer_dispatch
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y); matrix.translate(x,y);

10
src/agg/process_point_symbolizer.cpp
View file

@ -77,9 +77,15 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
double y; double y;
double z=0; double z=0;
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); {
if (!label::centroid(geom, x, y))
return;
}
else else
label::interior_position(geom ,x, y); {
if (!label::interior_position(geom ,x, y))
return;
}
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);

30
src/cairo_renderer.cpp
View file

@ -1203,9 +1203,15 @@ void cairo_renderer_base::process(point_symbolizer const& sym,
double z = 0; double z = 0;
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); {
if (!label::centroid(geom, x, y))
return;
}
else else
label::interior_position(geom, x, y); {
if (!label::interior_position(geom ,x, y))
return;
}
prj_trans.backward(x, y, z); prj_trans.backward(x, y, z);
t_.forward(&x, &y); t_.forward(&x, &y);
@ -1490,15 +1496,17 @@ struct markers_dispatch
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
coord2d center = bbox_.center(); coord2d center = bbox_.center();
agg::trans_affine matrix = agg::trans_affine_translation(-center.x, -center.y); agg::trans_affine matrix = agg::trans_affine_translation(-center.x, -center.y);
@ -1571,15 +1579,17 @@ struct markers_dispatch_2
if (placement_method != MARKER_LINE_PLACEMENT) if (placement_method != MARKER_LINE_PLACEMENT)
{ {
double x,y; double x = 0;
path.rewind(0); double y = 0;
if (placement_method == MARKER_INTERIOR_PLACEMENT) if (placement_method == MARKER_INTERIOR_PLACEMENT)
{ {
label::interior_position(path, x, y); if (!label::interior_position(path, x, y))
return;
} }
else else
{ {
label::centroid(path, x, y); if (!label::centroid(path, x, y))
return;
} }
coord2d center = bbox_.center(); coord2d center = bbox_.center();
agg::trans_affine matrix = agg::trans_affine_translation(-center.x, -center.y); agg::trans_affine matrix = agg::trans_affine_translation(-center.x, -center.y);

10
src/grid/process_point_symbolizer.cpp
View file

@ -81,9 +81,15 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
double y; double y;
double z=0; double z=0;
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); {
if (!label::centroid(geom, x, y))
return;
}
else else
label::interior_position(geom, x, y); {
if (!label::interior_position(geom ,x, y))
return;
}
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);

18
src/symbolizer_helpers.cpp
View file

@ -233,25 +233,31 @@ void text_symbolizer_helper<FaceManagerT, DetectorT>::initialize_points()
} }
else else
{ {
// https://github.com/mapnik/mapnik/issues/1423
bool success = false;
// https://github.com/mapnik/mapnik/issues/1350
if (geom.type() == LineString) if (geom.type() == LineString)
{ {
label::middle_point(geom, label_x,label_y); success = label::middle_point(geom, label_x,label_y);
} }
else if (how_placed == POINT_PLACEMENT) else if (how_placed == POINT_PLACEMENT)
{ {
label::centroid(geom, label_x, label_y); success = label::centroid(geom, label_x, label_y);
} }
else if (how_placed == INTERIOR_PLACEMENT) else if (how_placed == INTERIOR_PLACEMENT)
{ {
label::interior_position(geom, label_x, label_y); success = label::interior_position(geom, label_x, label_y);
} }
else else
{ {
MAPNIK_LOG_ERROR(symbolizer_helpers) << "ERROR: Unknown placement type in initialize_points()"; MAPNIK_LOG_ERROR(symbolizer_helpers) << "ERROR: Unknown placement type in initialize_points()";
} }
prj_trans_.backward(label_x, label_y, z); if (success)
t_.forward(&label_x, &label_y); {
points_.push_back(std::make_pair(label_x, label_y)); prj_trans_.backward(label_x, label_y, z);
t_.forward(&label_x, &label_y);
points_.push_back(std::make_pair(label_x, label_y));
}
} }
} }
point_itr_ = points_.begin(); point_itr_ = points_.begin();