Revision 21907

View differences:

trunk/libraries/lib3DMap-share/src/main/java/com/iver/ai2/gvsig3d/map3d/layers/Layer3DProps.java
15 15
import org.exolab.castor.xml.Marshaller;
16 16
import org.gvsig.cacheservice.CacheService;
17 17
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
18
import org.gvsig.osgvp.planets.Planet;
19 18

  
20 19
import com.iver.ai2.gvsig3d.gui.VectorLayerMenu;
21 20
import com.iver.andami.PluginServices;
......
188 187
		}
189 188
	}
190 189

  
191
	public void initCacheName(int planetType, IProjection viewProj) {
190
	public void initCacheName(int planetType, IProjection viewProj,int geocentricCoordinates) {
192 191
		// TODO: use full path of source or service, not just layer name
193 192

  
194 193
		String typeStr;
195
		if (planetType == Planet.CoordinateSystemType.GEOCENTRIC)
194
		if (planetType == geocentricCoordinates)
196 195
			typeStr = "Sph";
197 196
		else
198 197
			typeStr = "Pla" + viewProj.getAbrev();
......
299 298
	 * Verifies that the vector layer's legend matches the one in the cache
300 299
	 * folder
301 300
	 */
302
	public void VerifyLegend(Planet planet) {
301
	public void VerifyLegend(String planetName) {
303 302

  
304 303
		NotificationManager.addInfo("Estoy aki", null);
305 304
		NotificationManager.addInfo(m_cacheDir, null);
306 305
		if (m_layer instanceof Classifiable) {
307 306
			Classifiable legendLyr = (Classifiable) m_layer;
308
			String cacheFolder = m_cacheDir + "/" + planet.getPlanetName()
307
			String cacheFolder = m_cacheDir + "/" + planetName
309 308
					+ "/" + m_cacheName;
310 309
			File cacheFolderFile = new File(cacheFolder);
311 310
			if (!cacheFolderFile.exists())
......
420 419
	public void setZEnable(boolean zenable) {
421 420
		m_Zenable = zenable;
422 421
	}
422

  
423 423
}
trunk/libraries/lib3DMap-share/pom.xml
82 82
		<dependency>
83 83
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
84 84
			<artifactId>libosgvp-core</artifactId>
85
			<version>2.1.2-SNAPSHOT</version>
85
			<version>2.1.3</version>
86 86
		</dependency>
87 87
		<dependency>
88 88
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
89 89
			<artifactId>libosgvp-planets</artifactId>
90
			<version>2.1.2-SNAPSHOT</version>
90
			<version>2.1.3</version>
91 91
		</dependency>
92 92
		<dependency>
93 93
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
94 94
			<artifactId>libosgvp-viewer</artifactId>
95
			<version>2.1.2-SNAPSHOT</version>
95
			<version>2.1.3</version>
96 96
		</dependency>
97 97
	</dependencies>
98 98
</project>

Also available in: Unified diff