Permalink
Browse files

Revert "fix order of wms <Style> element in capabilities (#4529)"

This reverts commit b6abf97.
  • Loading branch information...
1 parent 3191642 commit 9ee9dd1a3a41463df2501a5e4dc69a4c8768b72c @tbonfort tbonfort committed Dec 18, 2012
Showing with 5 additions and 7 deletions.
  1. +5 −7 mapwms.c
View
@@ -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 */
@@ -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);

0 comments on commit 9ee9dd1

Please sign in to comment.