Merge pull request #60 from lat-lon/feature/concatenateColors

Added support for concatenated colors
lat-lon · Oct 23, 2023 · 015cf78 · 015cf78
2 parents e69656a + f94fd1e
commit 015cf78
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/src/main/java/org/sep3tools/PetroVisitor.java b/src/main/java/org/sep3tools/PetroVisitor.java
@@ -104,14 +104,14 @@ public String visitBestandteil_fraglich(PetroGrammarParser.Bestandteil_fraglichC
 	}
 
 	private String getBodenTerm(String boden) {
-		String bodenTerm = getS3ResultSet(boden);
-		if (!bodenTerm.isEmpty())
-			return bodenTerm;
+		StringBuilder bodenTerm = new StringBuilder(getS3ResultSet(boden));
+		if (bodenTerm.length() > 0)
+			return bodenTerm.toString();
 		for (int i = 0; i <= MAX_QUANTIFIER; i++) {
 			if (boden.endsWith(String.valueOf(i))) {
 				String bodenShort = boden.substring(0, boden.length() - 1);
-				bodenTerm = getS3ResultSet(bodenShort);
-				if (!bodenTerm.isEmpty()) {
+				bodenTerm = new StringBuilder(getS3ResultSet(bodenShort));
+				if (bodenTerm.length() > 0) {
 					String bodenQuant = String.valueOf(i);
 					try {
 						bodenQuant = getBodenQuant(bodenShort, String.valueOf(i));
@@ -125,6 +125,28 @@ private String getBodenTerm(String boden) {
 				}
 			}
 		}
+		String forColorSeparation = boden;
+		int partialBodenLength = 2;
+		while (partialBodenLength <= forColorSeparation.length()) {
+			String partialTermForColor = forColorSeparation.substring(forColorSeparation.length() - partialBodenLength);
+			String colorPart = getS3ResultSet(partialTermForColor);
+			if (!colorPart.isEmpty()) {
+				bodenTerm.insert(0, colorPart);
+				if (partialTermForColor.equals(forColorSeparation)) {
+					return bodenTerm.toString();
+				}
+				forColorSeparation = forColorSeparation.substring(0, forColorSeparation.length() - partialBodenLength);
+				partialBodenLength = 1;
+				if (!forColorSeparation.endsWith("dd")
+						&& (forColorSeparation.endsWith("h") || forColorSeparation.endsWith("d"))) {
+					partialBodenLength = 0;
+				}
+			}
+			partialBodenLength++;
+		}
+		if (bodenTerm.length() > 0) {
+			return bodenTerm.toString();
+		}
 		switch (boden) {
 			case "^u":
 				return "Schluffstein";

diff --git a/src/main/resources/farbetest.properties b/src/main/resources/farbetest.properties
@@ -14,11 +14,15 @@ ge=gelb
 dgr=dunkelgrau
 gn=grün
 rs=rosa
+ddro=sehr dunkelrot
+holst=hellolivstichig
 gnli=grünlich
 grst=graustichig
-# robn=
-# blro=blaurot
-# drohbngr,blro,ddro,hgrbn,mtgr,mtol,mtolst=
+robn=rotbraun
+blro=blaurot
+mtol=mattoliv
+mtolst=mattolivstichig
+drohbngr,blro,ddro,hgrbn,mtgr,mtol,mtolst=dunkelrothellbraungrau, blaurot, sehr dunkelrot, hellgraubraun, mattgrau, mattoliv, mattolivstichig
 dro-hgr=dunkelrot bis hellgrau
-# robn,sw,ge,dgr-gn,swgerobnrs=
-gnli,grst=grünlich, graustichig
+robn,sw,ge,dgr-gn,swgerobnrs=rotbraun, schwarz, gelb, dunkelgrau bis grün, schwarzgelbrotbraunrosa
+gnli,grst=grünlich, graustichig