correct handling for canary islands, baleares and azores for BerlinModel import and...

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
index 465b0b36ec1c5d219b442ea39f918c92c1067f6e..ace4bdd93af1cf22bfbe3a5950efbc520d1d35e9 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
@@ -1712,6 +1712,9 @@ public final class PesiTransformer extends ExportTransformerBase implements IExp
                        else if (namedArea.equals(WaterbodyOrCountry.AZERBAIJANREPUBLICOF())) { return STR_AREA_AZERBAIJAN_INCLUDING_NAKHICHEVAN; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.GEORGIA())) { return STR_AREA_GEORGIA; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.RUSSIANFEDERATION())) { return STR_AREA_THE_RUSSIAN_FEDERATION; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.AZERBAIJANREPUBLICOF())) { return STR_AREA_AZERBAIJAN_INCLUDING_NAKHICHEVAN; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.GEORGIA())) { return STR_AREA_GEORGIA; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.RUSSIANFEDERATION())) { return STR_AREA_THE_RUSSIAN_FEDERATION; }\r

+                       else if (namedArea.equals(WaterbodyOrCountry.UNITEDKINGDOMOFGREATBRITAINANDNORTHERNIRELAND())) { return STR_AREA_GREAT_BRITAIN; }\r
+                       else if (namedArea.equals(WaterbodyOrCountry.DENMARKKINGDOMOF())) { return STR_AREA_DENMARK_WITH_BORNHOLM; }\r
+                       else if (namedArea.equals(WaterbodyOrCountry.TURKEYREPUBLICOF())) { return STR_AREA_TURKEY; }\r

                        else {\r
                                logger.warn("Unknown Waterbody/Country: " + namedArea.getTitleCache());\r
                        }\r
                        else {\r
                                logger.warn("Unknown Waterbody/Country: " + namedArea.getTitleCache());\r
                        }\r


@@ -1720,6 +1723,25 @@ public final class PesiTransformer extends ExportTransformerBase implements IExp
                        if ( namedArea.getUuid().equals(BerlinModelTransformer.uuidMadeira)){ return STR_AREA_MADEIRA; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidDesertas)) { return STR_AREA_DESERTAS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPortoSanto)) { return STR_AREA_PORTO_SANTO; }\r
                        if ( namedArea.getUuid().equals(BerlinModelTransformer.uuidMadeira)){ return STR_AREA_MADEIRA; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidDesertas)) { return STR_AREA_DESERTAS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPortoSanto)) { return STR_AREA_PORTO_SANTO; }\r

+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFlores)) { return STR_AREA_FLORES; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidCorvo)) { return STR_AREA_CORVO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFaial)) { return STR_AREA_FAIAL; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGraciosa)) { return STR_AREA_GRACIOSA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSaoJorge)) { return STR_AREA_SAO_JORGE; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSaoMiguel)) { return STR_AREA_SAO_MIGUEL; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPico)) { return STR_AREA_PICO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSantaMaria)) { return STR_AREA_SANTA_MARIA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTerceira)) { return STR_AREA_TERCEIRA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGranCanaria)) { return STR_AREA_GRAN_CANARIA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFuerteventura)) { return STR_AREA_FUERTEVENTURA_WITH_LOBOS; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGomera)) { return STR_AREA_GOMERA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidHierro)) { return STR_AREA_HIERRO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLanzaroteWithGraciosa)) { return STR_AREA_LANZAROTE_WITH_GRACIOSA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLaPalma)) { return STR_AREA_LA_PALMA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTenerife)) { return STR_AREA_TENERIFE; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidIbizaWithFormentera)) { return STR_AREA_IBIZA_WITH_FORMENTERA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidMallorca)) { return STR_AREA_MALLORCA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidMenorca)) { return STR_AREA_MENORCA; }\r

                        \r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidUssr)) { return STR_AREA_FORMER_USSR; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidRussiaBaltic)) { return STR_AREA_RUSSIA_BALTIC; }\r
                        \r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidUssr)) { return STR_AREA_FORMER_USSR; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidRussiaBaltic)) { return STR_AREA_RUSSIA_BALTIC; }\r


@@ -1836,13 +1858,36 @@ public final class PesiTransformer extends ExportTransformerBase implements IExp
                        else if (namedArea.equals(WaterbodyOrCountry.AZERBAIJANREPUBLICOF())) { return AREA_AZERBAIJAN_INCLUDING_NAKHICHEVAN; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.GEORGIA())) { return AREA_GEORGIA; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.RUSSIANFEDERATION())) { return AREA_THE_RUSSIAN_FEDERATION; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.AZERBAIJANREPUBLICOF())) { return AREA_AZERBAIJAN_INCLUDING_NAKHICHEVAN; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.GEORGIA())) { return AREA_GEORGIA; }\r
                        else if (namedArea.equals(WaterbodyOrCountry.RUSSIANFEDERATION())) { return AREA_THE_RUSSIAN_FEDERATION; }\r

+                       else if (namedArea.equals(WaterbodyOrCountry.UNITEDKINGDOMOFGREATBRITAINANDNORTHERNIRELAND())) { return AREA_GREAT_BRITAIN; }\r
+                       else if (namedArea.equals(WaterbodyOrCountry.DENMARKKINGDOMOF())) { return AREA_DENMARK_WITH_BORNHOLM; }\r
+                       else if (namedArea.equals(WaterbodyOrCountry.TURKEYREPUBLICOF())) { return AREA_TURKEY; }\r

                        else {\r
                                logger.warn("Unknown Waterbody/Country: " + area.getTitleCache());\r
                        }\r
                }else{  //Non TDWG, non country\r
                        else {\r
                                logger.warn("Unknown Waterbody/Country: " + area.getTitleCache());\r
                        }\r
                }else{  //Non TDWG, non country\r

+                       //EM\r

                        if ( namedArea.getUuid().equals(BerlinModelTransformer.uuidMadeira)){ return AREA_MADEIRA; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidDesertas)) { return AREA_DESERTAS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPortoSanto)) { return AREA_PORTO_SANTO; }\r
                        if ( namedArea.getUuid().equals(BerlinModelTransformer.uuidMadeira)){ return AREA_MADEIRA; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidDesertas)) { return AREA_DESERTAS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPortoSanto)) { return AREA_PORTO_SANTO; }\r

+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFlores)) { return AREA_FLORES; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidCorvo)) { return AREA_CORVO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFaial)) { return AREA_FAIAL; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGraciosa)) { return AREA_GRACIOSA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSaoJorge)) { return AREA_SAO_JORGE; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSaoMiguel)) { return AREA_SAO_MIGUEL; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidPico)) { return AREA_PICO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSantaMaria)) { return AREA_SANTA_MARIA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTerceira)) { return AREA_TERCEIRA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGranCanaria)) { return AREA_GRAN_CANARIA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFuerteventura)) { return AREA_FUERTEVENTURA_WITH_LOBOS; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidGomera)) { return AREA_GOMERA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidHierro)) { return AREA_HIERRO; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLanzaroteWithGraciosa)) { return AREA_LANZAROTE_WITH_GRACIOSA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLaPalma)) { return AREA_LA_PALMA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTenerife)) { return AREA_TENERIFE; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidIbizaWithFormentera)) { return AREA_IBIZA_WITH_FORMENTERA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidMallorca)) { return AREA_MALLORCA; }\r
+                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidMenorca)) { return AREA_MENORCA; }\r

                        \r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidUssr)) { return AREA_FORMER_USSR; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidRussiaBaltic)) { return AREA_RUSSIA_BALTIC; }\r
                        \r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidUssr)) { return AREA_FORMER_USSR; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidRussiaBaltic)) { return AREA_RUSSIA_BALTIC; }\r


@@ -1854,7 +1899,6 @@ public final class PesiTransformer extends ExportTransformerBase implements IExp
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTurkey)) { return AREA_TURKEY; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidEastAegeanIslands)) { return AREA_EAST_AEGEAN_ISLANDS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTurkishEastAegeanIslands)) { return AREA_TURKISH_EAST_AEGEAN_ISLANDS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTurkey)) { return AREA_TURKEY; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidEastAegeanIslands)) { return AREA_EAST_AEGEAN_ISLANDS; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidTurkishEastAegeanIslands)) { return AREA_TURKISH_EAST_AEGEAN_ISLANDS; }\r

-                       else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidFlores)) { return AREA_FLORES; }\r

                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSerbiaMontenegro)) { return AREA_SERBIA_WITH_MONTENEGRO; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSerbia)) { return AREA_SERBIA_INCLUDING_VOJVODINA_AND_WITH_KOSOVO; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidCaucasia)) { return AREA_CAUCASUS_REGION; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSerbiaMontenegro)) { return AREA_SERBIA_WITH_MONTENEGRO; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSerbia)) { return AREA_SERBIA_INCLUDING_VOJVODINA_AND_WITH_KOSOVO; }\r
                        else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidCaucasia)) { return AREA_CAUCASUS_REGION; }\r


@@ -1871,6 +1915,9 @@ public final class PesiTransformer extends ExportTransformerBase implements IExp
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaNEO)) { return AREA_NEOTROPICAL_REGION; }\r
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaNRE)) { return AREA_NEAR_EAST; }\r
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaORR)) { return AREA_ORIENTAL_REGION; }\r
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaNEO)) { return AREA_NEOTROPICAL_REGION; }\r
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaNRE)) { return AREA_NEAR_EAST; }\r
                        else if (namedArea.getUuid().equals(FaunaEuropaeaTransformer.uuidAreaORR)) { return AREA_ORIENTAL_REGION; }\r

+\r
+                       //IF\r
+\r

                        \r
                        //ERMS\r
                        else if (namedArea.getUuid().equals(ErmsTransformer.uuidEuropeanMarineWaters)) { return AREA_EUROPEAN_MARINE_WATERS; }\r
                        \r
                        //ERMS\r
                        else if (namedArea.getUuid().equals(ErmsTransformer.uuidEuropeanMarineWaters)) { return AREA_EUROPEAN_MARINE_WATERS; }\r