Revision 38579

View differences:

branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wms/WMSServiceInformation.java
64 64 
    public String fax;
65 65 
    public String email;
66 66 
    public Vector formats;
67 
    public Vector infoformats;
67 68 

  		




  68
  69
  
    
    public WMSServiceInformation()


  		




  69
  70
  
    
    {


  		




  ......




  87
  88
  
    
        phone = new String();


  		




  88
  89
  
    
        fax = new String();


  		




  89
  90
  
    
        email = new String();


  		




  90
  
  
    
        formats = new Vector();       


  		




  
  91
  
    
        formats = new Vector(); 


  		




  
  92
  
    
        infoformats = new Vector();


  		




  91
  93
  
    
    }


  		




  92
  94
  
    
    


  		




  93
  95
  
    
    public boolean isQueryable()


  		




  ......




  127
  129
  
    
        phone = new String();


  		




  128
  130
  
    
        fax = new String();


  		




  129
  131
  
    
        email = new String();


  		




  130
  
  
    
        formats = new Vector();        


  		




  
  132
  
    
        formats = new Vector();  


  		




  
  133
  
    
        infoformats = new Vector();


  		




  131
  134
  
    
    }      


  		




  132
  135
  
    
    


  		




  133
  136
  
    
	/* (non-Javadoc)


  		












  

    
      branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wms/WMSClient.java
    
  





  179
  179
  
    
        return ((WMSServiceInformation)handler.getServiceInformation()).formats;         


  		




  180
  180
  
    
    } 


  		




  181
  181
  
    
    


  		




  
  182
  
    
    /**


  		




  
  183
  
    
     * <p>Gets the information by point formats available in the Service</p>


  		




  
  184
  
    
     * @return a vector with all the available formats


  		




  
  185
  
    
     */


  		




  
  186
  
    
    public Vector getInfoFormats() {        


  		




  
  187
  
    
        return ((WMSServiceInformation)handler.getServiceInformation()).infoformats;


  		




  
  188
  
    
    } 


  		




  
  189
  
    
    


  		




  182
  190
  
    
    public boolean isQueryable()


  		




  183
  191
  
    
    {


  		




  184
  192
  
    
    	return ((WMSServiceInformation)handler.getServiceInformation()).isQueryable();  


  		












  

    
      branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wms/wms_1_1_0/request/WMSGetFeatureInfoRequest1_1_0.java
    
  





  56
  56
  
    
		req.append(onlineResource);


  		




  57
  57
  
    
		req.append("REQUEST=GetFeatureInfo&SERVICE=WMS&");


  		




  58
  58
  
    
		req.append("QUERY_LAYERS=").append(Utilities.Vector2CS(status.getLayerNames()));


  		




  59
  
  
    
		req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=application/vnd.ogc.gml&");


  		




  
  59
  
    
		//req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=application/vnd.ogc.gml&");


  		




  
  60
  
    
		req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=" + status.getInfoFormat() + "&");


  		




  60
  61
  
    
		req.append(getPartialQuery(status)).append("&x="+ x + "&y=" + y);


  		




  61
  62
  
    
		//this parameter sets the max number of features per layer to be returned.


  		




  62
  63
  
    
		//we set it to avoid the bug in mapserver that takes this number like max number of total features.


  		












  

    
      branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wms/WMSProtocolHandler.java
    
  





  612
  612
  
    
				case KXmlParser.START_TAG:


  		




  613
  613
  
    
					if (parser.getName().compareTo(CapabilitiesTags.FORMAT)==0)


  		




  614
  614
  
    
					{


  		




  615
  
  
    
						//TODO:


  		




  616
  
  
    
						// add the supported formats by the GetFeatureInfo request


  		




  617
  
  
    
						//serviceInfo.formats.add(parser.nextText());


  		




  
  615
  
    
						serviceInfo.infoformats.add(parser.nextText());


  		




  618
  616
  
    
					}	


  		




  619
  617
  
    
					else if (parser.getName().compareTo(CapabilitiesTags.DCPTYPE)==0)


  		




  620
  618
  
    
					{			


  		












  

    
      branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wms/wms_1_3_0/request/WMSGetFeatureInfoRequest1_1_3.java
    
  





  56
  56
  
    
		req.append(onlineResource);


  		




  57
  57
  
    
		req.append("REQUEST=GetFeatureInfo&SERVICE=WMS&");


  		




  58
  58
  
    
		req.append("QUERY_LAYERS=").append(Utilities.Vector2CS(status.getLayerNames())); 


  		




  59
  
  
    
		req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=application/vnd.ogc.gml&");


  		




  
  59
  
    
		//req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=application/vnd.ogc.gml&");


  		




  
  60
  
    
		req.append("&VERSION=").append(protocolHandler.getVersion()).append("&INFO_FORMAT=" + status.getInfoFormat() + "&");


  		




  60
  61
  
    
		req.append(getPartialQuery(status)).append("&I="+ x + "&J=" + y);


  		




  61
  62
  
    
		req.append("&FEATURE_COUNT=10000");


  		




  62
  63
  
    
		req.append("&EXCEPTIONS=" + getExceptionsFormat());


  		












Also available in:  Unified diff