[mapserver-commits] r12511 - in trunk: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Fri Sep 2 08:49:20 EDT 2011
Author: schpidi
Date: 2011-09-02 05:49:20 -0700 (Fri, 02 Sep 2011)
New Revision: 12511
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/mapwcs20.c
trunk/msautotest/wxs/expected/wcs_20_desc.xml
trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml
trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat
trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat
trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
trunk/msautotest/wxs/expected/wcs_20_post_bands_name.dat
trunk/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
trunk/msautotest/wxs/expected/wcs_20_post_desc.xml
trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
Log:
WCS 2.0: Adjusting offset vector and origin (#4006).
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/mapserver/HISTORY.TXT 2011-09-02 12:49:20 UTC (rev 12511)
@@ -15,6 +15,8 @@
Current Version (SVN trunk, 6.1-dev, future 6.2):
-------------------------------------------------
+- WCS 2.0: Adjusted offset vector and origin (#4006)
+
- Added addParameter() method to MapScript (#3973)
- Changed msDrawVectorLayer() not to cache shapes if attribute binding is present after the first style (#3976)
Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/mapserver/mapwcs20.c 2011-09-02 12:49:20 UTC (rev 12511)
@@ -1693,7 +1693,7 @@
psOrigin = xmlNewChild(psGrid, psGmlNs, BAD_CAST "origin", NULL);
{
- snprintf(point, sizeof(point), "%f %f", cm->extent.minx, cm->extent.miny);
+ snprintf(point, sizeof(point), "%f %f", cm->extent.minx, cm->extent.maxy);
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,7 +1702,7 @@
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);
+ snprintf(resy, sizeof(resy), "0 %f", -fabs(cm->yresolution));
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);
Modified: trunk/msautotest/wxs/expected/wcs_20_desc.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_desc.xml 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_desc.xml 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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: trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gmlcov:rangeType>
Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
@@ -42,7 +42,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
@@ -59,7 +59,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
@@ -76,7 +76,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_bands_name_new.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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: trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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: trunk/msautotest/wxs/expected/wcs_20_post_bands_name.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_bands_name.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_post_bands_name.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
@@ -42,7 +42,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
@@ -59,7 +59,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
@@ -76,7 +76,7 @@
<swe:description>Test description</swe:description>
<swe:nilValues>
<swe:NilValues>
- <swe:nilValue reason="">-99</swe:nilValue>
+ <swe:nilValue reason="">0</swe:nilValue>
</swe:NilValues>
</swe:nilValues>
<swe:uom code="W.m-2.Sr-1"/>
Modified: trunk/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_post_bands_name_new.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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>14.470271 49.891143</gml:pos>
</gml:Point>
</gml:origin>
<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:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 -0.033972</gml:offsetVector>
</gml:RectifiedGrid>
</gml:domainSet>
<gml:rangeSet>
Modified: trunk/msautotest/wxs/expected/wcs_20_post_desc.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_desc.xml 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_post_desc.xml 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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: trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat 2011-09-01 16:29:20 UTC (rev 12510)
+++ trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat 2011-09-02 12:49:20 UTC (rev 12511)
@@ -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