[mapserver-commits] r13155 - in branches/branch-6-0: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Fri Feb 17 07:03:59 EST 2012
Author: schpidi
Date: 2012-02-17 04:03:58 -0800 (Fri, 17 Feb 2012)
New Revision: 13155
Modified:
branches/branch-6-0/mapserver/HISTORY.TXT
branches/branch-6-0/mapserver/mapwcs20.c
branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc.xml
branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc_bands.xml
branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_full.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_desc.xml
branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
Log:
Fixing WCS 2.0 axis order, offset vector, and origin (#4006, #4191)
Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/mapserver/HISTORY.TXT 2012-02-17 12:03:58 UTC (rev 13155)
@@ -15,6 +15,8 @@
Current Version (future 6.0.3, SVN branch-6-0):
---------------------------
+- Fixed WCS 2.0 axis order, offset vector, and origin (#4006, #4191)
+
- Fixed PHP MapScript opacity property of StyleObj no longer works (#3920)
- Added MS_CJC_* constants in PHP/MapScript (#4183)
Modified: branches/branch-6-0/mapserver/mapwcs20.c
===================================================================
--- branches/branch-6-0/mapserver/mapwcs20.c 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/mapserver/mapwcs20.c 2012-02-17 12:03:58 UTC (rev 13155)
@@ -44,6 +44,7 @@
#include "cpl_string.h"
#include <proj_api.h>
#include <string.h>
+#include "mapaxisorder.h"
#if defined(USE_LIBXML2)
@@ -1607,13 +1608,44 @@
}
/************************************************************************/
+/* msWCSSwapAxes20 */
+/* */
+/* Helper function to determine if a SRS mandates swapped axes. */
+/************************************************************************/
+
+static int msWCSSwapAxes20(char *srs_uri)
+{
+ int srid = 0, i;
+ /* get SRID from the srs uri */
+ if(srs_uri != NULL && strlen(srs_uri) > 0) {
+ if(sscanf(srs_uri, "http://www.opengis.net/def/crs/EPSG/0/%d", &srid) != EOF)
+ ;
+ else if(sscanf(srs_uri, "http://www.opengis.net/def/crs/%d", &srid) != EOF)
+ ;
+ else
+ srid = 0;
+ }
+ if (srid == 0)
+ return MS_FALSE;
+
+ /*check the static table*/
+ for (i=0; i<AXIS_ORIENTATION_TABLE_SIZE; i++)
+ {
+ if (axisOrientationEpsgCodes[i].code == srid)
+ return MS_TRUE;
+ }
+
+ return MS_FALSE;
+}
+
+/************************************************************************/
/* msWCSCommon20_CreateBoundedBy() */
/* */
/* Inserts the BoundedBy section into an existing DOM structure. */
/************************************************************************/
static void msWCSCommon20_CreateBoundedBy(layerObj *layer, wcs20coverageMetadataObjPtr cm,
- xmlNsPtr psGmlNs, xmlNodePtr psRoot, projectionObj *projection)
+ xmlNsPtr psGmlNs, xmlNodePtr psRoot, projectionObj *projection, int swapAxes)
{
xmlNodePtr psBoundedBy, psEnvelope;
char lowerCorner[100], upperCorner[100], axisLabels[100], uomLabels[100];
@@ -1626,20 +1658,42 @@
if(projection->proj != NULL && pj_is_latlong(projection->proj))
{
- strlcpy(axisLabels, "lat long", sizeof(axisLabels));
+ if (swapAxes == MS_FALSE)
+ {
+ strlcpy(axisLabels, "long lat", sizeof(axisLabels));
+ }
+ else
+ {
+ strlcpy(axisLabels, "lat long", sizeof(axisLabels));
+ }
strlcpy(uomLabels, "deg deg", sizeof(uomLabels));
}
else
{
- strlcpy(axisLabels, "x y", sizeof(axisLabels));
+ if (swapAxes == MS_FALSE)
+ {
+ strlcpy(axisLabels, "x y", sizeof(axisLabels));
+ }
+ else
+ {
+ strlcpy(axisLabels, "y x", sizeof(axisLabels));
+ }
strlcpy(uomLabels, "m m", sizeof(uomLabels));
}
xmlNewProp(psEnvelope, BAD_CAST "axisLabels", BAD_CAST axisLabels);
xmlNewProp(psEnvelope, BAD_CAST "uomLabels", BAD_CAST uomLabels);
xmlNewProp(psEnvelope, BAD_CAST "srsDimension", BAD_CAST "2");
- snprintf(lowerCorner, sizeof(lowerCorner), "%.15g %.15g", cm->extent.minx, cm->extent.miny);
- snprintf(upperCorner, sizeof(upperCorner), "%.15g %.15g", cm->extent.maxx, cm->extent.maxy);
+ if (swapAxes == MS_FALSE)
+ {
+ snprintf(lowerCorner, sizeof(lowerCorner), "%.15g %.15g", cm->extent.minx, cm->extent.miny);
+ snprintf(upperCorner, sizeof(upperCorner), "%.15g %.15g", cm->extent.maxx, cm->extent.maxy);
+ }
+ else
+ {
+ snprintf(lowerCorner, sizeof(lowerCorner), "%.15g %.15g", cm->extent.miny, cm->extent.minx);
+ snprintf(upperCorner, sizeof(upperCorner), "%.15g %.15g", cm->extent.maxy, cm->extent.maxx);
+ }
xmlNewChild(psEnvelope, psGmlNs, BAD_CAST "lowerCorner", BAD_CAST lowerCorner);
xmlNewChild(psEnvelope, psGmlNs, BAD_CAST "upperCorner", BAD_CAST upperCorner);
@@ -1654,7 +1708,7 @@
/************************************************************************/
static void msWCSCommon20_CreateDomainSet(layerObj* layer, wcs20coverageMetadataObjPtr cm,
- xmlNsPtr psGmlNs, xmlNodePtr psRoot, projectionObj *projection)
+ xmlNsPtr psGmlNs, xmlNodePtr psRoot, projectionObj *projection, int swapAxes)
{
xmlNodePtr psDomainSet, psGrid, psLimits, psGridEnvelope, psOrigin,
psPos, psOffsetX, psOffsetY;
@@ -1680,20 +1734,43 @@
}
}
- if(pj_is_latlong(projection->proj))
+
+
+ if(projection->proj != NULL && pj_is_latlong(projection->proj))
{
- strlcpy(axisLabels, "lat long", sizeof(axisLabels));
+ if (swapAxes == MS_FALSE)
+ {
+ strlcpy(axisLabels, "long lat", sizeof(axisLabels));
+ }
+ else
+ {
+ strlcpy(axisLabels, "lat long", sizeof(axisLabels));
+ }
}
else
{
- strlcpy(axisLabels, "x y", sizeof(axisLabels));
+ if (swapAxes == MS_FALSE)
+ {
+ strlcpy(axisLabels, "x y", sizeof(axisLabels));
+ }
+ else
+ {
+ strlcpy(axisLabels, "y x", sizeof(axisLabels));
+ }
}
-
+
xmlNewChild(psGrid, psGmlNs, BAD_CAST "axisLabels", BAD_CAST axisLabels);
-
+
psOrigin = xmlNewChild(psGrid, psGmlNs, BAD_CAST "origin", NULL);
{
- snprintf(point, sizeof(point), "%f %f", cm->extent.minx, cm->extent.miny);
+ if (swapAxes == MS_FALSE)
+ {
+ snprintf(point, sizeof(point), "%f %f", cm->extent.minx, cm->extent.maxy);
+ }
+ else
+ {
+ snprintf(point, sizeof(point), "%f %f", cm->extent.maxy, cm->extent.minx);
+ }
psOrigin = xmlNewChild(psOrigin, psGmlNs, BAD_CAST "Point", NULL);
snprintf(id, sizeof(id), "grid_origin_%s", layer->name);
xmlNewNsProp(psOrigin, psGmlNs, BAD_CAST "id", BAD_CAST id);
@@ -1702,10 +1779,18 @@
psPos = xmlNewChild(psOrigin, psGmlNs, BAD_CAST "pos", BAD_CAST point);
}
snprintf(resx, sizeof(resx), "%f 0", cm->xresolution);
- snprintf(resy, sizeof(resy), "0 %f", cm->yresolution);
- psOffsetX = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resx);
+ snprintf(resy, sizeof(resy), "0 %f", -fabs(cm->yresolution));
+ if (swapAxes == MS_FALSE)
+ {
+ psOffsetX = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resx);
+ psOffsetY = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resy);
+ }
+ else
+ {
+ psOffsetY = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resy);
+ psOffsetX = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resx);
+ }
xmlNewProp(psOffsetX, BAD_CAST "srsName", BAD_CAST cm->srs_uri);
- psOffsetY = xmlNewChild(psGrid, psGmlNs, BAD_CAST "offsetVector", BAD_CAST resy);
xmlNewProp(psOffsetY, BAD_CAST "srsName", BAD_CAST cm->srs_uri);
}
}
@@ -3052,7 +3137,7 @@
static int msWCSDescribeCoverage20_CoverageDescription(mapObj *map,
layerObj *layer, wcs20ParamsObjPtr params, xmlDocPtr psDoc, xmlNodePtr psRootNode )
{
- int status;
+ int status, swapAxes;
wcs20coverageMetadataObj cm;
xmlNodePtr psCD;
xmlNsPtr psWcsNs, psGmlNs, psGmlcovNs, psSweNs, psXLinkNs;
@@ -3080,6 +3165,8 @@
if(status != MS_SUCCESS)
return status;
+ swapAxes = msWCSSwapAxes20(cm.srs_uri);
+
/* fill in bands rangeset info, if required. */
/* msWCSSetDefaultBandsRangeSetInfo( NULL, &cm, layer ); */
@@ -3092,14 +3179,14 @@
/* -------------------------------------------------------------------- */
/* gml:boundedBy */
/* -------------------------------------------------------------------- */
- msWCSCommon20_CreateBoundedBy(layer, &cm, psGmlNs, psCD, &(layer->projection));
+ msWCSCommon20_CreateBoundedBy(layer, &cm, psGmlNs, psCD, &(layer->projection), swapAxes);
xmlNewChild(psCD, psWcsNs, BAD_CAST "CoverageId", BAD_CAST layer->name);
/* -------------------------------------------------------------------- */
/* gml:domainSet */
/* -------------------------------------------------------------------- */
- msWCSCommon20_CreateDomainSet(layer, &cm, psGmlNs, psCD, &(layer->projection));
+ msWCSCommon20_CreateDomainSet(layer, &cm, psGmlNs, psCD, &(layer->projection), swapAxes);
/* -------------------------------------------------------------------- */
/* gmlcov:rangeType */
@@ -3890,7 +3977,7 @@
char *srs_uri, *default_filename;
const char *filename;
char *file_ref;
- int length = 0;
+ int length = 0, swapAxes;
/* Create Document */
psDoc = xmlNewDoc(BAD_CAST "1.0");
@@ -3925,10 +4012,11 @@
tmpCm.extent.miny -= params->resolutionY * 0.5;
tmpCm.extent.maxy += params->resolutionY * 0.5;
+ swapAxes = msWCSSwapAxes20(cm.srs_uri);
/* Setup layer information */
- msWCSCommon20_CreateBoundedBy(layer, &tmpCm, psGmlNs, psRootNode, &(map->projection));
- msWCSCommon20_CreateDomainSet(layer, &tmpCm, psGmlNs, psRootNode, &(map->projection));
+ msWCSCommon20_CreateBoundedBy(layer, &tmpCm, psGmlNs, psRootNode, &(map->projection), swapAxes);
+ msWCSCommon20_CreateDomainSet(layer, &tmpCm, psGmlNs, psRootNode, &(map->projection), swapAxes);
psRangeSet = xmlNewChild(psRootNode, psGmlNs, BAD_CAST "rangeSet", NULL);
psFile = xmlNewChild(psRangeSet, psGmlNs, BAD_CAST "File", NULL);
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc.xml
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc.xml 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc.xml 2012-02-17 12:03:58 UTC (rev 13155)
@@ -19,11 +19,11 @@
<gml:axisLabels>x y</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
- <gml:pos>0.000000 0.000000</gml:pos>
+ <gml:pos>0.000000 300.000000</gml:pos>
</gml:Point>
</gml:origin>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 -10.000000</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc_bands.xml
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc_bands.xml 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_desc_bands.xml 2012-02-17 12:03:58 UTC (rev 13155)
@@ -3,8 +3,8 @@
<wcs:CoverageDescription gml:id="multi">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<wcs:CoverageId>multi</wcs:CoverageId>
@@ -19,11 +19,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
@@ -197,8 +197,8 @@
<wcs:CoverageDescription gml:id="multi_new">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<wcs:CoverageId>multi_new</wcs:CoverageId>
@@ -213,11 +213,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi_new" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -5,8 +5,8 @@
<gmlcov:RectifiedGridCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " gml:id="multi">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<gml:domainSet>
@@ -20,11 +20,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -5,8 +5,8 @@
<gmlcov:RectifiedGridCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " gml:id="multi_new">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<gml:domainSet>
@@ -20,11 +20,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi_new" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_full.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_full.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_full.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -20,11 +20,11 @@
<gml:axisLabels>x y</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
- <gml:pos>0.000000 0.000000</gml:pos>
+ <gml:pos>0.000000 300.000000</gml:pos>
</gml:Point>
</gml:origin>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 -10.000000</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -22,11 +22,11 @@
<gml:axisLabels>x y</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
- <gml:pos>0.000000 0.000000</gml:pos>
+ <gml:pos>0.000000 300.000000</gml:pos>
</gml:Point>
</gml:origin>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 -10.000000</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -5,8 +5,8 @@
<gmlcov:RectifiedGridCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " gml:id="multi">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<gml:domainSet>
@@ -20,11 +20,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -5,8 +5,8 @@
<gmlcov:RectifiedGridCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " gml:id="multi_new">
<gml:boundedBy>
<gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
- <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
- <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ <gml:lowerCorner>47.8188382 14.4702712</gml:lowerCorner>
+ <gml:upperCorner>49.8911432 18.0111282</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<gml:domainSet>
@@ -20,11 +20,11 @@
<gml:axisLabels>lat long</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_multi_new" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>14.470271 47.818838</gml:pos>
+ <gml:pos>49.891143 14.470271</gml:pos>
</gml:Point>
</gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_desc.xml
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_desc.xml 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_desc.xml 2012-02-17 12:03:58 UTC (rev 13155)
@@ -19,11 +19,11 @@
<gml:axisLabels>x y</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
- <gml:pos>0.000000 0.000000</gml:pos>
+ <gml:pos>0.000000 300.000000</gml:pos>
</gml:Point>
</gml:origin>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 -10.000000</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
Modified: branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
===================================================================
--- branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat 2012-02-15 19:05:59 UTC (rev 13154)
+++ branches/branch-6-0/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat 2012-02-17 12:03:58 UTC (rev 13155)
@@ -20,11 +20,11 @@
<gml:axisLabels>x y</gml:axisLabels>
<gml:origin>
<gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
- <gml:pos>0.000000 0.000000</gml:pos>
+ <gml:pos>0.000000 300.000000</gml:pos>
</gml:Point>
</gml:origin>
<gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
- <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 -10.000000</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
More information about the mapserver-commits
mailing list