[mapserver-commits] r11620 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-04-27 09:18:45 -0700 (Wed, 27 Apr 2011)
New Revision: 11620

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maplabel.c
Log:
Fixed mindsitance label test to check layer indexes. (#3851)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-27 15:23:07 UTC (rev 11619)
+++ trunk/mapserver/HISTORY.TXT	2011-04-27 16:18:45 UTC (rev 11620)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Fixed mindsitance label test to check layer indexes. (#3851)
+
 - Fixed segmentation fault in PHP/MapScript and improved the php object method calls (#3730)
 
 - Fix build issue related to unnecessary use of gdal-config --dep-libs (#3316)

Modified: trunk/mapserver/maplabel.c
===================================================================
--- trunk/mapserver/maplabel.c	2011-04-27 15:23:07 UTC (rev 11619)
+++ trunk/mapserver/maplabel.c	2011-04-27 16:18:45 UTC (rev 11620)
@@ -499,7 +499,10 @@
             if(cacheslot->labels[i].status == MS_TRUE) { /* compare bounding polygons and check for duplicates */
                 /* We add the label_size to the mindistance value when comparing because we do want the mindistance 
                    value between the labels and not only from point to point. */
-                if(label_size > 0 && (mindistance != -1) && (cachePtr->classindex == cacheslot->labels[i].classindex) && (strcmp(cachePtr->text,cacheslot->labels[i].text) == 0) && (msDistancePointToPoint(&(cachePtr->point), &(cacheslot->labels[i].point)) <= (mindistance + label_size))) { /* label is a duplicate */
+                if(label_size > 0 && (mindistance != -1) && 
+                   (cachePtr->layerindex == cacheslot->labels[i].layerindex) && (cachePtr->classindex == cacheslot->labels[i].classindex) && 
+                   (strcmp(cachePtr->text,cacheslot->labels[i].text) == 0) &&
+                   (msDistancePointToPoint(&(cachePtr->point), &(cacheslot->labels[i].point)) <= (mindistance + label_size))) { /* label is a duplicate */
                     cachePtr->status = MS_FALSE;
                     return;
                 }