# HG changeset patch # User Sascha L. Teichmann # Date 1383560762 -3600 # Node ID e4eb85fbcec4fc20d5af584db946ef2dc80654be # Parent 69138ab4a94200bbc4cae7be650e76d0c3786fcd# Parent 969afcc1ca26a02dab7f61eba66afbd9b650ae96 Merged diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/doc/conf/artifacts/minfo.xml --- a/artifacts/doc/conf/artifacts/minfo.xml Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/doc/conf/artifacts/minfo.xml Mon Nov 04 11:26:02 2013 +0100 @@ -501,16 +501,25 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + - diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/doc/conf/longitudinal-diagram-defaults.xml --- a/artifacts/doc/conf/longitudinal-diagram-defaults.xml Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/doc/conf/longitudinal-diagram-defaults.xml Mon Nov 04 11:26:02 2013 +0100 @@ -12,7 +12,8 @@ - + + @@ -35,7 +36,8 @@ - + + diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Mon Nov 04 11:26:02 2013 +0100 @@ -184,6 +184,7 @@ } } + /** * The MainValueArtifact can be set up with a document giving the * river and gauge. This happens in context of GaugeDischargeArtifact. @@ -221,7 +222,7 @@ /** - * Create "the" state. + * Create "the" (one possible) state. */ protected State spawnState() { state = new StaticState(STATIC_STATE_NAME); @@ -377,6 +378,7 @@ * @return list of Q main values. */ public List getMainValuesQ(double[] kms) { + logger.debug("MainValuesArtifact.getMainValuesQ(d)"); List filteredList = new ArrayList(); boolean atGauge = false; Gauge gauge = getGauge(kms[0]); @@ -409,9 +411,11 @@ /** * Get a list of "Q" main values. + * @param atGauge whether is at gauge or needs interpolation. * @return list of Q main values. */ public List getMainValuesQ(boolean atGauge) { + logger.debug("MainValuesArtifact.getMainValuesQ(b)"); List filteredList = new ArrayList(); Gauge gauge = getGauge(); WstValueTable interpolator = WstValueTableFactory.getTable(RiverUtils.getRiver(this)); diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java Mon Nov 04 11:26:02 2013 +0100 @@ -146,9 +146,10 @@ String code = getDatacageIDValue(data); if (code != null) { - String fraction = SedimentLoadFactory.getSedimentYieldFractionName(Integer.valueOf(code)); + int id = Integer.valueOf(code); + String fraction = SedimentLoadFactory.getSedimentYieldFractionName(id); String fractionName = Resources.getMsg(callMeta, fraction, "-"); - Date[] dates = SedimentLoadFactory.getSedimentYieldTimes(Integer.valueOf(code)); + Date[] dates = SedimentLoadFactory.getSedimentYieldTimes(id); Calendar date = Calendar.getInstance(); date.setTime(dates[0]); String name = fractionName + " - " + date.get(Calendar.YEAR); @@ -157,27 +158,65 @@ name += " - " + date.get(Calendar.YEAR); } + boolean unitIsTA = + SedimentLoadFactory.getSedimentYieldUnitName(id).startsWith("t"); + String facetType = ""; if (fraction.equals("coarse")) { - facetType = SEDIMENT_LOAD_COARSE; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_COARSE; + } + else { + facetType = SEDIMENT_LOAD_M3A_COARSE; + } } else if (fraction.equals("sand")) { - facetType = SEDIMENT_LOAD_SAND; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_SAND; + } + else { + facetType = SEDIMENT_LOAD_M3A_SAND; + } } else if (fraction.equals("fine_middle")) { - facetType = SEDIMENT_LOAD_FINEMIDDLE; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_FINEMIDDLE; + } + else { + facetType = SEDIMENT_LOAD_M3A_FINEMIDDLE; + } } else if (fraction.equals("susp_sand")) { - facetType = SEDIMENT_LOAD_SUSP_SAND; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_SUSP_SAND; + } + else { + facetType = SEDIMENT_LOAD_M3A_SAND; + } } else if (fraction.equals("susp_sand_bed")) { - facetType = SEDIMENT_LOAD_SUSP_SAND_BED; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_SUSP_SAND_BED; + } + else { + facetType = SEDIMENT_LOAD_M3A_SUSP_SAND_BED; + } } else if (fraction.equals("suspended_sediment")) { - facetType = SEDIMENT_LOAD_SUSP_SEDIMENT; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_SUSP_SEDIMENT; + } + else { + facetType = SEDIMENT_LOAD_M3A_SUSP_SEDIMENT; + } } else if (fraction.equals("total")) { - facetType = SEDIMENT_LOAD_TOTAL_LOAD; + if (unitIsTA) { + facetType = SEDIMENT_LOAD_TA_TOTAL_LOAD; + } + else { + facetType = SEDIMENT_LOAD_M3A_TOTAL_LOAD; + } } else { logger.error("Do not know fraction type " + fraction); diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java Mon Nov 04 11:26:02 2013 +0100 @@ -370,7 +370,7 @@ } /** Implementation for doing a string replace - * dc:replace + * dc:replace . */ public Object replace(List args) throws XPathFunctionException { Object haystack = args.get(0); diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Mon Nov 04 11:26:02 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"); @@ -264,7 +300,7 @@ String HISTORICAL_DISCHARGE_MAINVALUES_Q = "historical_discharge.mainvalues.q"; String HISTORICAL_DISCHARGE_MAINVALUES_W = "historical_discharge.mainvalues.w"; - String REFERENCE_CURVE = "reference_curve"; + String REFERENCE_CURVE = "reference_curve"; String REFERENCE_CURVE_NORMALIZED = "reference_curve_normalized"; String FLOW_VELOCITY_MAINCHANNEL = "flow_velocity.mainchannel"; @@ -309,19 +345,30 @@ String BED_DIFFERENCE_EPOCH_HEIGHT2 = "bedheight_difference.epoch.height2"; String BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED = "bedheight_difference.epoch.height1.filtered"; String BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED = "bedheight_difference.epoch.height2.filtered"; + String MORPHOLOGIC_WIDTH = "morph-width"; 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"; diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Mon Nov 04 11:26:02 2013 +0100 @@ -101,7 +101,8 @@ // Handle sediment load differently, as it respects already // the ranges that were added to SedimentLoad/Fraction. - if (getName().equals(FacetTypes.SEDIMENT_LOAD_TOTAL)) { + if (getName().equals(FacetTypes.SEDIMENT_LOAD_TA_TOTAL) + ||getName().equals(FacetTypes.SEDIMENT_LOAD_M3A_TOTAL)) { SedimentLoad load = result.getLoad(); TDoubleArrayList xPos = new TDoubleArrayList(); TDoubleArrayList yPos = new TDoubleArrayList(); @@ -197,24 +198,25 @@ /** Get data according to type of facet. */ private double[][] getLoadData(SedimentLoadResult result) { - if (getName().equals(FacetTypes.SEDIMENT_LOAD_SAND)) + String name = getName(); + if (FacetTypes.IS.SEDIMENT_LOAD_SAND(name)) return result.getSandData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_COARSE)) + else if (FacetTypes.IS.SEDIMENT_LOAD_COARSE(name)) return result.getCoarseData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_FINEMIDDLE)) + else if (FacetTypes.IS.SEDIMENT_LOAD_FINEMIDDLE(name)) return result.getFineMiddleData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_SUSP_SAND)) + else if (FacetTypes.IS.SEDIMENT_LOAD_SUSP_SAND(name)) return result.getSuspSandData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_SUSP_SAND_BED)) + else if (FacetTypes.IS.SEDIMENT_LOAD_SUSP_SAND_BED(name)) return result.getSuspSandBedData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_SUSP_SEDIMENT)) + else if (FacetTypes.IS.SEDIMENT_LOAD_SUSP_SEDIMENT(name)) return result.getSuspSedimentData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_TOTAL_LOAD)) + else if (FacetTypes.IS.SEDIMENT_LOAD_TOTAL_LOAD(name)) return result.getTotalLoadData(); - else if (getName().equals(FacetTypes.SEDIMENT_LOAD_TOTAL)) + else if (FacetTypes.IS.SEDIMENT_LOAD_TOTAL(name)) return result.getTotalData(); else { - logger.error("SedimentLoadFacet " + getName() + " cannot determine data type."); + logger.error("SedimentLoadFacet " + name + " cannot determine data type."); return null; } } diff -r 69138ab4a942 -r e4eb85fbcec4 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Mon Nov 04 11:24:30 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Mon Nov 04 11:26:02 2013 +0100 @@ -71,6 +71,14 @@ " JOIN grain_fraction gf ON gf.id = grain_fraction_id " + " WHERE sy.id = :id "; + /** Query to get unit name of single sediment_yield. */ + public static final String SQL_SELECT_SINGLE_UNIT_BY_ID = + "SELECT DISTINCT " + + " u.name AS unit " + + " FROM sediment_yield sy " + + " JOIN units u ON u.id = unit_id " + + " WHERE sy.id = :id "; + /** Query to get description of single sediment_yield. */ public static final String SQL_SELECT_SINGLE_BY_ID = "SELECT DISTINCT " + @@ -315,6 +323,24 @@ } /** + * Get sediment load unit name. + * @param id the sediment yield by id. + * @return sediment yields unit name. + */ + public static String getSedimentYieldUnitName(int id) { + log.debug("SedimentLoadFactory.getSedimentYieldUnitName"); + + Session session = SessionHolder.HOLDER.get(); + SQLQuery sqlQuery = session.createSQLQuery(SQL_SELECT_SINGLE_UNIT_BY_ID) + .addScalar("unit", StandardBasicTypes.STRING); + sqlQuery.setDouble("id", id); + + List