[mapserver-commits] r10104 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-04-15 07:53:05 -0400 (Thu, 15 Apr 2010)
New Revision: 10104

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgraticule.c
Log:
remove drawing of unnecessary grid lines (#3433)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-04-13 20:37:53 UTC (rev 10103)
+++ trunk/mapserver/HISTORY.TXT	2010-04-15 11:53:05 UTC (rev 10104)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Grid layer: remove drawing of unnecessary gird lines (#3433) 
+
 - Avoid errors and debug output for CONNECTION-less OGR layers in mappool.c
   if they have a tileindex.
 

Modified: trunk/mapserver/mapgraticule.c
===================================================================
--- trunk/mapserver/mapgraticule.c	2010-04-13 20:37:53 UTC (rev 10103)
+++ trunk/mapserver/mapgraticule.c	2010-04-15 11:53:05 UTC (rev 10104)
@@ -373,6 +373,8 @@
       }
             
       pInfo->ilabelstate = 0;
+
+      pInfo->dwhichlongitude      += pInfo->dincrementlongitude;
       break;
 
     default:
@@ -380,7 +382,7 @@
       break;
     }
       
-  } else {
+  } else { /*horizontal*/
     int iPointIndex;
     double dArcDelta = (pInfo->dendlongitude - pInfo->dstartlongitude) / (double) shape->line->numpoints;
     double dArcPosition   = pInfo->dstartlongitude + dArcDelta;
@@ -456,6 +458,7 @@
       }
             
       pInfo->ilabelstate    = 0;
+      pInfo->dwhichlatitude += pInfo->dincrementlatitude;
       break;
 
     default:
@@ -464,24 +467,18 @@
     }
   }
 
-  /*
+ /*
    * Increment and move to next arc
    */
-  pInfo->dwhichlatitude += pInfo->dincrementlatitude;
-
-  if(pInfo->dwhichlatitude > pInfo->dendlatitude) {
-    pInfo->dwhichlatitude   = pInfo->dstartlatitude;
-    pInfo->dwhichlongitude      += pInfo->dincrementlongitude;
-
-    if( pInfo->dwhichlongitude > pInfo->dendlongitude && pInfo->bvertical == 0 )
-      return MS_DONE;
-    else if( pInfo->dwhichlongitude > pInfo->dendlongitude ) {
+ 
+  if( pInfo->bvertical && pInfo->dwhichlongitude > pInfo->dendlongitude )   {
       pInfo->dwhichlatitude   = pInfo->dstartlatitude;
-      pInfo->dwhichlongitude   = pInfo->dstartlongitude;
       pInfo->bvertical   = 0;
-    }
   }
 
+  if (pInfo->dwhichlatitude >  pInfo->dendlatitude)
+    return MS_DONE;
+
   return MS_SUCCESS;
 }