[PATCH 05 of 15] issue1658: Define new FacetTypes and IS functions

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1383319575 -3600
# Node ID aaa48ad40bbd007280ad8b2af5f530c51103d602
# Parent  ab17c76611f9ae29c39eedee9365d68f62221940
issue1658: Define new FacetTypes and IS functions.

diff -r ab17c76611f9 -r aaa48ad40bbd artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java	Fri Nov 01 16:25:19 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java	Fri Nov 01 16:26:15 2013 +0100
@@ -111,11 +111,47 @@
 
             return false;
         }
-        public static boolean SEDIMENT_LOAD(String type) {
-            return type.startsWith("sedimentload") && !type.contains("unknown");
+        public static boolean SEDIMENT_LOAD_TOTAL_LOAD(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_TOTAL_LOAD) ||
+                type.equals(SEDIMENT_LOAD_M3A_TOTAL_LOAD);
+        }
+        public static boolean SEDIMENT_LOAD_TOTAL(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_TOTAL) ||
+                type.equals(SEDIMENT_LOAD_M3A_TOTAL);
+        }
+        public static boolean SEDIMENT_LOAD_SUSP_SEDIMENT(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_SUSP_SEDIMENT) ||
+                type.equals(SEDIMENT_LOAD_M3A_SUSP_SEDIMENT);
+        }
+        public static boolean SEDIMENT_LOAD_SUSP_SAND_BED(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_SUSP_SAND_BED) ||
+                type.equals(SEDIMENT_LOAD_M3A_SUSP_SAND_BED);
+        }
+        public static boolean SEDIMENT_LOAD_SUSP_SAND(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_SUSP_SAND) ||
+                type.equals(SEDIMENT_LOAD_M3A_SUSP_SAND);
+        }
+        public static boolean SEDIMENT_LOAD_FINEMIDDLE(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_FINEMIDDLE) ||
+                type.equals(SEDIMENT_LOAD_M3A_FINEMIDDLE);
+        }
+        public static boolean SEDIMENT_LOAD_COARSE(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_COARSE) ||
+                type.equals(SEDIMENT_LOAD_M3A_COARSE);
+        }
+        public static boolean SEDIMENT_LOAD_SAND(String type) {
+            return type.equals(SEDIMENT_LOAD_TA_SAND) ||
+                type.equals(SEDIMENT_LOAD_M3A_SAND);
+        }
+        public static boolean SEDIMENT_LOAD_M3A(String type) {
+            return type.startsWith("sedimentload.m3a") && !type.contains("unknown");
+        }
+        public static boolean SEDIMENT_LOAD_TA(String type) {
+            return type.startsWith("sedimentload.ta") && !type.contains("unknown");
         }
         public static boolean SEDIMENT_LOAD_UNKNOWN(String type) {
-            return type.equals("sedimentload.unknown");
+            return type.equals("sedimentload.m3a.unknown") ||
+              type.equals("sedimentload.ta.unknown");
         }
         public static boolean SEDIMENT_LOAD_NO_FLOAT(String type) {
             return type.startsWith("sedimentload") && !type.contains("susp");
@@ -313,15 +349,25 @@
 
     String SEDIMENT_DENSITY            = "sediment.density";
 
-    String SEDIMENT_LOAD_COARSE        = "sedimentload.coarse";
-    String SEDIMENT_LOAD_SAND          = "sedimentload.sand";
-    String SEDIMENT_LOAD_FINEMIDDLE    = "sedimentload.finemiddle";
-    String SEDIMENT_LOAD_SUSP_SAND     = "sedimentload.susp_sand";
-    String SEDIMENT_LOAD_SUSP_SAND_BED = "sedimentload.susp_sand_bed";
-    String SEDIMENT_LOAD_SUSP_SEDIMENT = "sedimentload.susp_sediment";
-    String SEDIMENT_LOAD_TOTAL         = "sedimentload.total";
-    String SEDIMENT_LOAD_TOTAL_LOAD    = "sedimentload.total_load";
-    String SEDIMENT_LOAD_UNKNOWN       = "sedimentload.unknown";
+    String SEDIMENT_LOAD_TA_COARSE        = "sedimentload.ta.coarse";
+    String SEDIMENT_LOAD_TA_SAND          = "sedimentload.ta.sand";
+    String SEDIMENT_LOAD_TA_FINEMIDDLE    = "sedimentload.ta.finemiddle";
+    String SEDIMENT_LOAD_TA_SUSP_SAND     = "sedimentload.ta.susp_sand";
+    String SEDIMENT_LOAD_TA_SUSP_SAND_BED = "sedimentload.ta.susp_sand_bed";
+    String SEDIMENT_LOAD_TA_SUSP_SEDIMENT = "sedimentload.ta.susp_sediment";
+    String SEDIMENT_LOAD_TA_TOTAL         = "sedimentload.ta.total";
+    String SEDIMENT_LOAD_TA_TOTAL_LOAD    = "sedimentload.ta.total_load";
+    String SEDIMENT_LOAD_TA_UNKNOWN       = "sedimentload.ta.unknown";
+
+    String SEDIMENT_LOAD_M3A_COARSE        = "sedimentload.m3a.coarse";
+    String SEDIMENT_LOAD_M3A_SAND          = "sedimentload.m3a.sand";
+    String SEDIMENT_LOAD_M3A_FINEMIDDLE    = "sedimentload.m3a.finemiddle";
+    String SEDIMENT_LOAD_M3A_SUSP_SAND     = "sedimentload.m3a.susp_sand";
+    String SEDIMENT_LOAD_M3A_SUSP_SAND_BED = "sedimentload.m3a.susp_sand_bed";
+    String SEDIMENT_LOAD_M3A_SUSP_SEDIMENT = "sedimentload.m3a.susp_sediment";
+    String SEDIMENT_LOAD_M3A_TOTAL         = "sedimentload.m3a.total";
+    String SEDIMENT_LOAD_M3A_TOTAL_LOAD    = "sedimentload.m3a.total_load";
+    String SEDIMENT_LOAD_M3A_UNKNOWN       = "sedimentload.m3a.unknown";
 
     String SQ_OVERVIEW       = "sq_overview";