Skip to content

Commit

Permalink
Revert "fix order of wms <Style> element in capabilities (MapServer#4529
Browse files Browse the repository at this point in the history
)"

This reverts commit b6abf97.
  • Loading branch information
tbonfort committed Dec 18, 2012
1 parent 882e41e commit e46bdde
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions mapwms.c
Expand Up @@ -2275,13 +2275,6 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
"xlink:type=\"simple\" xlink:href=\"%s\"/>\n ",
MS_FALSE, MS_FALSE, MS_FALSE, MS_TRUE, MS_TRUE,
NULL, NULL, NULL, NULL, NULL, " ");

/* print Min/Max ScaleDenominator */
if (nVersion < OWS_1_3_0)
msWMSPrintScaleHint(" ", lp->minscaledenom, lp->maxscaledenom, map->resolution);
else
msWMSPrintScaleDenominator(" ", lp->minscaledenom, lp->maxscaledenom);


/* The LegendURL reside in a style. The Web Map Context spec already */
/* included the support on this in mapserver. However, it is not in the */
Expand Down Expand Up @@ -2558,6 +2551,11 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_

msFree(pszMetadataName);

if (nVersion < OWS_1_3_0)
msWMSPrintScaleHint(" ", lp->minscaledenom, lp->maxscaledenom, map->resolution);
else
msWMSPrintScaleDenominator(" ", lp->minscaledenom, lp->maxscaledenom);

if ( grouplayer == MS_FALSE )
msIO_printf("%s </Layer>\n", indent);

Expand Down

0 comments on commit e46bdde

Please sign in to comment.