[mapserver-commits] r11261 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-18 12:04:09 -0700 (Fri, 18 Mar 2011)
New Revision: 11261

Modified:
   trunk/mapserver/mapogcsld.c
Log:
remove deprecated method of drawing dashed lines with sld


Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2011-03-18 19:01:00 UTC (rev 11260)
+++ trunk/mapserver/mapogcsld.c	2011-03-18 19:04:09 UTC (rev 11261)
@@ -1780,112 +1780,8 @@
         return MS_SUCCESS;
 }
   
-/************************************************************************/
-/*                   int msSLDGetLineSymbol(mapObj *map)                */
-/*                                                                      */
-/*      Returns a symbol id for SLD_LINE_SYMBOL_NAME used for line      */
-/*      with. If the symbol does not exist, cretaes it an inmap         */
-/*      symbol.                                                         */
-/************************************************************************/
-int msSLDGetLineSymbol(mapObj *map)
-{
-    int nSymbolId = 0;
-    symbolObj *psSymbol = NULL;
 
-/* -------------------------------------------------------------------- */
-/*      If the symbol exists, return it. We will use the same           */
-/*      ellipse symbol for all the line width needs in the SLD.         */
-/* -------------------------------------------------------------------- */
-    nSymbolId = msGetSymbolIndex(&map->symbolset, SLD_LINE_SYMBOL_NAME, MS_FALSE);
-    if (nSymbolId >= 0)
-      return nSymbolId;
-
-    if( (psSymbol = msGrowSymbolSet(&(map->symbolset))) == NULL)
-        return 0; /* returns 0 for no symbol */
-
-    map->symbolset.numsymbols++;
-
- 
-/* -------------------------------------------------------------------- */
-/*      Create an ellipse symbol to be used for lines :                 */
-/*      NAME 'dashed'                                                   */
-/*          TYPE ELLIPSE                                                */
-/*        POINTS 1 1 END                                                */
-/*        FILLED true                                                   */
-/* -------------------------------------------------------------------- */
-    initSymbol(psSymbol);
-    psSymbol->inmapfile = MS_TRUE;
-
-    psSymbol->name = msStrdup(SLD_LINE_SYMBOL_NAME);
-    psSymbol->type = MS_SYMBOL_ELLIPSE;
-    psSymbol->filled = MS_TRUE;
-    psSymbol->points[psSymbol->numpoints].x = 1;
-    psSymbol->points[psSymbol->numpoints].y = 1;
-    psSymbol->sizex = 1;
-    psSymbol->sizey = 1; 
-    psSymbol->numpoints ++;
-
-    return  map->symbolset.numsymbols-1;
-}
-  
-
 /************************************************************************/
-/*       int msSLDGetDashLineSymbol(mapObj *map, char *pszDashArray)    */
-/*                                                                      */
-/*      Create a dash line inmap symbol.                                */
-/************************************************************************/
-int msSLDGetDashLineSymbol(mapObj *map, char *pszDashArray)
-{
-    symbolObj *psSymbol = NULL;
-    char **aszValues = NULL;
-    int nDash, i;
-
-
-    if( (psSymbol = msGrowSymbolSet(&(map->symbolset))) == NULL)
-        return 0; /* returns 0 for no symbol */
-
-    map->symbolset.numsymbols++;
-
- 
-/* -------------------------------------------------------------------- */
-/*      Create an ellipse symbol to be used for lines :                 */
-/*      NAME 'dashed'                                                   */
-/*          TYPE ELLIPSE                                                */
-/*        POINTS 1 1 END                                                */
-/*        FILLED true                                                   */
-/*        STYLE dashline value                                          */
-/* -------------------------------------------------------------------- */
-    initSymbol(psSymbol);
-    psSymbol->inmapfile = MS_TRUE;
-
-    psSymbol->name = msStrdup(SLD_LINE_SYMBOL_DASH_NAME);
-    psSymbol->type = MS_SYMBOL_ELLIPSE;
-    psSymbol->filled = MS_TRUE;
-    psSymbol->points[psSymbol->numpoints].x = 1;
-    psSymbol->points[psSymbol->numpoints].y = 1;
-    psSymbol->sizex = 1;
-    psSymbol->sizey = 1; 
-    psSymbol->numpoints++;
-
-    if (pszDashArray)
-    {
-        nDash = 0;
-        aszValues = msStringSplit(pszDashArray, ' ', &nDash);
-        if (nDash > 0)
-        {
-            psSymbol->patternlength = nDash;
-            for (i=0; i<nDash; i++)
-              psSymbol->pattern[i] = atoi(aszValues[i]);
-
-            msFreeCharArray(aszValues, nDash);
-        }
-    }
-    return  map->symbolset.numsymbols-1;
-}
-
-
-
-/************************************************************************/
 /*                            msSLDGetMarkSymbol                        */
 /*                                                                      */
 /*      Get a Mark symbol using the name. Mark symbols can be           */