Revision 819 org.gvsig.sis.proj/trunk/org.gvsig.sis.proj/org.gvsig.sis.proj.catalog.impl/src/main/java/org/gvsig/sis/proj/catalog/DefaultCRS.java

View differences:

DefaultCRS.java
33 33
public class DefaultCRS implements CRSDefinition, org.gvsig.proj.CoordinateReferenceSystem {
34 34
	private CoordinateReferenceSystem crs = null;
35 35
	private String wkt = null;
36
	private DefaultDatum datum;
37 36

  
38 37
	public DefaultCRS(String wktDefinition) {
39 38
		this.wkt = wktDefinition;
......
147 146

  
148 147
	@Override
149 148
	public CoordinateSystemAxis getAxis(int dimension) throws IndexOutOfBoundsException {
150
		// TODO Auto-generated method stub
151
		return null;
149
		return new DefaultCoordinateSystemAxis(crs.getCoordinateSystem().getAxis(dimension));
152 150
	}
153 151

  
154 152
	@Override
......
177 175

  
178 176
	@Override
179 177
	public Datum getDatum() {
180
		if (datum==null) {
181
			if (crs instanceof SingleCRS) {
182
				SingleCRS singleCrs = (SingleCRS)crs;
183
				datum = new DefaultDatum(singleCrs.getDatum());
184
			}
185
			else if (crs instanceof CompoundCRS) {
186
				SingleCRS horizontalCrs = CRS.getHorizontalComponent(crs);
187
				datum = new DefaultDatum(horizontalCrs.getDatum());
188
			}
178
		if (crs instanceof SingleCRS) {
179
			SingleCRS singleCrs = (SingleCRS)crs;
180
			return new DefaultDatum(singleCrs.getDatum());
189 181
		}
190
		return datum;
182
		else {
183
			SingleCRS horizontalCrs = CRS.getHorizontalComponent(crs);
184
			return new DefaultDatum(horizontalCrs.getDatum());
185
		}
191 186
	}
192 187
	@Override
193 188
	public double getDistance(double[] point1, double[] point2, Unit<Length> unit) {

Also available in: Unified diff