Revision 3325 org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.remoteclient/src/main/java/org/gvsig/remoteclient/wms/wms_1_3_0/request/WMSGetMapRequest1_1_3.java

View differences:

WMSGetMapRequest1_1_3.java
26 26

  
27 27
import java.util.Vector;
28 28

  
29
import org.gvsig.remoteclient.epsg.CrsAxisOrder;
30
import org.gvsig.remoteclient.utils.BoundaryBox;
29 31
import org.gvsig.remoteclient.utils.CapabilitiesTags;
30 32
import org.gvsig.remoteclient.utils.Utilities;
31 33
import org.gvsig.remoteclient.wms.WMSProtocolHandler;
......
47 49
	 * @see org.gvsig.remoteclient.wms.request.WMSRequest#getPartialQuery(org.gvsig.remoteclient.wms.WMSStatus)
48 50
	 */
49 51
	protected String getPartialQuery(WMSStatus status){
50
		
51
		double coord1 = status.getExtent().getMinX();
52
		double coord2 = status.getExtent().getMinY();
53
		double coord3 = status.getExtent().getMaxX();
54
		double coord4 = status.getExtent().getMaxY();
55
		
56
		//Cambio de coordenadas para coordenadas no proyectadas establecido en la v1.3.0 del protocolo WMS
57
		if(!status.isProjected() && !status.getSrs().equals("CRS:84")) {
52
		double coord1, coord2, coord3, coord4;
53
		String epsgCode = status.getSrs();
54
		if (status.isXyAxisOrder() || CrsAxisOrder.isXyAxisOrder(epsgCode)) { 
55
			coord1 = status.getExtent().getMinX();
56
			coord2 = status.getExtent().getMinY();
57
			coord3 = status.getExtent().getMaxX();
58
			coord4 = status.getExtent().getMaxY();
59
		}
60
		else {
61
    		// use reverse coordinate order as defined by EPSG registry
58 62
			coord1 = status.getExtent().getMinY();
59 63
			coord2 = status.getExtent().getMinX();
60 64
			coord3 = status.getExtent().getMaxY();

Also available in: Unified diff