From: Andreas Müller Date: Wed, 7 May 2014 08:24:54 +0000 (+0000) Subject: adding map to ReferenceSystem X-Git-Tag: cdmlib-parent-3.3.4~10 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/5104915185d76f6e70327f13e95c0240074ce891 adding map to ReferenceSystem --- diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java index dee6b4af53..1adfd6f72a 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java @@ -193,6 +193,7 @@ public class InputTransformerBase implements IInputTransformer { }else if (key.matches("(?i)(wgs84)")){return ReferenceSystem.WGS84(); }else if (key.matches("(?i)(googleearth)")){return ReferenceSystem.GOOGLE_EARTH(); }else if (key.matches("(?i)(gazetteer)")){return ReferenceSystem.GAZETTEER(); + }else if (key.matches("(?i)(map)")){return ReferenceSystem.MAP(); }else{ String warning = "getReferenceSystemByKey is not implemented in implementing transformer class"; throw new UndefinedTransformerMethodException(warning); diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java index febf7818c5..e18d82fdc7 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java @@ -29,7 +29,6 @@ public final class SpecimenCdmExcelTransformer extends InputTransformerBase { @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(SpecimenCdmExcelTransformer.class); - public static final UUID uuidRefSysMap = UUID.fromString("6d72d148-458a-42eb-97b0-9824abcffc91"); public static final UUID uuidRefSysEstimated = UUID.fromString("3b625520-e5cf-4d9c-9599-0cb048e0e8d2"); public static final UUID uuidRefSysLabel = UUID.fromString("c72335ed-c9aa-4d1c-b6fc-9f307d207862"); public static final UUID uuidRefSysGps = UUID.fromString("b3c36751-b2ac-47f7-8ac1-3dc5c129e0b2"); @@ -66,7 +65,6 @@ public final class SpecimenCdmExcelTransformer extends InputTransformerBase { @Override public UUID getReferenceSystemUuid(String key) throws UndefinedTransformerMethodException { if (StringUtils.isBlank(key)){return null; - }else if (key.matches("(?i)(map)")){return uuidRefSysMap; }else if (key.matches("(?i)(estimated)")){return uuidRefSysEstimated; }else if (key.matches("(?i)(label)")){return uuidRefSysLabel; }else if (key.matches("(?i)(gps)")){return uuidRefSysLabel; @@ -77,8 +75,5 @@ public final class SpecimenCdmExcelTransformer extends InputTransformerBase { } return null; } - - - }