Revision 188 trunk/libraries/libWMSv0/src/com/iver/wmsclient/wms_1_1_0/WMS_1_1_0.java

View differences:

WMS_1_1_0.java
11 11
import com.iver.wmsclient.WMSVersionClient;
12 12
import com.iver.wmsclient.wms_1_1_0.capabilities.BoundingBox;
13 13
import com.iver.wmsclient.wms_1_1_0.capabilities.DCPType;
14
import com.iver.wmsclient.wms_1_1_0.capabilities.Format;
14 15
import com.iver.wmsclient.wms_1_1_0.capabilities.GetFeatureInfo;
15 16
import com.iver.wmsclient.wms_1_1_0.capabilities.LatLonBoundingBox;
16 17
import com.iver.wmsclient.wms_1_1_0.capabilities.Layer;
......
65 66
                hostString += "?";
66 67
            }
67 68

  
68
            String request = "request=getCapabilities&WMTVER=1.1.0";
69
            String request = "request=getCapabilities&VERSION=1.1.0&SERVICE=WMS";
69 70

  
70 71
            //String request = "REQUEST=GetCapabilities&SERVICE=wms";
71 72
            URL query = new URL(hostString + request);
......
270 271

  
271 272
        for (int i = 1; i < t.length; i++) {
272 273
            for (int j = 0; j < raiz.getLayerCount(); j++) {
274
            	if (raiz.getLayer(j).getName() == null) continue;
273 275
                if (raiz.getLayer(j).getName().getContent().equals(t[i])) {
274 276
                    raiz = raiz.getLayer(j);
275 277
                    ret.add(raiz);
......
329 331
    public String[] getInfoURLs() {
330 332
        return infoURLs;
331 333
    }
334

  
335
	/**
336
	 * @see com.iver.wmsclient.WMSClient#getInfoFormats()
337
	 */
338
	public String[] getInfoFormats() {
339
		Format[] formats = root.getCapability().getRequest().getGetFeatureInfo().getFormat();
340
		String[] ret = new String[formats.length];
341
		for (int i = 0; i < formats.length; i++) {
342
			ret[i] = formats[i].getContent();			
343
		}
344
		
345
		return ret;
346
	}
332 347
}

Also available in: Unified diff