Changeset 2172

Timestamp:

Jun 18, 2003, 6:39:52 AM (21 years ago)

Author:

sdlime

Message:

Tweaked code in legend builder to handle polygon layers slightly different. Now if a polygon layer contains only outlines and no fills (i.e. a polyline) then it is drawn using the zigzag legend shape rather than the box. I'll add legend outlines back in shortly.

File:

• trunk/mapserver/maplegend.c (modified) (3 diffs)

trunk/mapserver/maplegend.c

@@ -10 +10 @@
 int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *class, int width, int height, gdImagePtr img, int dstX, int dstY)
 {
-  int i;
+  int i, type;
   shapeObj box, zigzag;
   pointObj marker;
@@ -64 +64 @@
   box.line[0].numpoints = 5;
   
+  type = lp->type;
+
+  // some polygon layers may be better drawn using zigzag if there is no fill
+  if(type == MS_LAYER_POLYGON) {
+    type = MS_LAYER_LINE;
+    for(i=0; i<class->numstyles; i++) {
+      if(MS_VALID_COLOR(class->styles[i].color)) { // there is a fill
+        type = MS_LAYER_POLYGON;
+        break;
+      }
+    }
+  }
+
   /* 
   ** now draw the appropriate color/symbol/size combination 
   */      
-  switch(lp->type) {
+  switch(type) {
   case MS_LAYER_ANNOTATION:
   case MS_LAYER_POINT:
@@ -81 +94 @@
   case MS_LAYER_POLYGON:
     for(i=0; i<class->numstyles; i++) { // TO DO: it may not be this easy
-      if(MS_VALID_COLOR(class->styles[0].color))
+      if(MS_VALID_COLOR(class->styles[i].color))
         msDrawShadeSymbolGD(&map->symbolset, img, &box, &(class->styles[i]), 1.0);
       else