[mapserver-commits] r10105 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-04-15 08:17:13 -0400 (Thu, 15 Apr 2010)
New Revision: 10105

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapgraticule.c
Log:
remove drawing of unnecessary gird lines (#3433)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-15 11:53:05 UTC (rev 10104)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-15 12:17:13 UTC (rev 10105)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
  
+- Grid layer: remove drawing of unnecessary gird lines (#3433) 
+
 - OGC Filters for spatial dbs should be enclosed in parentheses (#3430)
 
 - Improve the handling of simple string comparisons for raster classified

Modified: branches/branch-5-6/mapserver/mapgraticule.c
===================================================================
--- branches/branch-5-6/mapserver/mapgraticule.c	2010-04-15 11:53:05 UTC (rev 10104)
+++ branches/branch-5-6/mapserver/mapgraticule.c	2010-04-15 12:17:13 UTC (rev 10105)
@@ -373,6 +373,7 @@
       }
             
       pInfo->ilabelstate = 0;
+      pInfo->dwhichlongitude      += pInfo->dincrementlongitude;
       break;
 
     default:
@@ -456,6 +457,7 @@
       }
             
       pInfo->ilabelstate    = 0;
+      pInfo->dwhichlatitude += pInfo->dincrementlatitude;
       break;
 
     default:
@@ -467,21 +469,17 @@
   /*
    * 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;
 }