[mapserver-commits] r11331 - in trunk: mapserver msautotest/wxs msautotest/wxs/expected

[svn at osgeo.org]

Author: schpidi
Date: 2011-03-24 08:36:55 -0700 (Thu, 24 Mar 2011)
New Revision: 11331

Removed:
   trunk/msautotest/wxs/expected/wcs_20_post_get_trim_x_both.tif
Modified:
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwcs20.c
   trunk/msautotest/wxs/expected/wcs_20_desc.xml
   trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat
   trunk/msautotest/wxs/expected/wcs_20_getcov_full.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
   trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_average.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_bilinear.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_nearest.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_reproj.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_reproj_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_reproj_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_full.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_size.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_full.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_resolution.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_max.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_min.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_y_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_both.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_max.tif
   trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_min.tif
   trunk/msautotest/wxs/expected/wcs_20_post_desc.xml
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_average.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_bilinear.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_nearest.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_full.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_size.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_full.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_resolution.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_trim_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_max.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_min.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_y_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_both.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_max.tif
   trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_min.tif
   trunk/msautotest/wxs/expected/wcs_describe.xml
   trunk/msautotest/wxs/expected/wcs_simple.png
   trunk/msautotest/wxs/wcs_multi.map
   trunk/msautotest/wxs/wcs_post.map
   trunk/msautotest/wxs/wcs_simple.map
Log:
Correcting imagemode error messages.
Adjusting WCS tests to imagemode BYTE.


Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/mapserver/mapwcs.c	2011-03-24 15:36:55 UTC (rev 11331)
@@ -2244,7 +2244,7 @@
       else if( EQUAL(value,"BYTE") )
         cm->imagemode = MS_IMAGEMODE_BYTE;
       else {
-        msSetError( MS_WCSERR, "Content of wcs|ows_imagemode (%s) not recognised.  Should be one of PC256 (byte), INT16 or FLOAT32.", "msWCSGetCoverageMetadata()", value );
+        msSetError( MS_WCSERR, "Content of wcs|ows_imagemode (%s) not recognised.  Should be one of BYTE, INT16 or FLOAT32.", "msWCSGetCoverageMetadata()", value );
         return MS_FAILURE;
       }
     }

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/mapserver/mapwcs20.c	2011-03-24 15:36:55 UTC (rev 11331)
@@ -2241,7 +2241,7 @@
                 cm->imagemode = MS_IMAGEMODE_BYTE;
             else
             {
-                msSetError( MS_WCSERR, "Content of wcs|ows_imagemode (%s) not recognised.  Should be one of PC256 (byte), INT16 or FLOAT32.", "msWCSGetCoverageMetadata()", value );
+                msSetError( MS_WCSERR, "Content of wcs|ows_imagemode (%s) not recognised.  Should be one of BYTE, INT16 or FLOAT32.", "msWCSGetCoverageMetadata()", value );
                 return MS_FAILURE;
             }
         }

Modified: trunk/msautotest/wxs/expected/wcs_20_desc.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_desc.xml	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_20_desc.xml	2011-03-24 15:36:55 UTC (rev 11331)
@@ -33,7 +33,7 @@
             <swe:uom code="W.m-2.Sr-1"/>
             <swe:constraint>
               <swe:AllowedValues>
-                <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+                <swe:interval>0 255</swe:interval>
               </swe:AllowedValues>
             </swe:constraint>
           </swe:Quantity>

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_full.dat	2011-03-24 15:36:55 UTC (rev 11331)
@@ -42,7 +42,7 @@
           <swe:uom code="W.m-2.Sr-1"/>
           <swe:constraint>
             <swe:AllowedValues>
-              <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+              <swe:interval>0 255</swe:interval>
             </swe:AllowedValues>
           </swe:constraint>
         </swe:Quantity>
@@ -57,6 +57,6 @@
 Content-ID: coverage/out.tif
 Content-Disposition: attachment; filename=out.tif
 
-II*      
 
   (   

 
      
 
      
 
   
   
 
   
   
 
   §
  
 
   
   
 
      
 
   `	  
 
   æ   
 
   î   
 
   
   (
 
      S
 
      ƒ    ö   ‚„    
  ¯‡     >
  ±‡ )   ~
      H   
   H   
         $@      $@                                             Àr@        
 
       
 
 
  
 
 ±‡!   
±‡ !   
 Ž#   
 c  
 )#UTM Zone 11, Northern Hemisphere|WGS 84| k { „ s „ „ Œ „ „ „ k „ k „ „ k { s œ ” k „ k s c { c J s R s s k { { c { { s s s „ k { ” s ¥ s Œ k { { c „ { „ „ „ c œ { Œ s s s c k „ k s k c Z s s k { c s { s „ Œ „ { s Œ k Œ s „ { k „ „ s s k s k { k „ Z „ { c k c s Z c s k s Z { c { { ” „ { { s „ „ { s { s { k s ” k s Œ s „ c k k k s „ s œ s s s k s c { Z k c k s „ œ „ Œ „ „ s s s { ” { ¥ { „ k k „ œ { s c k c { c s s c k s Z s Z c s k { k c ½ ­ ­ ” ” s ” { k „ s „ œ c { s „ „ Î k s c Z k { c s { Z c c c c { k s k k { „ Å ­ ” Œ Œ „ c „ { s Œ „ „ c „ { „ ­ { s s c k „ k { c k k c s c c Z c s Z s Œ s ” { ” 
 s ” { Œ { k s „ s k s c { c µ c k { k c „ c c s Z { s k s s „ k „ s s ” Œ { s „ s { „ s „ „ { { „ c s c { „ s s k „ c s c J { s Z s k s k s s Œ k { { { c Œ Œ c Œ c s { k „ k s k s { „ { k { „ „ Œ „ k s k s c s „ k Œ „ k s s k „ „ s Œ „ „ „ { c „ { k ” c s { Œ ­ { k { { { k s „ k s { k ” s { { c { c „ Œ c Œ { { s { { { k Œ { { s s Z k ­ k k k k c „ { s s { k c { c „ { „ ” { Z Œ k { { Œ s { „ ­ ” c { { k { c k ½ ­ k s s k c Œ k ­ Œ Z { k „ s s „ s „ { s s { k Œ „ s ¥ „ Œ ” „ „ k { c c s c „ c Œ s ” { c „ { ” Œ s „ s c { k k „ „ „ c s { s { ” ” { s k Œ k Œ Z k s k Z c { s s s { { ” s ” c „ { Œ „ œ „ k c k k ” ” { Œ Œ { s s ” µ ÷ ¥ ” œ { k k k s Œ c s c c k s „ s Z { s { { „ k { œ œ œ { { Z k { k k „ œ µ œ Î ½ ­ Œ Œ ¥ s „ Z c s Z c c k c „ c k „ „ œ Œ s Œ Z s { s k s Œ k s s „ ­ ÿ ÷ Î Ö œ µ Œ ­ { „ c s { J s c { Œ œ „ ¥ Œ Œ c k k s k k Œ ­ ” ¥ Œ s ¥ µ Œ œ Å Þ ÷ Ö Ö ­ ÷ ÿ Î „ k Œ { ” „ ¥ ¥ ” Œ „ { k { k { R c c Z ” µ Å ­ µ Å œ ¥ µ Å Þ Ö æ æ Î ¥ µ µ œ ” œ œ œ µ „ ” s „ k k k k k s
  c k Z s c c ¥ Å Ö Î ­ Þ ­ Œ ­ µ µ Þ µ ­ Œ ” œ µ ¥ µ ” ¥ µ „ { s Z c s Z k c „ c Z c k c c { œ ½ Å Î µ Å æ œ ” Å ­ ¥ œ ” Œ ­ Å Î Î Î Å k { „ ­ ” { { k c œ „ R k k k c c k ¥ ¥ Å ­ ÿ ­ Å Å ­ œ œ ¥ ¥ ” ” Œ Œ Å Þ æ Ö æ ÿ Þ ï ” ” Þ œ „ ¥ µ Z c Œ Œ k c R s s œ ½ Î ï Þ Þ Þ ½ ÿ Œ œ ¥ ­ œ ¥ ” ÿ ÿ ÿ ÿ ÿ ½ Þ ÿ Î ÿ æ ¥ ­ { Z Œ Œ ” ­ Ö { k { Œ ­ ¥ ­ Ö Å ½ Ö Þ ï ” Œ µ ­ ­ Œ ­ ÿ ÿ ÿ ÿ ÿ ­ ÿ Ö ÿ ÿ µ ¥ œ Î æ Å ­ Œ œ Œ Œ Œ c „ ” œ Œ ­ œ æ Å Ö æ „ { ” ½ µ µ ­ ÿ ÿ ÿ ÿ ÿ { ï Î ÿ ÿ ÿ ­ Œ { ­ ¥ ” ¥ œ œ „ Œ s R Œ { ­ „ ” ” Å ï Ö œ ” ” œ { Œ s Î Þ ï ÿ Þ { Î ÿ ÿ ÿ ÿ ½ ¥ „ ¥ „ Œ œ ¥ { ” ” { Z c ” ” Œ ” µ œ Î ÿ ” æ ¥ œ Œ ­ „ ½ ï Î Å ÿ ÿ ÿ ÿ ÿ ÿ ÿ ÿ µ „ ­ „ œ Œ Œ ” Œ „ œ c ” { „ Œ œ ¥ ¥ œ ¥ Å Ö ï ” ¥ Œ œ ÿ ÿ ÿ ÿ ­ µ ÿ ÿ ÿ ÿ ÷ ¥ Î ¥ µ ” s ” ¥ „ „ ” µ k s œ Œ „ Œ { { Œ „ Œ ­ ­ Œ „ „ „ Ö ÿ ÿ Ö ” ” ÿ ÿ ï Œ µ ” ” Œ Œ Œ ” œ „ œ œ Œ Å ” Œ „ ” ” œ „ „ ” Œ Œ ” œ œ Ö s k 
+II*      
 
   (   

 
      
 
      
 
   
   
 
   
   
 
   §
  
 
   
   
 
      
 
   °  
 
   æ   
 
   î   
 
   
   (
 
      S
 
   
   ƒ    ö   ‚„    
  ¯‡     >
  ±‡ )   ~
      H   
   H   
         $@      $@                                             Àr@        
 
       
 
 
  
 
 ±‡!   
±‡ !   
 Ž#   
 c  
 )#UTM Zone 11, Northern Hemisphere|WGS 84| k{„s„„Œ„„„k„k„„k{sœ”k„ksc{cJsRssk{{c{{sss„k{”s¥sŒk{{c„{„„„cœ{Œsssck„kskcZssk{cs{s„Œ„{sŒkŒs„{k„„ssksk{k„Z„{ckcsZcsksZ{c{{”„{{s„„{s{s{ks”ksŒs„ckkks„sœsssksc{Zkcks„œ„Œ„„sss{”{¥{„kk„œ{sckc{csscksZsZcsk{kc½­­””s”{k„s„œc{s„„ÎkscZk{cs{Zcccc{kskk{„Å­”ŒŒ„c„{sŒ„„c„{„­{ssck„k{ckkcsccZcsZsŒs”{”s”{Œ{ks„sksc{cµck{kc„ccsZ{skss„k„ss”Œ{s„s{„s„„{{„csc{„ssk„cscJ{sZskskssŒk{{{cŒŒcŒcs{k„ksks{„{k{„„Œ„kskscs„kŒ„kssk„„sŒ„„„{c„{k”cs{Œ­{k{{{ks„ks{k”s{{c{c„ŒcŒ{{s{{{kŒ{{ssZk­kkkkc„{ss{kc{c„{„”{ZŒk{{Œs{„­”c{{k{ck½­ksskcŒk­ŒZ{k„ss„s„{ss{kŒ„s¥„Œ”„„k{ccsc„cŒs”{c„{”Œs„sc{kk„„„cs{s{””{skŒkŒZks
 kZc{sss{{”s”c„{Œ„œ„kckk””{ŒŒ{ss”µ÷¥”œ{kkksŒcsccks„sZ{s{{„k{œœœ{{Zk{kk„œµœÎ½­ŒŒ¥s„ZcsZcckc„ck„„œŒsŒZs{sksŒkss„­ÿ÷ÎÖœµŒ­{„cs{Jsc{Œœ„¥ŒŒckkskkŒ­”¥Œs¥µŒœÅÞ÷ÖÖ­÷ÿ΄kŒ{”„¥¥”Œ„{k{k{RccZ”µÅ­µÅœ¥µÅÞÖææÎ¥µµœ”œœœµ„”s„kkkkksckZscc¥ÅÖέޭŒ­µµÞµ­Œ”œµ¥µ”¥µ„{sZcsZkc„cZckcc{œ½ÅεÅ朔ŭ¥œ”Œ­ÅÎÎÎÅk{„­”{{kcœ„Rkkkcck¥¥Å­ÿ­ÅÅ­œœ¥¥””ŒŒÅÞæÖæÿÞï””Þœ„¥µZcŒŒkcRssœ½ÎïÞÞÞ½ÿŒœ¥­œ¥”ÿÿÿÿÿ½ÞÿÎÿ業{ZŒŒ”­Ö{k{Œ­¥­ÖŽÖÞµ­­Œ­ÿÿÿÿÿ­ÿÖÿÿµ¥œÎæÅ­ŒœŒŒŒc„”œŒ­œæÅÖæ„{”½µµ­ÿÿÿÿÿ{ïÎÿÿÿ­Œ{­¥”¥œœ„ŒsRŒ{­„””ÅïÖœ””œ{ŒsÎÞïÿÞ{Îÿÿÿÿ½¥„¥„Œœ¥{””{Zc””Œ”µœÎÿ”楜Œ­„½ïÎÅÿÿÿÿÿÿÿÿµ„­„œŒŒ”Œ„œc”{„Œœ¥¥œ¥ÅÖŒœÿÿÿÿ­µÿÿÿÿ÷¥Î¥µ”s”¥„„”µksœŒ„Œ{{Œ„Œ­­Œ„„„ÖÿÿÖ””ÿÿ””ŒŒŒ”œ„œœŒÅ”Œ„””œ„„”ŒŒ”œœÖsk
 --wcs--
 

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_full.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat	2011-03-24 15:36:55 UTC (rev 11331)
@@ -44,7 +44,7 @@
           <swe:uom code="W.m-2.Sr-1"/>
           <swe:constraint>
             <swe:AllowedValues>
-              <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+              <swe:interval>0 255</swe:interval>
             </swe:AllowedValues>
           </swe:constraint>
         </swe:Quantity>

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_imageCRS_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_average.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_bilinear.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_interpolation_nearest.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_origCRS_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_reproj.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_reproj_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_reproj_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_full.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_size.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_full.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_resolution.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_max.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_min.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_x_y_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_max.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_getcov_trim_y_min.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_desc.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_desc.xml	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_20_post_desc.xml	2011-03-24 15:36:55 UTC (rev 11331)
@@ -33,7 +33,7 @@
             <swe:uom code="W.m-2.Sr-1"/>
             <swe:constraint>
               <swe:AllowedValues>
-                <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+                <swe:interval>0 255</swe:interval>
               </swe:AllowedValues>
             </swe:constraint>
           </swe:Quantity>

Deleted: trunk/msautotest/wxs/expected/wcs_20_post_get_trim_x_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_20_post_getcov_full_multipart.dat	2011-03-24 15:36:55 UTC (rev 11331)
@@ -42,7 +42,7 @@
           <swe:uom code="W.m-2.Sr-1"/>
           <swe:constraint>
             <swe:AllowedValues>
-              <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+              <swe:interval>0 255</swe:interval>
             </swe:AllowedValues>
           </swe:constraint>
         </swe:Quantity>
@@ -57,6 +57,6 @@
 Content-ID: coverage/out.tif
 Content-Disposition: attachment; filename=out.tif
 
-II*      
 
   (   

 
      
 
      
 
   
   
 
   
   
 
   §
  
 
   
   
 
      
 
   `	  
 
   æ   
 
   î   
 
   
   (
 
      S
 
      ƒ    ö   ‚„    
  ¯‡     >
  ±‡ )   ~
      H   
   H   
         $@      $@                                             Àr@        
 
       
 
 
  
 
 ±‡!   
±‡ !   
 Ž#   
 c  
 )#UTM Zone 11, Northern Hemisphere|WGS 84| k { „ s „ „ Œ „ „ „ k „ k „ „ k { s œ ” k „ k s c { c J s R s s k { { c { { s s s „ k { ” s ¥ s Œ k { { c „ { „ „ „ c œ { Œ s s s c k „ k s k c Z s s k { c s { s „ Œ „ { s Œ k Œ s „ { k „ „ s s k s k { k „ Z „ { c k c s Z c s k s Z { c { { ” „ { { s „ „ { s { s { k s ” k s Œ s „ c k k k s „ s œ s s s k s c { Z k c k s „ œ „ Œ „ „ s s s { ” { ¥ { „ k k „ œ { s c k c { c s s c k s Z s Z c s k { k c ½ ­ ­ ” ” s ” { k „ s „ œ c { s „ „ Î k s c Z k { c s { Z c c c c { k s k k { „ Å ­ ” Œ Œ „ c „ { s Œ „ „ c „ { „ ­ { s s c k „ k { c k k c s c c Z c s Z s Œ s ” { ” 
 s ” { Œ { k s „ s k s c { c µ c k { k c „ c c s Z { s k s s „ k „ s s ” Œ { s „ s { „ s „ „ { { „ c s c { „ s s k „ c s c J { s Z s k s k s s Œ k { { { c Œ Œ c Œ c s { k „ k s k s { „ { k { „ „ Œ „ k s k s c s „ k Œ „ k s s k „ „ s Œ „ „ „ { c „ { k ” c s { Œ ­ { k { { { k s „ k s { k ” s { { c { c „ Œ c Œ { { s { { { k Œ { { s s Z k ­ k k k k c „ { s s { k c { c „ { „ ” { Z Œ k { { Œ s { „ ­ ” c { { k { c k ½ ­ k s s k c Œ k ­ Œ Z { k „ s s „ s „ { s s { k Œ „ s ¥ „ Œ ” „ „ k { c c s c „ c Œ s ” { c „ { ” Œ s „ s c { k k „ „ „ c s { s { ” ” { s k Œ k Œ Z k s k Z c { s s s { { ” s ” c „ { Œ „ œ „ k c k k ” ” { Œ Œ { s s ” µ ÷ ¥ ” œ { k k k s Œ c s c c k s „ s Z { s { { „ k { œ œ œ { { Z k { k k „ œ µ œ Î ½ ­ Œ Œ ¥ s „ Z c s Z c c k c „ c k „ „ œ Œ s Œ Z s { s k s Œ k s s „ ­ ÿ ÷ Î Ö œ µ Œ ­ { „ c s { J s c { Œ œ „ ¥ Œ Œ c k k s k k Œ ­ ” ¥ Œ s ¥ µ Œ œ Å Þ ÷ Ö Ö ­ ÷ ÿ Î „ k Œ { ” „ ¥ ¥ ” Œ „ { k { k { R c c Z ” µ Å ­ µ Å œ ¥ µ Å Þ Ö æ æ Î ¥ µ µ œ ” œ œ œ µ „ ” s „ k k k k k s
  c k Z s c c ¥ Å Ö Î ­ Þ ­ Œ ­ µ µ Þ µ ­ Œ ” œ µ ¥ µ ” ¥ µ „ { s Z c s Z k c „ c Z c k c c { œ ½ Å Î µ Å æ œ ” Å ­ ¥ œ ” Œ ­ Å Î Î Î Å k { „ ­ ” { { k c œ „ R k k k c c k ¥ ¥ Å ­ ÿ ­ Å Å ­ œ œ ¥ ¥ ” ” Œ Œ Å Þ æ Ö æ ÿ Þ ï ” ” Þ œ „ ¥ µ Z c Œ Œ k c R s s œ ½ Î ï Þ Þ Þ ½ ÿ Œ œ ¥ ­ œ ¥ ” ÿ ÿ ÿ ÿ ÿ ½ Þ ÿ Î ÿ æ ¥ ­ { Z Œ Œ ” ­ Ö { k { Œ ­ ¥ ­ Ö Å ½ Ö Þ ï ” Œ µ ­ ­ Œ ­ ÿ ÿ ÿ ÿ ÿ ­ ÿ Ö ÿ ÿ µ ¥ œ Î æ Å ­ Œ œ Œ Œ Œ c „ ” œ Œ ­ œ æ Å Ö æ „ { ” ½ µ µ ­ ÿ ÿ ÿ ÿ ÿ { ï Î ÿ ÿ ÿ ­ Œ { ­ ¥ ” ¥ œ œ „ Œ s R Œ { ­ „ ” ” Å ï Ö œ ” ” œ { Œ s Î Þ ï ÿ Þ { Î ÿ ÿ ÿ ÿ ½ ¥ „ ¥ „ Œ œ ¥ { ” ” { Z c ” ” Œ ” µ œ Î ÿ ” æ ¥ œ Œ ­ „ ½ ï Î Å ÿ ÿ ÿ ÿ ÿ ÿ ÿ ÿ µ „ ­ „ œ Œ Œ ” Œ „ œ c ” { „ Œ œ ¥ ¥ œ ¥ Å Ö ï ” ¥ Œ œ ÿ ÿ ÿ ÿ ­ µ ÿ ÿ ÿ ÿ ÷ ¥ Î ¥ µ ” s ” ¥ „ „ ” µ k s œ Œ „ Œ { { Œ „ Œ ­ ­ Œ „ „ „ Ö ÿ ÿ Ö ” ” ÿ ÿ ï Œ µ ” ” Œ Œ Œ ” œ „ œ œ Œ Å ” Œ „ ” ” œ „ „ ” Œ Œ ” œ œ Ö s k 
+II*      
 
   (   

 
      
 
      
 
   
   
 
   
   
 
   §
  
 
   
   
 
      
 
   °  
 
   æ   
 
   î   
 
   
   (
 
      S
 
   
   ƒ    ö   ‚„    
  ¯‡     >
  ±‡ )   ~
      H   
   H   
         $@      $@                                             Àr@        
 
       
 
 
  
 
 ±‡!   
±‡ !   
 Ž#   
 c  
 )#UTM Zone 11, Northern Hemisphere|WGS 84| k{„s„„Œ„„„k„k„„k{sœ”k„ksc{cJsRssk{{c{{sss„k{”s¥sŒk{{c„{„„„cœ{Œsssck„kskcZssk{cs{s„Œ„{sŒkŒs„{k„„ssksk{k„Z„{ckcsZcsksZ{c{{”„{{s„„{s{s{ks”ksŒs„ckkks„sœsssksc{Zkcks„œ„Œ„„sss{”{¥{„kk„œ{sckc{csscksZsZcsk{kc½­­””s”{k„s„œc{s„„ÎkscZk{cs{Zcccc{kskk{„Å­”ŒŒ„c„{sŒ„„c„{„­{ssck„k{ckkcsccZcsZsŒs”{”s”{Œ{ks„sksc{cµck{kc„ccsZ{skss„k„ss”Œ{s„s{„s„„{{„csc{„ssk„cscJ{sZskskssŒk{{{cŒŒcŒcs{k„ksks{„{k{„„Œ„kskscs„kŒ„kssk„„sŒ„„„{c„{k”cs{Œ­{k{{{ks„ks{k”s{{c{c„ŒcŒ{{s{{{kŒ{{ssZk­kkkkc„{ss{kc{c„{„”{ZŒk{{Œs{„­”c{{k{ck½­ksskcŒk­ŒZ{k„ss„s„{ss{kŒ„s¥„Œ”„„k{ccsc„cŒs”{c„{”Œs„sc{kk„„„cs{s{””{skŒkŒZks
 kZc{sss{{”s”c„{Œ„œ„kckk””{ŒŒ{ss”µ÷¥”œ{kkksŒcsccks„sZ{s{{„k{œœœ{{Zk{kk„œµœÎ½­ŒŒ¥s„ZcsZcckc„ck„„œŒsŒZs{sksŒkss„­ÿ÷ÎÖœµŒ­{„cs{Jsc{Œœ„¥ŒŒckkskkŒ­”¥Œs¥µŒœÅÞ÷ÖÖ­÷ÿ΄kŒ{”„¥¥”Œ„{k{k{RccZ”µÅ­µÅœ¥µÅÞÖææÎ¥µµœ”œœœµ„”s„kkkkksckZscc¥ÅÖέޭŒ­µµÞµ­Œ”œµ¥µ”¥µ„{sZcsZkc„cZckcc{œ½ÅεÅ朔ŭ¥œ”Œ­ÅÎÎÎÅk{„­”{{kcœ„Rkkkcck¥¥Å­ÿ­ÅÅ­œœ¥¥””ŒŒÅÞæÖæÿÞï””Þœ„¥µZcŒŒkcRssœ½ÎïÞÞÞ½ÿŒœ¥­œ¥”ÿÿÿÿÿ½ÞÿÎÿ業{ZŒŒ”­Ö{k{Œ­¥­ÖŽÖÞµ­­Œ­ÿÿÿÿÿ­ÿÖÿÿµ¥œÎæÅ­ŒœŒŒŒc„”œŒ­œæÅÖæ„{”½µµ­ÿÿÿÿÿ{ïÎÿÿÿ­Œ{­¥”¥œœ„ŒsRŒ{­„””ÅïÖœ””œ{ŒsÎÞïÿÞ{Îÿÿÿÿ½¥„¥„Œœ¥{””{Zc””Œ”µœÎÿ”楜Œ­„½ïÎÅÿÿÿÿÿÿÿÿµ„­„œŒŒ”Œ„œc”{„Œœ¥¥œ¥ÅÖŒœÿÿÿÿ­µÿÿÿÿ÷¥Î¥µ”s”¥„„”µksœŒ„Œ{{Œ„Œ­­Œ„„„ÖÿÿÖ””ÿÿ””ŒŒŒ”œ„œœŒÅ”Œ„””œ„„”ŒŒ”œœÖsk
 --wcs--
 

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_imageCRS_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_average.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_bilinear.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_interpolation_nearest.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_origCRS_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_reproj_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_full.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_size.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_resolution_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_full.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_resolution.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_scaling_size_trim_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_max.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_min.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_x_y_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_both.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_max.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_20_post_getcov_trim_y_min.tif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_describe.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_describe.xml	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/expected/wcs_describe.xml	2011-03-24 15:36:55 UTC (rev 11331)
@@ -73,7 +73,7 @@
       <nativeCRSs>EPSG:32611</nativeCRSs>
     </supportedCRSs>
     <supportedFormats nativeFormat="GeoTIFF">
-      <formats>GEOTIFF_16</formats>
+      <formats>GEOTIFF_BYTE</formats>
       <formats>PNG</formats>
       <formats>AAIGRID</formats>
     </supportedFormats>

Modified: trunk/msautotest/wxs/expected/wcs_simple.png
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/wcs_multi.map
===================================================================
--- trunk/msautotest/wxs/wcs_multi.map	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/wcs_multi.map	2011-03-24 15:36:55 UTC (rev 11331)
@@ -97,8 +97,8 @@
    "wcs_rangeset_label" "Bands"
    "wcs_rangeset_description" "Bands for Landsat 5 TM"
    "wcs_rangeset_nullvalue" "-99"
+   "wcs_imagemode" "BYTE"
   END
 END
 
-
 END

Modified: trunk/msautotest/wxs/wcs_post.map
===================================================================
--- trunk/msautotest/wxs/wcs_post.map	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/wcs_post.map	2011-03-24 15:36:55 UTC (rev 11331)
@@ -137,10 +137,10 @@
 SHAPEPATH "data"
 
 OUTPUTFORMAT
-  NAME GEOTIFF_16
+  NAME GEOTIFF_BYTE
   DRIVER "GDAL/GTiff"
   MIMETYPE "image/tiff"
-  IMAGEMODE INT16
+  IMAGEMODE BYTE
   EXTENSION "tif"
 END
 OUTPUTFORMAT
@@ -220,7 +220,7 @@
    "ows_srs"	"EPSG:32611 EPSG:4326"
    "wcs_resolution" "10 10"
    "wcs_bandcount" "1"
-   "wcs_formats" "GEOTIFF_16 GDPNG AAIGRID"
+   "wcs_formats" "GEOTIFF_BYTE GDPNG AAIGRID"
    "wcs_nativeformat" "GeoTIFF"
    "wcs_description" "Test description"
    "wcs_metadatalink_href" "http://www.gdal.org/metadata_test_link.html"
@@ -233,6 +233,7 @@
    "wcs_rangeset_label" "Bands"
    "wcs_rangeset_description" "Bands for Landsat 5 TM"
    "wcs_rangeset_nullvalue" "-99"
+   "wcs_imagemode" "BYTE"
   END
 END
 

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2011-03-24 13:52:55 UTC (rev 11330)
+++ trunk/msautotest/wxs/wcs_simple.map	2011-03-24 15:36:55 UTC (rev 11331)
@@ -225,10 +225,10 @@
 SHAPEPATH "data"
 
 OUTPUTFORMAT
-  NAME GEOTIFF_16
+  NAME GEOTIFF_BYTE
   DRIVER "GDAL/GTiff"
   MIMETYPE "image/tiff"
-  IMAGEMODE INT16
+  IMAGEMODE BYTE
   EXTENSION "tif"
 END
 OUTPUTFORMAT
@@ -302,7 +302,7 @@
    "ows_srs"	"EPSG:32611 EPSG:4326"
    "wcs_resolution" "10 10"
    "wcs_bandcount" "1"
-   "wcs_formats" "GEOTIFF_16 PNG AAIGRID"
+   "wcs_formats" "GEOTIFF_BYTE PNG AAIGRID"
    "wcs_nativeformat" "GeoTIFF"
    "wcs_description" "Test description"
    "wcs_metadatalink_href" "http://www.gdal.org/metadata_test_link.html"
@@ -315,6 +315,7 @@
    "wcs_rangeset_label" "Bands"
    "wcs_rangeset_description" "Bands for Landsat 5 TM"
    "wcs_rangeset_nullvalue" "-99"
+   "wcs_imagemode" "BYTE"
   END
 END