Permalink
Browse files

Legend icons do not reflect geometry transformations (#4642)

Conflicts:

	maplegend.c
  • Loading branch information...
1 parent 40d2372 commit 529b8ceb210a7ab0eae5c35801acd6227cc105eb @szekerest szekerest committed May 1, 2013
Showing with 10 additions and 2 deletions.
  1. +10 −2 maplegend.c
View
@@ -258,7 +258,11 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
if((lp->maxscaledenom > 0) && (map->scaledenom > lp->maxscaledenom)) continue;
if((lp->minscaledenom > 0) && (map->scaledenom <= lp->minscaledenom)) continue;
}
- msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
+ if (theclass->styles[i]->_geomtransform.type != MS_GEOMTRANSFORM_NONE)
+ msDrawTransformedShape(map, &map->symbolset, image_draw, &zigzag,
+ theclass->styles[i], lp->scalefactor);
+ else
+ msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
}
free(zigzag.line[0].point);
@@ -274,7 +278,11 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
if((lp->maxscaledenom > 0) && (map->scaledenom > lp->maxscaledenom)) continue;
if((lp->minscaledenom > 0) && (map->scaledenom <= lp->minscaledenom)) continue;
}
- msDrawShadeSymbol(&map->symbolset, image_draw, &box, theclass->styles[i], lp->scalefactor);
+ if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE)
+ msDrawShadeSymbol(&map->symbolset, image_draw, &box, theclass->styles[i], lp->scalefactor);
+ else
+ msDrawTransformedShape(map, &map->symbolset, image_draw, &box,
+ theclass->styles[i], lp->scalefactor);
}
break;
default:

0 comments on commit 529b8ce

Please sign in to comment.