Revision 867 org.gvsig.geotools.proj/trunk/org.gvsig.geotools.proj/org.gvsig.geotools.proj.catalog.impl/src/main/java/org/gvsig/geotools/proj/catalog/DefaultCRSDefinition.java
| DefaultCRSDefinition.java | ||
|---|---|---|
| 13 | 13 |
import org.gvsig.geotools.proj.catalog.extent.DefaultExtent; |
| 14 | 14 |
import org.gvsig.geotools.proj.catalog.extent.DefaultGeographicBoundingBox; |
| 15 | 15 |
import org.gvsig.geotools.proj.catalog.extent.DefaultVerticalExtent; |
| 16 |
import org.gvsig.geotools.proj.catalog.utils.IdentifiedObjectUtils;
|
|
| 16 |
import org.gvsig.geotools.proj.catalog.utils.GtUtils;
|
|
| 17 | 17 |
import org.gvsig.proj.catalog.CRSDefinition; |
| 18 | 18 |
import org.gvsig.proj.catalog.CRSType; |
| 19 | 19 |
import org.gvsig.proj.catalog.CoordinateSystemAxis; |
| ... | ... | |
| 114 | 114 |
|
| 115 | 115 |
@Override |
| 116 | 116 |
public String getIdentifier() {
|
| 117 |
String id = IdentifiedObjectUtils.getIdentifier(origCrs);
|
|
| 117 |
String id = GtUtils.getIdentifier(origCrs);
|
|
| 118 | 118 |
if (id!=null) {
|
| 119 | 119 |
return id; |
| 120 | 120 |
} |
| ... | ... | |
| 158 | 158 |
|
| 159 | 159 |
@Override |
| 160 | 160 |
public String getAuthorityName() {
|
| 161 |
return IdentifiedObjectUtils.getIdentifier(origCrs.getName().getAuthority().getIdentifiers());
|
|
| 161 |
return GtUtils.getIdentifier(origCrs.getName().getAuthority().getIdentifiers());
|
|
| 162 | 162 |
} |
| 163 | 163 |
|
| 164 | 164 |
@Override |
| ... | ... | |
| 259 | 259 |
if (wkt!=null) {
|
| 260 | 260 |
return wkt; |
| 261 | 261 |
} |
| 262 |
return toString(Format.WKT1);
|
|
| 262 |
return export(Format.WKT1);
|
|
| 263 | 263 |
} |
| 264 | 264 |
|
| 265 | 265 |
@Override |
| ... | ... | |
| 269 | 269 |
|
| 270 | 270 |
|
| 271 | 271 |
@Override |
| 272 |
public String toString(Format format) throws UnsupportedOperationException {
|
|
| 273 |
return toString(format, null, 2);
|
|
| 272 |
public String export(Format format) throws UnsupportedOperationException {
|
|
| 273 |
return export(format, null, 2);
|
|
| 274 | 274 |
} |
| 275 | 275 |
|
| 276 | 276 |
@Override |
| 277 |
public String toString(TextSerialization.Format format, WKTConvention convention, int indentation) throws UnsupportedOperationException {
|
|
| 277 |
public String export(TextSerialization.Format format, WKTConvention convention, int indentation) throws UnsupportedOperationException {
|
|
| 278 | 278 |
// FIXME: should we consider this.wkt if it is not null?? |
| 279 | 279 |
if (format==Format.WKT1) {
|
| 280 | 280 |
Formatter formatter = new Formatter(Symbols.DEFAULT, indentation); |
| ... | ... | |
| 385 | 385 |
return origCrs.equals(((DefaultCRSDefinition)obj).getOrigCRS()); |
| 386 | 386 |
} |
| 387 | 387 |
if (obj instanceof CRSDefinition) {
|
| 388 |
return toString(Format.WKT1, WKTConvention.EPSG, 0).equals(((CRSDefinition)obj).toString(Format.WKT1, WKTConvention.EPSG, 0));
|
|
| 388 |
return export(Format.WKT1, WKTConvention.EPSG, 0).equals(((CRSDefinition)obj).export(Format.WKT1, WKTConvention.EPSG, 0));
|
|
| 389 | 389 |
} |
| 390 | 390 |
return false; |
| 391 | 391 |
} |
| ... | ... | |
| 413 | 413 |
return equals(definition); |
| 414 | 414 |
} |
| 415 | 415 |
} |
| 416 |
|
|
| 417 |
@Override |
|
| 418 |
public int hashCode() {
|
|
| 419 |
return origCrs.hashCode(); |
|
| 420 |
} |
|
| 416 | 421 |
} |
Also available in: Unified diff