[Geotools-commits] CVS: geotools/src/utils WMSExample.java,1.12,1.13 run-wmsdemo.sh,1.1,1.2

[Artur H. <ko...@us...>]

Update of /cvsroot/geotools/geotools/src/utils
In directory usw-pr-cvs1:/tmp/cvs-serv13012/utils

Modified Files:
	WMSExample.java run-wmsdemo.sh 
Log Message:
Added support for creating ImageLayer with InputStream as image data source and full support for downaloding map data from WMS with jprotocols package

Index: WMSExample.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/WMSExample.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** WMSExample.java	2001/11/20 17:01:45	1.12
--- WMSExample.java	2001/11/21 13:48:19	1.13
***************
*** 227,231 ****
        layerList.removeAll();
        for(int i = 0; i < ext_layers.size(); i++) {
!         deb(""+(i+1)+". Layer: "+ext_layers.get(i));
          layerList.add(((ExternalWMSLayer)ext_layers.get(i)).toString());
        }
--- 227,231 ----
        layerList.removeAll();
        for(int i = 0; i < ext_layers.size(); i++) {
!         //        deb(""+(i+1)+". Layer: "+ext_layers.get(i));
          layerList.add(((ExternalWMSLayer)ext_layers.get(i)).toString());
        }
***************
*** 358,362 ****
            imgType = imgType.substring(k+1);
          }
!         currentUrl = new URL(server_url+"?WMTVER=1.0&REQUEST=map&SRS=EPSG%3A4326&format="+imgType+"&BBOX="+b.x+","+b.y+","+(b.x+b.width)+","+(b.y+b.height)+"&WIDTH="+w+"&HEIGHT="+h+"&LAYERS="+layers);
          imgLayer.changeImage(currentUrl,b);
          if(th==null){
--- 358,364 ----
            imgType = imgType.substring(k+1);
          }
!         currentUrl = new URL(server_url+"?WMTVER=1.0&REQUEST=map&SRS=EPSG%3A4326&format="+
!                              imgType+"&BBOX="+b.x+","+b.y+","+(b.x+b.width)+","+
!                              (b.y+b.height)+"&WIDTH="+w+"&HEIGHT="+h+"&LAYERS="+layers);
          imgLayer.changeImage(currentUrl,b);
          if(th==null){
***************
*** 447,450 ****
--- 449,455 ----
   *
   * $Log$
+  * Revision 1.13  2001/11/21 13:48:19  kobit
+  * Added support for creating ImageLayer with InputStream as image data source and full support for downaloding map data from WMS with jprotocols package
+  *
   * Revision 1.12  2001/11/20 17:01:45  kobit
   * Added byte[] getContentData() support

Index: run-wmsdemo.sh
===================================================================
RCS file: /cvsroot/geotools/geotools/src/utils/run-wmsdemo.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** run-wmsdemo.sh	2001/11/18 15:55:43	1.1
--- run-wmsdemo.sh	2001/11/21 13:48:20	1.2
***************
*** 1,7 ****
  #!/bin/bash
  
! CLASSPATH=`echo jars/*.jar | tr ' ' ':'`
  
! export CLASSPATH=".:$CLASSPATH"
  
  echo "CLASSPATH=$CLASSPATH"
--- 1,7 ----
  #!/bin/bash
  
! CLASSPATH=`echo jars/*.jar | tr ' ' ';'`
  
! export CLASSPATH=".;$CLASSPATH"
  
  echo "CLASSPATH=$CLASSPATH"