Revision 818 org.gvsig.sis.proj/trunk/org.gvsig.sis.proj/org.gvsig.sis.proj.lib.impl/src/main/java/org/gvsig/sis/proj/lib/SisCoordinateReferenceSystemManager.java

View differences:

SisCoordinateReferenceSystemManager.java
2 2

  
3 3
import java.text.ParseException;
4 4

  
5
import org.apache.sis.io.wkt.WKTFormat;
6 5
import org.gvsig.proj.CoordinateOperationNotFoundException;
7 6
import org.gvsig.proj.CoordinateReferenceSystem;
8 7
import org.gvsig.proj.CoordinateReferenceSystemException;
......
12 11
import org.gvsig.proj.catalog.CRSCatalogManager;
13 12
import org.gvsig.proj.catalog.CRSDefinition;
14 13
import org.gvsig.proj.catalog.TransformationDefinition;
15
import org.opengis.referencing.operation.CoordinateOperation;
14
import org.gvsig.sis.proj.catalog.DefaultCRS;
15
import org.gvsig.sis.proj.catalog.DefaultTransformation;
16 16

  
17 17
public class SisCoordinateReferenceSystemManager implements CoordinateReferenceSystemManager {
18 18
	private CRSCatalogManager catalogManager = null; 
......
23 23
	@Override
24 24
	public CoordinateReferenceSystem getCoordinateReferenceSystem(String wkt)
25 25
			throws CoordinateReferenceSystemException {
26
		return new DefaultCoordinateReferenceSystem(wkt);
26
		return new DefaultCRS(wkt);
27 27
	}
28 28

  
29 29
	@Override
30 30
	public CoordinateReferenceSystem getCoordinateReferenceSystem(CRSDefinition definition)
31 31
			throws CoordinateReferenceSystemException {
32
		return new DefaultCoordinateReferenceSystem(definition);
33

  
32
		if (definition instanceof DefaultCRS) {
33
			return (DefaultCRS) definition;
34
		}
35
		else {
36
			return new DefaultCRS(definition.toWKT());
37
		}
34 38
	}
35 39

  
36 40
	@Override
37 41
	public CoordinateTransformation getCoordinateTransformation(String wkt)
38 42
			throws CoordinateOperationNotFoundException, ParseException {
39
		WKTFormat format = new WKTFormat(null, null);
40
		Object obj = format.parseObject(wkt);
41
		CoordinateOperation operation = (CoordinateOperation) obj;
42
		return new DefaultCoordinateTransformation(operation);
43
		return new DefaultTransformation(wkt);
43 44
	}
44 45

  
45 46
	@Override
46 47
	public CoordinateTransformation getCoordinateTransformation(TransformationDefinition definition)
47 48
			throws CoordinateReferenceSystemException, ParseException {
48
		return new DefaultCoordinateTransformation(definition);
49
		if (definition instanceof DefaultTransformation) {
50
			return (CoordinateTransformation) definition;
51
		}
52
		return new DefaultTransformation(definition.toWKT());
49 53
	}
50 54

  
51 55
	@Override

Also available in: Unified diff