Revision 8405 trunk/libraries/libJCRS/src/org/gvsig/crs/Crs.java
Crs.java | ||
---|---|---|
9 | 9 |
import org.cresques.cts.IDatum; |
10 | 10 |
import org.cresques.cts.IProjection; |
11 | 11 |
import org.cresques.geo.ViewPortData; |
12 |
import org.gvsig.crs.epsg.CrsEpsg; |
|
13 |
import org.gvsig.crs.epsg.CrsEpsgException; |
|
14 |
import org.gvsig.crs.epsg.OperationCrs; |
|
15 |
import org.gvsig.crs.epsg.OperationCrsException; |
|
16 | 12 |
import org.gvsig.crs.ogr.CrsOgr; |
17 | 13 |
import org.gvsig.crs.ogr.CrsOgrException; |
18 | 14 |
import org.gvsig.crs.ogr.OGRException; |
19 | 15 |
import org.gvsig.crs.ogr.OGRSpatialReference; |
20 | 16 |
import org.gvsig.crs.ogr.crsgdalException; |
17 |
import org.gvsig.crs.proj.CrsProj; |
|
18 |
import org.gvsig.crs.proj.CrsProjException; |
|
19 |
import org.gvsig.crs.proj.OperationCrs; |
|
20 |
import org.gvsig.crs.proj.OperationCrsException; |
|
21 | 21 |
|
22 | 22 |
public class Crs implements ICrs { |
23 | 23 |
private static final Color basicGridColor = new Color(64, 64, 64, 128); |
... | ... | |
26 | 26 |
//private String transOrigin = ""; |
27 | 27 |
private String abrev; |
28 | 28 |
private String name = ""; |
29 |
private CrsEpsg crsProj4;
|
|
30 |
private CrsEpsg crsBase = null;
|
|
29 |
private CrsProj crsProj4;
|
|
30 |
private CrsProj crsBase = null;
|
|
31 | 31 |
private CrsWkt crsWkt; |
32 | 32 |
private int epsg_code = 23030; |
33 | 33 |
boolean targetNad = false; |
... | ... | |
53 | 53 |
Integer.parseInt(code)); |
54 | 54 |
//Guardamos la cadena Proj4 devuelva por la OGRSpatialReference |
55 | 55 |
proj4 = CrsOgr.exportToProj4(oSRSSource); |
56 |
crsProj4 = new CrsEpsg(proj4);
|
|
56 |
crsProj4 = new CrsProj(proj4);
|
|
57 | 57 |
setName(fullCode); |
58 | 58 |
setAbrev(fullCode); |
59 | 59 |
|
... | ... | |
80 | 80 |
OGRSpatialReference oSRSSource = new OGRSpatialReference(); |
81 | 81 |
CrsOgr.importFromWkt(oSRSSource,code2); |
82 | 82 |
proj4 =CrsOgr.exportToProj4(oSRSSource); |
83 |
crsProj4 = new CrsEpsg(proj4);
|
|
83 |
crsProj4 = new CrsProj(proj4);
|
|
84 | 84 |
setName(fullCode); |
85 | 85 |
setAbrev(crsWkt.getName()); |
86 | 86 |
} catch (OGRException e) { |
... | ... | |
100 | 100 |
//crs base (en el caso de ser projectado): |
101 | 101 |
if(this.isProjected()){ |
102 | 102 |
String proj4Base = "+proj=latlong +a=" + crsWkt.getSpheroid()[1] + " +rf=" + crsWkt.getSpheroid()[2] ; |
103 |
crsBase = new CrsEpsg(proj4Base);
|
|
103 |
crsBase = new CrsProj(proj4Base);
|
|
104 | 104 |
} |
105 | 105 |
} |
106 | 106 |
} |
... | ... | |
123 | 123 |
Integer.parseInt(code)); |
124 | 124 |
//Guardamos la cadena Proj4 devuelva por la OGRSpatialReference |
125 | 125 |
proj4 = CrsOgr.exportToProj4(oSRSSource); |
126 |
crsProj4 = new CrsEpsg(proj4);
|
|
126 |
crsProj4 = new CrsProj(proj4);
|
|
127 | 127 |
setName(fullCode); |
128 | 128 |
setAbrev(fullCode); |
129 | 129 |
|
... | ... | |
150 | 150 |
OGRSpatialReference oSRSSource = new OGRSpatialReference(); |
151 | 151 |
CrsOgr.importFromWkt(oSRSSource,code2); |
152 | 152 |
proj4 = CrsOgr.exportToProj4(oSRSSource); |
153 |
crsProj4 = new CrsEpsg(proj4);
|
|
153 |
crsProj4 = new CrsProj(proj4);
|
|
154 | 154 |
setName(fullCode); |
155 | 155 |
setAbrev(crsWkt.getName()); |
156 | 156 |
} catch (OGRException e) { |
... | ... | |
170 | 170 |
// Crs base (en el caso de ser projectado): |
171 | 171 |
if(this.isProjected()){ |
172 | 172 |
String proj4Base = "+proj=latlong +a=" + crsWkt.getSpheroid()[1] + " +rf=" + crsWkt.getSpheroid()[2] ; |
173 |
crsBase = new CrsEpsg(proj4Base);
|
|
173 |
crsBase = new CrsProj(proj4Base);
|
|
174 | 174 |
} |
175 | 175 |
} |
176 | 176 |
} |
... | ... | |
193 | 193 |
Integer.parseInt(code)); |
194 | 194 |
//Guardamos la cadena Proj4 devuelva por la OGRSpatialReference |
195 | 195 |
proj4 = CrsOgr.exportToProj4(oSRSSource); |
196 |
crsProj4 = new CrsEpsg(proj4);
|
|
196 |
crsProj4 = new CrsProj(proj4);
|
|
197 | 197 |
setName(fullCode); |
198 | 198 |
setAbrev(fullCode); |
199 | 199 |
|
... | ... | |
220 | 220 |
OGRSpatialReference oSRSSource = new OGRSpatialReference(); |
221 | 221 |
CrsOgr.importFromWkt(oSRSSource,code2); |
222 | 222 |
proj4 =CrsOgr.exportToProj4(oSRSSource)+params+" "; |
223 |
crsProj4 = new CrsEpsg(proj4);
|
|
223 |
crsProj4 = new CrsProj(proj4);
|
|
224 | 224 |
setName(fullCode); |
225 | 225 |
setAbrev(crsWkt.getName()); |
226 | 226 |
} catch (OGRException e) { |
... | ... | |
240 | 240 |
// Crs base (en el caso de ser projectado): |
241 | 241 |
if(this.isProjected()){ |
242 | 242 |
String proj4Base = "+proj=latlong +a=" + crsWkt.getSpheroid()[1] + " +rf=" + crsWkt.getSpheroid()[2] ; |
243 |
crsBase = new CrsEpsg(proj4Base);
|
|
243 |
crsBase = new CrsProj(proj4Base);
|
|
244 | 244 |
} |
245 | 245 |
} |
246 | 246 |
} |
... | ... | |
309 | 309 |
else return new COperation(this, target); |
310 | 310 |
} |
311 | 311 |
|
312 |
protected CrsEpsg getCrsEpsg() {
|
|
312 |
protected CrsProj getCrsEpsg() {
|
|
313 | 313 |
return crsProj4; |
314 | 314 |
} |
315 | 315 |
|
... | ... | |
356 | 356 |
} catch (OperationCrsException e) { |
357 | 357 |
// TODO Auto-generated catch block |
358 | 358 |
e.printStackTrace(); |
359 |
} catch (CrsEpsgException e) {
|
|
359 |
} catch (CrsProjException e) {
|
|
360 | 360 |
// TODO Auto-generated catch block |
361 | 361 |
e.printStackTrace(); |
362 | 362 |
} |
Also available in: Unified diff