/ - Diff - Application: gvSIG desktop - gvSIG

      */
     public abstract class WMTSTileMatrix extends WMTSBaseStruct {
         private double                  scaleDenominator             = 0;
         private Rectangle2D             bboxTileMatrixSet            = null;
         private double[]                topLeftCorner                = null;
         private int                     tileWidth                    = 0;
         private int                     tileHeight                   = 0;
-...
         private long                    matrixHeight                 = 0;
         private static final double     MTS_X_GRADO                  = 111319.490793274;
         protected boolean               forceLongitudeFirstAxisOrder = false;
         private double                  epsilon                      = 1e-6;
     	/**
     	 * Sets longitude first in the axis order read from the capabilities file
-...
     	public void setForceLongitudeFirstAxisOrder(boolean force) {
     		this.forceLongitudeFirstAxisOrder = force;
+    	}
     	public void setBBoxTileMatrixSet(Rectangle2D bbox) {
     		if(bboxTileMatrixSet == null)
     			this.bboxTileMatrixSet = bbox;
+    	}
     	public Rectangle2D getBBoxTileMatrixSet() {
     		return bboxTileMatrixSet;
+    	}
         public class Tile {
         	public int       wPx, hPx;
-...
+        }
         /**
          * Gets the width in meters of a tile
          * @param projected
          * Gets the width in world coordinates of a tile
          * @return
          */
         public double getWidthMtsTile(boolean projected) {
         public double getWidthWCTile(boolean projected) {
         	double pixelSpan = 0;
         	if(!projected) {
         		return (scaleDenominator * tileWidth * 0.28) / (MTS_X_GRADO * 1000);
         		if(getBBoxTileMatrixSet() != null)
         			return getBBoxTileMatrixSet().getWidth() / matrixWidth;
         		else {
         			pixelSpan = (scaleDenominator * 0.00028) / MTS_X_GRADO;
+        		}
         	} else {
         		return (scaleDenominator * tileWidth * 0.28) / 1000;
         		pixelSpan = scaleDenominator * 0.00028;
+        	}
         	double w = pixelSpan * tileWidth;
     		if(((w - ((int)w)) > (1 - epsilon) || (w - ((int)w)) < epsilon))
     			return Math.round(w);
     		return w;
+        }
         /**
          * Gets the height in meters of a tile
          * @param projected
          * Gets the height in world coordinates of a tile
          * @return
          */
         public double getHeightMtsTile(boolean projected) {
         public double getHeightWCTile(boolean projected) {
         	double pixelSpan = 0;
         	if(!projected) {
         		double coord = (scaleDenominator * tileHeight * 0.28) / (MTS_X_GRADO * 1000);
         		if(coord > 0.99 || coord < 0.005)
         			return Math.round(coord);
         		return coord;
         		if(getBBoxTileMatrixSet() != null)
         			return getBBoxTileMatrixSet().getHeight() / matrixHeight;
         		else {
         			pixelSpan = (scaleDenominator * 0.00028) / MTS_X_GRADO;
+        		}
         	} else {
         		return (scaleDenominator * tileHeight * 0.28) / 1000;
         		pixelSpan = scaleDenominator * 0.00028;
+        	}
         	double h = pixelSpan * tileHeight;
     		if(((h - ((int)h)) > (1 - epsilon) || (h - ((int)h)) < epsilon))
     			return Math.round(h);
     		return h;
+        }
         /**
-...
          * @deprecated this method was for grid subsets.
          */
     	public ArrayList intersects(boolean projected, WMTSTileMatrixLimits tileMatrixLimits, Rectangle2D request, Rectangle2D extentLayer) {
         	double widthMtsTile = getWidthMtsTile(projected);
         	double heightMtsTile = getHeightMtsTile(projected);
         	double widthMtsTile = getWidthWCTile(projected);
         	double heightMtsTile = getHeightWCTile(projected);
     		double ulx, uly, lrx, lry;
         	ArrayList list = new ArrayList();
-...
          * intersects then this will be added to the list.
          */
     	public ArrayList intersects(boolean projected, Rectangle2D request, Rectangle2D extentLayer) {
         	double widthMtsTile = getWidthMtsTile(projected);
         	double heightMtsTile = getHeightMtsTile(projected);
         	double widthWorldCoordTile = getWidthWCTile(projected);
         	double heightWorldCoordTile = getHeightWCTile(projected);
     		double ulx, uly, lrx, lry;
         	ArrayList list = new ArrayList();
-...
         	double initX = topLeftCorner[1];
         	double initY = topLeftCorner[0];
         	int tileInitX = (int)((request.getMinX() - initX) / widthMtsTile);
         	int tileInitY = (int)(Math.abs(request.getMaxY() - initY) / heightMtsTile);
         	int tileEndX = (int)((request.getMaxX() - initX) / widthMtsTile);
         	int tileEndY = (int)(Math.abs(request.getMinY() - initY) / heightMtsTile);
         	int tileInitX = (int)((request.getMinX() - initX) / widthWorldCoordTile);
         	int tileInitY = (int)(Math.abs(request.getMaxY() - initY) / heightWorldCoordTile);
         	int tileEndX = (int)((request.getMaxX() - initX) / widthWorldCoordTile);
         	int tileEndY = (int)(Math.abs(request.getMinY() - initY) / heightWorldCoordTile);
         	for (int row = tileInitY; row <= tileEndY; row++) {
         		uly = initY - (heightMtsTile * row);
     			lry = uly - heightMtsTile;
         		uly = initY - (heightWorldCoordTile * row);
     			lry = uly - heightWorldCoordTile;
     			for (int col = tileInitX; col <= tileEndX; col++) {
     				ulx = initX + (widthMtsTile * col);
     				lrx = ulx + widthMtsTile;
     				ulx = initX + (widthWorldCoordTile * col);
     				lrx = ulx + widthWorldCoordTile;
     				r.setRect(Math.min(ulx, lrx), Math.min(uly, lry), Math.abs(ulx - lrx), Math.abs(uly - lry));
     				//El segundo intersects es necesario porque el extent de la capa puede variar por cada nivel de
     				//resoluci?n en caso de que haya una lista de TileMatrix en el capabilities
-...
          * intersects then this will be added to the list.
          */
     	public ArrayList contains(boolean projected, Point2D point, Rectangle2D extentLayer) {
     		double widthMtsTile = getWidthMtsTile(projected);
         	double heightMtsTile = getHeightMtsTile(projected);
     		double widthMtsTile = getWidthWCTile(projected); //getWidthMtsTile(projected);
         	double heightMtsTile = getHeightWCTile(projected); //getHeightMtsTile(projected);
     		double ulx, uly, lrx, lry;
         	ArrayList list = new ArrayList();
-...
          * intersects then this will be added to the list.
          */
     	public ArrayList contains(boolean projected, WMTSTileMatrixLimits tileMatrixLimits, Point2D point, Rectangle2D extentLayer) {
     		double widthMtsTile = getWidthMtsTile(projected);
         	double heightMtsTile = getHeightMtsTile(projected);
     		double widthMtsTile = getWidthWCTile(projected);
         	double heightMtsTile = getHeightWCTile(projected);
     		double ulx, uly, lrx, lry;
         	ArrayList list = new ArrayList();

     	private WMTSTileMatrixSet tileMatrixSet                = null;
     	private ArrayList         tileMatrixLimits             = null;
     	protected boolean         forceLongitudeFirstAxisOrder = false;
     	//protected WMTSBoundingBox layerBBox                    = null;
     	/**
     	 * Sets longitude first in the axis order read from the capabilities file
     	 * @param force
-...
+    		}
+    	}
     	/*public void setLayerBBox(WMTSBoundingBox bbox) {
     		if(tileMatrixSet != null)
     			tileMatrixSet.setLayerBBox(layerBBox);
     		this.layerBBox = bbox;
     	}*/
     	public void print() {
     		System.out.println(" *****WMTSTileMatrixSetLink******");
     		System.out.println("TileMatrixSet ID:" + getTileMatrixSetId());

     				Math.abs(upperCorner[1] - lowerCorner[1]));
+    	}
     	public boolean isValid() {
     		return lowerCorner[0] != 0 || lowerCorner[1] != 0 || upperCorner[0] != 0 || upperCorner[1] != 0;
+    	}
     	public void print() {
     		System.out.println("*****WMTSBoundingBox******");
     		System.out.println("LowerCorner:" + getLowerCorner()[0] + "," + getLowerCorner()[1]);

          */
     	public abstract void parse(KXmlParser parser, ArrayList list) throws IOException, XmlPullParserException;
     	public void setLayerBBox(WMTSBoundingBox bbox) {
     		if(bbox != null) {
     			this.bbox = bbox;
     			for (int i = 0; i < getTileMatrix().size(); i++) {
     				((WMTSTileMatrix)getTileMatrix().get(i)).setBBoxTileMatrixSet(bbox.toRectangle2D());
+    			}
+    		}
+    	}
         public abstract WMTSBoundingBox getBoundingBox();

branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wmts/request/WMTSRequest.java
110	110	String symbol = getSymbol(onlineResource);
111	111	onlineResource = onlineResource + symbol;
112	112	URL url = new URL(stringUtils.replaceAll(getHttpGetRequest(onlineResource), " ", "%20"));
	113	//System.out.println(url.toString());
113	114	downloadFile(url, file, cancel);
114	115
115	116	//downloadFile(new URL(protocolHandler.getHost()), getHttpGetRequest(onlineResource), file, cancel);

     						setWellKnownScaleSet(nextText(parser));
     					} else if (compareName(parser, CapabilitiesTags.WMTS_TILEMATRIX)) {
     						WMTSTileMatrix tileMatrix = new WMTSTileMatrix_1_0_0();
     						if(bbox != null)
     							tileMatrix.setBBoxTileMatrixSet(bbox.toRectangle2D());
     						tileMatrix.setForceLongitudeFirstAxisOrder(forceLongitudeFirstAxisOrder);
     						tileMatrix.parse(parser, getTileMatrix());
+    					}

Application: gvSIG desktop

Revision 39504