Revision 188 trunk/libraries/libWMSv0/src/com/iver/wmsclient/wms_1_3_0/WMS_1_3_0.java

View differences:

WMS_1_3_0.java
9 9
import com.iver.wmsclient.WMSException;
10 10
import com.iver.wmsclient.WMSUtilities;
11 11
import com.iver.wmsclient.WMSVersionClient;
12
import com.iver.wmsclient.wms_1_3_0.capabilities.Format;
12 13
import com.iver.wmsclient.wms_1_3_0.capabilities.BoundingBox;
13 14
import com.iver.wmsclient.wms_1_3_0.capabilities.DCPType;
14 15
import com.iver.wmsclient.wms_1_3_0.capabilities.GetFeatureInfo;
......
64 65
                hostString += "?";
65 66
            }
66 67

  
67
            String request = "request=getCapabilities&VERSION=1.3.0";
68
            String request = "request=getCapabilities&VERSION=1.3.0&SERVICE=WMS";
68 69

  
69 70
            //String request = "REQUEST=GetCapabilities&SERVICE=wms";
70 71
            URL query = new URL(hostString + request);
......
261 262

  
262 263
        for (int i = 1; i < t.length; i++) {
263 264
            for (int j = 0; j < raiz.getLayerCount(); j++) {
265
            	if (raiz.getLayer(j).getName() == null) continue;
264 266
                if (raiz.getLayer(j).getName().equals(t[i])) {
265 267
                    raiz = raiz.getLayer(j);
266 268
                    ret.add(raiz);
......
320 322
    public String[] getInfoURLs() {
321 323
        return infoURLs;
322 324
    }
325

  
326
	/**
327
	 * @see com.iver.wmsclient.WMSClient#getInfoFormats()
328
	 */
329
	public String[] getInfoFormats() {
330
		Format[] formats = root.getCapability().getRequest().getGetFeatureInfo().getFormat();
331
		String[] ret = new String[formats.length];
332
		for (int i = 0; i < formats.length; i++) {
333
			ret[i] = formats[i].getContent();			
334
		}
335
		
336
		return ret;
337
	}
323 338
}

Also available in: Unified diff