Mercurial > dive4elements > river

changeset 5978:ebd6e8e234e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added mainvalues to fixanalysis wq curves.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 10 May 2013 15:44:48 +0200
parents 0ddb8be91f2f
children 5159a7d85320
files artifacts/doc/conf/artifacts/fixanalysis.xml artifacts/doc/conf/meta-data.xml artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java
diffstat 3 files changed, 169 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/fixanalysis.xml	Fri May 10 15:44:01 2013 +0200
+++ b/artifacts/doc/conf/artifacts/fixanalysis.xml	Fri May 10 15:44:48 2013 +0200
@@ -171,6 +171,8 @@
                         <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
                         <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/>
                         <facet name="fix_wq_curve.manualpoints" description="Manual points"/>
+                        <facet name="mainvalues.w" description="facet.fix_wq.mainvalues.w"/>
+                        <facet name="mainvalues.q" description="facet.fix_wq.mainvalues.q"/>
                     </facets>
                 </outputmode>
                 <outputmode name="fix_deltawt_curve" description="output.fix_deltawt_curve" mine-type="image/png" type="chart">
@@ -293,6 +295,8 @@
                         <facet name="other.wq"    description="Point-like data like fixations"/>
                         <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
                         <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/>
+                        <facet name="mainvalues.w" description="facet.fix_wq.mainvalues.w"/>
+                        <facet name="mainvalues.q" description="facet.fix_wq.mainvalues.q"/>
                     </facets>
                 </outputmode>
                 <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
--- a/artifacts/doc/conf/meta-data.xml	Fri May 10 15:44:01 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri May 10 15:44:48 2013 +0200
@@ -623,7 +623,164 @@
           <dc:call-macro name="annotations_per_type"/>
         </dc:macro>
 
-        <dc:macro name="discharge_table_gauge">
+        <dc:comment>
+        + River-Node
+        </dc:comment>
+        <dc:attribute name="name" value="${river_name}"/>
+
+        <dc:choose>
+          <dc:when test="dc:contains($parameters, 'recommended')">
+             <dc:comment>
+                Recommendations (client shall load immediately).
+             </dc:comment>
+             <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'historical_discharge_wq')">
+               <dc:call-macro name="mainvalues"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'cross_section')">
+               <dc:call-macro name="cross_sections"/>
+               <dc:call-macro name="hyks"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
+               <dc:call-macro name="mainvalues"/>
+               <dc:call-macro name="basedata_2_fixations_wqkms"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+               <dc:call-macro name="mainvalues"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
+               <dc:call-macro name="annotations"/>
+               <dc:call-macro name="mainvalues"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
+               <dc:call-macro name="qsectors"/>
+               <dc:call-macro name="mainvalues"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'bed_difference_epoch')">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'bed_difference_year')">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+             <dc:if test="dc:contains($artifact-outs, 'bed_difference_height_year')">
+               <dc:call-macro name="annotations"/>
+             </dc:if>
+          </dc:when>
+          <dc:otherwise>
+            <dc:comment>
+               Non - Recommendations.
+            </dc:comment>
+            <dc:if test="dc:contains($artifact-outs, 'cross_section')">
+               <dc:call-macro name="basedata_0"/>
+               <dc:call-macro name="basedata_1_additionals"/>
+               <dc:call-macro name="basedata_2_fixations"/>
+               <dc:call-macro name="basedata_3_officials"/>
+               <dc:call-macro name="basedata_4_heightmarks-points"/>
+               <dc:call-macro name="cross_sections"/>
+               <dc:call-macro name="hyks"/>
+            </dc:if>
+            <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
+               <dc:call-macro name="basedata_0_wq"/>
+               <dc:call-macro name="basedata_4_heightmarks-wq"/>
+            </dc:if-->
+            <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')) or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+                <dc:call-macro name="longitudinal-section-prototype"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+                <dc:call-macro name="mainvalues"/>
+                <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
+              <dc:call-macro name="annotations"/>
+              <!--dc:call-macro name="basedata_0"/-->
+              <dc:call-macro name="basedata_1_additionals-relative_point"/>
+              <dc:comment comment=" FIXATIONS ---------------------------"/>
+              <dc:call-macro name="basedata_2_fixations_relative_point"/>
+              <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
+              <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+              <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
+              <dc:call-macro name="basedata_0_wq"/>
+              <dc:call-macro name="basedata_1_additionals_marks"/>
+              <dc:call-macro name="basedata_2_fixations_wqkms"/>
+              <dc:call-macro name="basedata_3_officials"/>
+              <dc:call-macro name="basedata_4_heightmarks-points"/>
+              <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')">
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
+              <dc:call-macro name="annotations"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'map')">
+              <dc:call-macro name="flood-map-complete"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
+              <dc:call-macro name="annotations_per_type"/>
+              <dc:call-macro name="flow_velocity_measurements"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'bed_longitudinal_section')">
+              <dc:call-macro name="annotations_per_type"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'sedimentload_ls')">
+              <dc:call-macro name="annotations_per_type"/>
+              <dc:call-macro name="morph_width"/>
+            </dc:if>
+            <dc:comment>
+              MINFO bedheight middle
+            </dc:comment>
+            <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')">
+              <dc:call-macro name="sounding-width"/>
+              <dc:call-macro name="basedata_0"/>
+              <dc:call-macro name="basedata_1_additionals"/>
+              <dc:call-macro name="basedata_2_fixations"/>
+              <dc:call-macro name="basedata_3_officials"/>
+              <dc:call-macro name="annotations_per_type"/>
+            </dc:if>
+            <dc:if test="dc:contains($artifact-outs, 'bed_difference_year') or
+                         dc:contains($artifact-outs, 'bed_difference_epoch')">
+              <dc:call-macro name="basedata_0"/>
+              <dc:call-macro name="basedata_1_additionals"/>
+              <dc:call-macro name="basedata_2_fixations"/>
+              <dc:call-macro name="basedata_3_officials"/>
+              <dc:call-macro name="annotations_per_type"/>
+              <dc:call-macro name="morph_width"/>
+            </dc:if>
+           <dc:comment comment="--- non-recommendations---"/>
+          </dc:otherwise>
+        </dc:choose>
+
+        <dc:if test="dc:contains($artifact-outs, 'waterlevels')">
+
+          <!-- base data -->
+          <dc:call-macro name="basedata_0"/>
+
+          <!-- extra-longitudinal-sections -->
+          <dc:call-macro name="basedata_1_additionals"/>
+
+          <!-- fixations -->
+          <dc:call-macro name="basedata_2_fixations"/>
+
+          <!-- flood water marks-->
+          <dc:call-macro name="basedata_4_heightmarks-points"/>
+
+          <!-- flood protection -->
+          <dc:call-macro name="basedata_5_flood-protections"/>
+
+        </dc:if>
+
+        <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))">
           <discharge_table_nn>
             <discharge_table_gauge>
               <dc:context>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Fri May 10 15:44:01 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Fri May 10 15:44:48 2013 +0200
@@ -165,6 +165,13 @@
                     doc,
                     visible);
         }
+        else if (name.equals(MAINVALUES_W) || name.equals(MAINVALUES_Q)) {
+            doAnnotations(
+                ((RiverAnnotation) aaf.getData(context)),
+                aaf,
+                doc,
+                visible);
+        }
         else if (FacetTypes.IS.MANUALPOINTS(aaf.getFacetName())) {
             doPoints(aaf.getData(context),
                     aaf,
http://dive4elements.wald.intevation.org