Project

General

Profile

« Previous | Next » 

Revision ce2d36db

Added by Andreas Müller over 4 years ago

add Serbia + Kosovo, remove NorthAmerica from PESI areas

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
598 598
	//continued ERMS areas without variables
599 599
	//...
600 600
	private static int AREA_WALES = 293;
601
	private static int AREA_NORTH_AMERICA = 294; //FE common names
601

  
602
	//new E+M areas
603
	private static int AREA_SERBIA = 294;
604
	private static int AREA_KOSOVO = 295;
605

  
602 606

  
603 607
	//FauEu area UUIDs
604 608
    private static UUID uuidAreaAD = UUID.fromString("38dd31d2-8275-4b05-8b85-eb71a390d67f");
......
981 985
			else {
982 986
				logger.warn("Unknown Country: " + area.getTitleCache());
983 987
			}
984
		     //countries
985
        }else if (area.getVocabulary().getUuid().equals(NamedArea.uuidContinentVocabulary)){
986
            if (namedArea.equals(NamedArea.NORTH_AMERICA())) { return AREA_NORTH_AMERICA; }
987 988

  
988 989
		}else if (area.getVocabulary().getUuid().equals(BerlinModelTransformer.uuidVocEuroMedAreas)){
989 990
			if (namedArea.getUuid().equals(BerlinModelTransformer.uuidEM)) {
......
1077 1078
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidIt_S)) { return AREA_SAN_MARINO; }
1078 1079
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidJo)) { return AREA_JORDAN; }
1079 1080
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidJu)) { return AREA_FORMER_JUGOSLAVIA; }
1081
            else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidKo)) { return AREA_KOSOVO; }
1080 1082
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLa)) { return AREA_LATVIA; }
1081 1083
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLe)) { return AREA_LEBANON; }
1082 1084
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidLi)) { return AREA_LIBYA; }
......
1111 1113
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidRs_W)) { return AREA_RUSSIA_SOUTHWEST; }
1112 1114
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSa)) { return AREA_SARDEGNA; }
1113 1115
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSb)) { return AREA_SVALBARD_WITH_BJORNOYA_AND_JAN_MAYEN; }
1116
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSe)) { return AREA_SERBIA; }
1114 1117
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSg)) { return AREA_SELVAGENS_ISLANDS; }
1115 1118
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSi)) { return AREA_SICILY_WITH_MALTA; }
1116 1119
			else if (namedArea.getUuid().equals(BerlinModelTransformer.uuidSi_M)) { return AREA_MALTA; }

Also available in: Unified diff