Revision 690

View differences:

org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/downloader/WMTSCacheStruct.java
56 56
    	this.tileMatrixSet = tileMatrixSetLink.getTileMatrixSet();
57 57
		this.tileMatrixSetLimits = tileMatrixSetLink.getTileMatrixLimits();
58 58
		pixelSize = provider.getPixelSizeByLevel();
59
		layerName = provider.getFName();
59
		layerName = provider.getURIOfFirstProvider();
60 60
		serverURL = ((WMTSDataParameters)provider.getDataParameters()).getURI();
61 61
    }
62 62

  
org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSProvider.java
802 802
			BandList bandList = new BandListImpl();
803 803
			for(int i = 0; i < getBandCount(); i++) {
804 804
				try {
805
					DatasetBand band = new DatasetBandImpl(getFName(), i, getDataType()[i], getBandCount());
805
					DatasetBand band = new DatasetBandImpl(getURIOfFirstProvider(), i, getDataType()[i], getBandCount());
806 806
					bandList.addBand(band, i);
807 807
				} catch(BandNotFoundInListException e) {
808 808
					//No a?adimos la banda
......
1355 1355
	@Override
1356 1356
	public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
1357 1357
		if(param instanceof WMTSDataParameters)
1358
			this.name = ((WMTSDataParameters)param).getURI();
1358
			this.uri = ((WMTSDataParameters)param).getURI();
1359 1359
		this.param = param;
1360 1360
		this.storeServices = storeServices;
1361 1361
	}
org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/layer/FLyrWMTS.java
651 651
		RasterDataStore  ds = dataStore.cloneDataStore();
652 652
		FLyrWMTS newLayer = new FLyrWMTS();
653 653
		newLayer.setName(getName());
654
		newLayer.setOpenRasterStore(ds, RasterManager.TYPE_MULTIDATA);
654
		newLayer.setOpenRasterStore(ds);
655 655
		newLayer.fullEnvelope = fullEnvelope;
656 656
		newLayer.params = params;
657 657
		newLayer.firstLoad = firstLoad;
org.gvsig.raster.ermapper/trunk/org.gvsig.raster.ermapper/org.gvsig.raster.ermapper.io/src/main/java/org/gvsig/raster/ermapper/io/ErmapperProvider.java
483 483
			try {
484 484
				file.readLineRGBA(pRGBArray);
485 485
				for(int col = 0; col < pRGBArray.length; col ++) {
486
					drawableBands = bandList.getBufferBandToDraw(getFName(), 0);
486
					drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 0);
487 487
					if(drawableBands != null) {
488 488
						for (int i = 0; i < drawableBands.length; i++) {
489 489
							rasterBuf.setElem(line, col, drawableBands[i], (byte)((pRGBArray[col] & 0x00ff0000) >> 16));							
490 490
						}
491 491
					}
492
					drawableBands = bandList.getBufferBandToDraw(getFName(), 1);
492
					drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 1);
493 493
					if(drawableBands != null) {
494 494
						for (int i = 0; i < drawableBands.length; i++) {
495 495
							rasterBuf.setElem(line, col, drawableBands[i], (byte)((pRGBArray[col] & 0x0000ff00) >> 8));
496 496
						}
497 497
					}
498
					drawableBands = bandList.getBufferBandToDraw(getFName(), 2);
498
					drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 2);
499 499
					if(drawableBands != null) {
500 500
						for (int i = 0; i < drawableBands.length; i++) {
501 501
							rasterBuf.setElem(line, col, drawableBands[i], (byte)(pRGBArray[col] & 0x000000ff));
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSProvider.java
171 171
			e.printStackTrace();
172 172
		}
173 173
		
174
		//Temporal hastq que sepamos el tipo de dato y n?mero de bandas
175
		mustTileRequest = false;
176
		
177 174
		stats = new RemoteDataStoreStatistics(this);
178 175
	}
179 176
	
......
530 527
		}
531 528
	}
532 529
	
533
	/*
534
	 * (non-Javadoc)
535
	 * @see org.gvsig.raster.impl.provider.RasterProvider#isTiled()
536
	 */
537
	public boolean isTiled() {
538
		return mustTileRequest;
539
	}
540 530
	
541 531
	/*
542 532
	 * (non-Javadoc)
......
544 534
	 */
545 535
	public void getWindow(Extent ex, int bufWidth, int bufHeight, 
546 536
			BandList bandList, TileListener listener) throws ProcessInterruptedException, RasterDriverException {
547
		 if(mustTileRequest) {
548
			 
549
		 } else {
550
			 Buffer raster = DefaultRasterManager.getInstance().createBuffer(getDataType()[0], bufWidth, bufHeight, 3, true);
551
			 getWindow(ex, bufWidth, bufHeight, bandList, raster, true);
552
			 raster.setDataExtent(ex.toRectangle2D());
553
			 
554
			 TileCacheManager m = TileCacheLocator.getManager();
555
			 org.gvsig.raster.cache.tile.Tile t = m.createTile(-1, 0, 0);
556
			 t.setData(new Object[]{raster});
557
			 t.setUl(new Point2D.Double(ex.getULX(), ex.getULY()));
558
			 t.setLr(new Point2D.Double(ex.getLRX(), ex.getLRY()));
559
			 t.setDownloaderParams("AffineTransform", getAffineTransform());
560
			 t.setDownloaderParams("Tiling", new Boolean(false));
561
			 try {
562
				 listener.tileReady(t);
563
			 } catch (TileGettingException e) {
564
				 throw new RasterDriverException("Error throwing a tile", e);
565
			 }
566 537

  
567
			 //listener.nextBuffer(raster, null, new ExtentImpl(minX, minY, maxX, maxY), getAffineTransform(), null, false);
568
			 listener.endReading();
569
		 }
538
		Buffer raster = DefaultRasterManager.getInstance().createBuffer(getDataType()[0], bufWidth, bufHeight, 3, true);
539
		getWindow(ex, bufWidth, bufHeight, bandList, raster, true);
540
		raster.setDataExtent(ex.toRectangle2D());
541

  
542
		TileCacheManager m = TileCacheLocator.getManager();
543
		org.gvsig.raster.cache.tile.Tile t = m.createTile(-1, 0, 0);
544
		t.setData(new Object[]{raster});
545
		t.setUl(new Point2D.Double(ex.getULX(), ex.getULY()));
546
		t.setLr(new Point2D.Double(ex.getLRX(), ex.getLRY()));
547
		t.setDownloaderParams("AffineTransform", getAffineTransform());
548
		t.setDownloaderParams("Tiling", new Boolean(false));
549
		try {
550
			listener.tileReady(t);
551
		} catch (TileGettingException e) {
552
			throw new RasterDriverException("Error throwing a tile", e);
553
		}
554

  
555
		//listener.nextBuffer(raster, null, new ExtentImpl(minX, minY, maxX, maxY), getAffineTransform(), null, false);
556
		listener.endReading();
557

  
570 558
	}
571 559

  
572 560
	/*
......
970 958
	 */
971 959
	public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
972 960
		if(param instanceof WCSDataParametersImpl)
973
			this.name = ((WCSDataParametersImpl)param).getURI();
961
			this.uri = ((WCSDataParametersImpl)param).getURI();
974 962
		this.param = param;
975 963
	}
976 964
	
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/downloader/WCSTileServer.java
88 88
					provider.getCellSize(), 
89 89
					TileCacheLibrary.DEFAULT_TILESIZE, 
90 90
					TileCacheLibrary.DEFAULT_TILESIZE,
91
					provider.getFName(),
91
					provider.getURIOfFirstProvider(),
92 92
					TileCacheLibrary.DEFAULT_STRUCTURE,
93 93
					RasterLibrary.pathTileCache,
94 94
					getFileSuffix(),
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/layer/FLyrWCS.java
447 447
        RasterDataStore  ds = dataStore.cloneDataStore();
448 448
        FLyrWCS layer = new FLyrWCS();
449 449
        layer.setName(getParameters().getCoverageName());
450
        layer.setOpenRasterStore(ds, RasterManager.TYPE_MULTIDATA);
450
        layer.setOpenRasterStore(ds);
451 451
        layer.fullEnvelope = fullEnvelope;
452 452
        layer.params = params;
453 453
        layer.explorer = explorer;
org.gvsig.raster.netcdf/trunk/org.gvsig.raster.netcdf/org.gvsig.raster.netcdf.io/src/main/java/org/gvsig/raster/netcdf/io/NetCDFProvider.java
552 552
		} else
553 553
			buf = rasterBuf;
554 554
		
555
		int[] drawableBands = bandList != null ? bandList.getBufferBandToDraw(getFName(), 0) : new int[1];
555
		int[] drawableBands = bandList != null ? bandList.getBufferBandToDraw(getURIOfFirstProvider(), 0) : new int[1];
556 556
		if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
557 557
			return rasterBuf;
558 558
		
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java
1285 1285
		RasterDataStore  ds = dataStore.cloneDataStore();
1286 1286
		FLyrWMS newLayer = new FLyrWMS();
1287 1287
		newLayer.setName(getName());
1288
		newLayer.setOpenRasterStore(ds, RasterManager.TYPE_MULTIDATA);
1288
		newLayer.setOpenRasterStore(ds);
1289 1289
		newLayer.fullEnvelope = fullEnvelope;
1290 1290
		newLayer.params = params;
1291 1291
		//newLayer.firstLoad = firstLoad;
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/downloader/WMSTileServer.java
88 88
					provider.getCellSize(), 
89 89
					TileCacheLibrary.DEFAULT_TILESIZE, 
90 90
					TileCacheLibrary.DEFAULT_TILESIZE,
91
					provider.getFName(),
91
					provider.getURIOfFirstProvider(),
92 92
					TileCacheLibrary.DEFAULT_STRUCTURE,
93 93
					RasterLibrary.pathTileCache,
94 94
					getFileSuffix(),
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSProvider.java
183 183
		setParam(storeServices, params);
184 184
		setDataType(new int[]{Buffer.TYPE_BYTE, Buffer.TYPE_BYTE, Buffer.TYPE_BYTE});
185 185
		bandCount = 3;
186
		mustTileRequest = false;
187 186
	}
188 187
	
189 188
	public static final WMSConnector getConnectorFromURL(URL url) throws IOException {
......
593 592
	
594 593
	/*
595 594
	 * (non-Javadoc)
596
	 * @see org.gvsig.raster.impl.provider.RasterProvider#isTiled()
597
	 */
598
	public boolean isTiled() {
599
		return mustTileRequest;
600
	}
601
	
602
	/*
603
	 * (non-Javadoc)
604 595
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(org.gvsig.fmap.dal.coverage.datastruct.Extent, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.raster.cache.tile.provider.TileListener)
605 596
	 */
606 597
	public void getWindow(Extent ex, int bufWidth, int bufHeight, 
607 598
			BandList bandList, TileListener listener) throws ProcessInterruptedException, RasterDriverException {
608
		 if(mustTileRequest) {
609
			 
610
		 } else {
611
			 Buffer raster = DefaultRasterManager.getInstance().createBuffer(getDataType()[0], bufWidth, bufHeight, 3, true);
612
			 getWindow(ex, bufWidth, bufHeight, bandList, raster, true);
613
			 raster.setDataExtent(ex.toRectangle2D());
614
			 
615
			 TileCacheManager m = TileCacheLocator.getManager();
616
			 org.gvsig.raster.cache.tile.Tile t = m.createTile(-1, 0, 0);
617
			 t.setData(new Object[]{raster});
618
			 t.setUl(new Point2D.Double(ex.getULX(), ex.getULY()));
619
			 t.setLr(new Point2D.Double(ex.getLRX(), ex.getLRY()));
620
			 t.setDownloaderParams("AffineTransform", getAffineTransform());
621
			 t.setDownloaderParams("Tiling", new Boolean(false));
622
			 try {
623
				 listener.tileReady(t);
624
			 } catch (TileGettingException e) {
625
				 throw new RasterDriverException("Error throwing a tile", e);
626
			 }
627 599

  
628
			 //listener.nextBuffer(raster, null, new ExtentImpl(minX, minY, maxX, maxY), getAffineTransform(), null, false);
629
			 listener.endReading();
630
		 }
600
		Buffer raster = DefaultRasterManager.getInstance().createBuffer(getDataType()[0], bufWidth, bufHeight, 3, true);
601
		getWindow(ex, bufWidth, bufHeight, bandList, raster, true);
602
		raster.setDataExtent(ex.toRectangle2D());
603

  
604
		TileCacheManager m = TileCacheLocator.getManager();
605
		org.gvsig.raster.cache.tile.Tile t = m.createTile(-1, 0, 0);
606
		t.setData(new Object[]{raster});
607
		t.setUl(new Point2D.Double(ex.getULX(), ex.getULY()));
608
		t.setLr(new Point2D.Double(ex.getLRX(), ex.getLRY()));
609
		t.setDownloaderParams("AffineTransform", getAffineTransform());
610
		t.setDownloaderParams("Tiling", new Boolean(false));
611
		try {
612
			listener.tileReady(t);
613
		} catch (TileGettingException e) {
614
			throw new RasterDriverException("Error throwing a tile", e);
615
		}
616

  
617
		//listener.nextBuffer(raster, null, new ExtentImpl(minX, minY, maxX, maxY), getAffineTransform(), null, false);
618
		listener.endReading();
631 619
	}
632 620

  
633 621
	/*
......
944 932
	 */
945 933
	public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
946 934
		if(param instanceof WMSDataParameters)
947
			this.name = ((WMSDataParameters)param).getURI();
935
			this.uri = ((WMSDataParameters)param).getURI();
948 936
		this.param = param;
949 937
	}
950 938
	
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/RemoteWMSStyle.java
30 30

  
31 31
    /**
32 32
     * Creates a new instance of FMapWMSStyle
33
     * @param name
33
     * @param uri
34 34
     * @param title
35 35
     * @param styleAbstract
36 36
     * @param parent
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/raster/memory/io/MemoryRasterProvider.java
390 390
	private void writeByteBuffer(Buffer rasterBuf, double stepX, double stepY, Point2D begin, BandList bandList) {
391 391
		int xPx = 0, yPx = 0;
392 392
		for (int iBand = 0; iBand < buffer.getBandCount(); iBand++) {
393
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
393
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
394 394
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
395 395
				continue;
396 396
			for(int drawBands = 0; drawBands < drawableBands.length; drawBands++) {
......
422 422
	private void writeShortBuffer(Buffer rasterBuf, double stepX, double stepY, Point2D begin, BandList bandList) {
423 423
		int xPx = 0, yPx = 0;
424 424
		for (int iBand = 0; iBand < buffer.getBandCount(); iBand++) {
425
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
425
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
426 426
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
427 427
				continue;
428 428
			for(int drawBands = 0; drawBands < drawableBands.length; drawBands++) {
......
454 454
	private void writeIntBuffer(Buffer rasterBuf, double stepX, double stepY, Point2D begin, BandList bandList) {
455 455
		int xPx = 0, yPx = 0;
456 456
		for (int iBand = 0; iBand < buffer.getBandCount(); iBand++) {
457
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
457
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
458 458
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
459 459
				continue;
460 460
			for(int drawBands = 0; drawBands < drawableBands.length; drawBands++) {
......
486 486
	private void writeFloatBuffer(Buffer rasterBuf, double stepX, double stepY, Point2D begin, BandList bandList) {
487 487
		int xPx = 0, yPx = 0;
488 488
		for (int iBand = 0; iBand < buffer.getBandCount(); iBand++) {
489
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
489
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
490 490
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
491 491
				continue;
492 492
			for(int drawBands = 0; drawBands < drawableBands.length; drawBands++) {
......
518 518
	private void writeDoubleBuffer(Buffer rasterBuf, double stepX, double stepY, Point2D begin, BandList bandList) {
519 519
		int xPx = 0, yPx = 0;
520 520
		for (int iBand = 0; iBand < buffer.getBandCount(); iBand++) {
521
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
521
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
522 522
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
523 523
				continue;
524 524
			for(int drawBands = 0; drawBands < drawableBands.length; drawBands++) {
......
550 550
				);
551 551

  
552 552
		for(int iBand = 0; iBand < buffer.getBandCount(); iBand ++){
553
			int[] drawableBands = bandList.getBufferBandToDraw(this.getFName(), iBand);
553
			int[] drawableBands = bandList.getBufferBandToDraw(this.getURIOfFirstProvider(), iBand);
554 554
			if(drawableBands == null || (drawableBands.length == 1 && drawableBands[0] == -1))
555 555
				continue;
556 556
			if(buffer.getDataType() == Buffer.TYPE_BYTE) {
org.gvsig.raster.lizardtech/trunk/org.gvsig.raster.lizardtech/org.gvsig.raster.lizardtech.io/src/main/java/org/gvsig/raster/lizardtech/io/LizardTechProvider.java
419 419
		int[] drawableBands = null;
420 420
		for (int row = 0; row < h; row++) {
421 421
			for (int col = 0; col < w; col++) {
422
				drawableBands = bandList.getBufferBandToDraw(getFName(), 0);
422
				drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 0);
423 423
				if(drawableBands != null) {
424 424
					for (int i = 0; i < drawableBands.length; i++) {
425 425
						rasterBuf.setElem(row, col, drawableBands[i], (byte) ((pRGBArray[(row * w) + col] & 0x00ff0000) >> 16));
426 426
					}
427 427
				}
428
				drawableBands = bandList.getBufferBandToDraw(getFName(), 1);
428
				drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 1);
429 429
				if(drawableBands != null) {
430 430
					for (int i = 0; i < drawableBands.length; i++) {
431 431
						rasterBuf.setElem(row, col, drawableBands[i], (byte) ((pRGBArray[(row * w) + col] & 0x0000ff00) >> 8));
432 432
					}
433 433
				}
434
				drawableBands = bandList.getBufferBandToDraw(getFName(), 2);
434
				drawableBands = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 2);
435 435
				if(drawableBands != null) {
436 436
					for (int i = 0; i < drawableBands.length; i++) {
437 437
						rasterBuf.setElem(row, col, drawableBands[i], (byte) (pRGBArray[(row * w) + col] & 0x000000ff));
org.gvsig.raster.timeseries/trunk/org.gvsig.raster.timeseries/org.gvsig.raster.timeseries.io/src/main/java/org/gvsig/raster/timeseries/io/TimeSeriesProvider.java
511 511
	 * (non-Javadoc)
512 512
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getFName()
513 513
	 */
514
	public String getFName() {
515
		return providerList.get(selectedProvider).getFName();
514
	public String getURIOfFirstProvider() {
515
		return providerList.get(selectedProvider).getURIOfFirstProvider();
516 516
	}
517 517

  
518 518
	/*

Also available in: Unified diff