Skip to content

Commit

Permalink
Fix ScaleDenominator print order for 4529
Browse files Browse the repository at this point in the history
  • Loading branch information
jlarouche committed Dec 18, 2012
1 parent 03cfd10 commit 1c17b3f
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions mapwms.c
Expand Up @@ -3203,12 +3203,6 @@ int msWMSGetCapabilities(mapObj *map, int nVersion, cgiRequestObj *req, owsReque
MS_FALSE, MS_FALSE, MS_FALSE, MS_TRUE, MS_TRUE,
NULL, NULL, NULL, NULL, NULL, " ");

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

if (map->name && strlen(map->name) > 0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") ) {
char *pszEncodedName = NULL;
const char *styleName = NULL;
Expand Down Expand Up @@ -3308,6 +3302,13 @@ int msWMSGetCapabilities(mapObj *map, int nVersion, cgiRequestObj *req, owsReque
msIO_fprintf(stdout, " </Style>\n");
msFree(pszEncodedName);
msFree(pszEncodedStyleName);

/* Prints ScaleDenominator */
if (nVersion < OWS_1_3_0)
msWMSPrintScaleHint(" ", map->web.minscaledenom, map->web.maxscaledenom,
map->resolution);
else
msWMSPrintScaleDenominator(" ", map->web.minscaledenom, map->web.maxscaledenom);
}

/* */
Expand Down

0 comments on commit 1c17b3f

Please sign in to comment.