Revision 11398

View differences:

branches/F2/libraries/libJCRS/src/org/gvsig/crs/repository/EpsgRepositoryGT.java
40 40

  
41 41
package org.gvsig.crs.repository;
42 42

  
43
import org.geotools.referencing.CRS;
43 44
import org.gvsig.crs.CrsGT;
44 45
import org.gvsig.crs.ICrs;
45
import org.idr.geotools.referencing.CRS;
46 46
import org.opengis.referencing.FactoryException;
47 47
import org.opengis.referencing.NoSuchAuthorityCodeException;
48 48
import org.opengis.referencing.crs.CoordinateReferenceSystem;
branches/F2/libraries/libJCRS/src/org/gvsig/crs/CrsWkt.java
45 45
import javax.units.ConversionException;
46 46
import javax.units.Unit;
47 47

  
48
import org.idr.geotools.metadata.iso.citation.Citations;
49
import org.idr.geotools.referencing.CRS;
50
import org.idr.geotools.referencing.crs.AbstractSingleCRS;
51
import org.idr.geotools.referencing.crs.DefaultGeographicCRS;
52
import org.idr.geotools.referencing.crs.DefaultProjectedCRS;
53
import org.idr.geotools.referencing.datum.DefaultEllipsoid;
54
import org.idr.geotools.referencing.datum.DefaultGeodeticDatum;
55
import org.idr.geotools.referencing.datum.DefaultPrimeMeridian;
48
import org.geotools.referencing.CRS;
49
import org.geotools.referencing.crs.AbstractSingleCRS;
50
import org.geotools.referencing.crs.DefaultGeographicCRS;
51
import org.geotools.referencing.crs.DefaultProjectedCRS;
52
import org.geotools.referencing.datum.DefaultEllipsoid;
53
import org.geotools.referencing.datum.DefaultGeodeticDatum;
54
import org.geotools.referencing.datum.DefaultPrimeMeridian;
56 55
import org.opengis.referencing.FactoryException;
57 56
import org.opengis.referencing.NoSuchAuthorityCodeException;
58 57
import org.opengis.referencing.NoSuchIdentifierException;
......
111 110
	public CrsWkt(CoordinateReferenceSystem crsGT) {
112 111
		AbstractSingleCRS crs = (AbstractSingleCRS)crsGT;
113 112
		String authority = crs.getName().toString().split(":")[0];
114
		setAuthority(((AbstractSingleCRS)crsGT).getIdentifier(Citations.fromName(authority)).toString());
113
		setAuthority(((AbstractSingleCRS)crsGT).getIdentifiers().iterator().next().toString());
115 114
		setWkt(crsGT.toWKT());
116 115
		
117 116
		if (crsGT instanceof DefaultProjectedCRS) {
......
676 675
				setPrimen(d.getPrimeMeridian());
677 676
				
678 677
			}
679
		} catch (NoSuchIdentifierException e) {
680
			//System.out.println("Noooo: "+e);
681 678
		} catch (NoSuchAuthorityCodeException e) { //Pertenece a CRS
682 679
			//System.out.println("Hola: 1");
683 680
			// TODO Auto-generated catch block
......
723 720
	}
724 721
	
725 722
	public void setPrimen (PrimeMeridian prim) {
726
		DefaultPrimeMeridian pm = new DefaultPrimeMeridian(prim);
723
		DefaultPrimeMeridian pm = (DefaultPrimeMeridian)(prim);
727 724
		Unit u = pm.getAngularUnit();
728 725
		double value = convert( pm.getGreenwichLongitude(), u.toString());
729 726
		String[] val = pm.getName().toString().split(":");
branches/F2/libraries/libJCRS/src/org/gvsig/crs/CrsGT.java
49 49
import org.cresques.cts.IDatum;
50 50
import org.cresques.cts.IProjection;
51 51
import org.cresques.geo.ViewPortData;
52
import org.geotools.referencing.crs.AbstractDerivedCRS;
53
import org.geotools.referencing.crs.AbstractSingleCRS;
54
import org.geotools.referencing.datum.DefaultGeodeticDatum;
52 55
import org.gvsig.crs.proj.CrsProj;
53 56
import org.gvsig.crs.proj.CrsProjException;
54 57
import org.gvsig.crs.proj.JNIBaseCrs;
55 58
import org.gvsig.crs.proj.OperationCrsException;
56
import org.idr.geotools.metadata.iso.citation.Citations;
57
import org.idr.geotools.referencing.crs.AbstractDerivedCRS;
58
import org.idr.geotools.referencing.crs.AbstractSingleCRS;
59
import org.idr.geotools.referencing.datum.DefaultGeodeticDatum;
60 59
import org.opengis.referencing.crs.CoordinateReferenceSystem;
61 60

  
62 61
/**
......
167 166
	public String getAbrev() {
168 167
		AbstractSingleCRS crs = (AbstractSingleCRS)crsGT;
169 168
		String authority = crs.getName().toString().split(":")[0];
170
		return ((AbstractSingleCRS)crsGT).getIdentifier(Citations.fromName(authority)).toString();
169
		//return ((AbstractSingleCRS)crsGT).getIdentifier(Citations.fromName(authority)).toString();
170
		return ((AbstractSingleCRS)crsGT).getIdentifiers().iterator().next().toString();
171 171
	}
172 172

  
173 173
	public ICoordTrans getCT(IProjection dest) {

Also available in: Unified diff