Mercurial > dive4elements > river
changeset 9378:063befcaef74
Added datacage for S-Info collision and U-Info salix line, added datacage grouping for previous calculations of collisions, flood durations, salix lines
| author | mschaefer |
|---|---|
| date | Mon, 06 Aug 2018 11:51:19 +0200 |
| parents | e8d65cecc950 |
| children | 97aa4f641634 |
| files | artifacts/doc/conf/meta-data.xml gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties |
| diffstat | 4 files changed, 66 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Mon Aug 06 11:48:49 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Mon Aug 06 11:51:19 2018 +0200 @@ -433,12 +433,18 @@ <dc:when test="$out = 'sinfo_tkk'"> <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> + <dc:when test="$out = 'sinfo_collision'"> + <dc:call-macro name="longitudinal-section-user-prototype" /> + </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> + <dc:when test="$out = 'uinfo_salix_line'"> + <dc:call-macro name="longitudinal-section-user-prototype" /> + </dc:when> <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> <dc:call-macro name="vegetationzones" /> </dc:when> @@ -3459,18 +3465,22 @@ <dc:filter expr="$a_state = 'state.sinfo.collision' and ($facet_name = 'sinfo_facet_collision_calc_count' or $facet_name = 'sinfo_facet_collision_calc_count.2' or $facet_name = 'sinfo_facet_collision_calc_count.3')"> <dc:if test="dc:has-result()"> - <sinfo_collision> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo" /> - <dc:attribute name="target_out" value="${out}" /> - <dc:attribute name="description" value="${facet_description}" /> - <dc:attribute name="ids" value="${facet_num}" /> - <dc:attribute name="artifact-id" value="${a_gid}" /> - <dc:attribute name="out" value="${out_name}" /> - </dc:element> - </dc:for-each> - </sinfo_collision> + <sinfo_collisions> + <dc:call-macro name="collection-group"> + <sinfo_collision description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> + </dc:element> + </dc:for-each> + </sinfo_collision> + </dc:call-macro> + </sinfo_collisions> </dc:if> </dc:filter> </dc:macro> @@ -3481,18 +3491,22 @@ or $facet_name = 'mainvalue.duration' or $facet_name = 'sinfo_facet_flood_height.left' or $facet_name = 'sinfo_facet_flood_height.right' or $facet_name = 'mainvalue.w')"> <dc:if test="dc:has-result()"> - <sinfo_flood_duration> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo" /> - <dc:attribute name="target_out" value="${out}" /> - <dc:attribute name="description" value="${facet_description}" /> - <dc:attribute name="ids" value="${facet_num}" /> - <dc:attribute name="artifact-id" value="${a_gid}" /> - <dc:attribute name="out" value="${out_name}" /> - </dc:element> - </dc:for-each> - </sinfo_flood_duration> + <sinfo_flood_durations> + <dc:call-macro name="collection-group"> + <sinfo_flood_duration description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> + </dc:element> + </dc:for-each> + </sinfo_flood_duration> + </dc:call-macro> + </sinfo_flood_durations> </dc:if> </dc:filter> </dc:macro> @@ -3698,18 +3712,22 @@ or $facet_name = 'uinfo_facet_salix_mnwmw' or $facet_name = 'uinfo_facet_salix_mnwmw.filtered' or $facet_name = 'uinfo_facet_salix_scenario' or $facet_name = 'uinfo_facet_salix_scenario.filtered')"> <dc:if test="dc:has-result()"> - <uinfo_salix_line> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="uinfo" /> - <dc:attribute name="target_out" value="${out}" /> - <dc:attribute name="description" value="${facet_description}" /> - <dc:attribute name="ids" value="${facet_num}" /> - <dc:attribute name="artifact-id" value="${a_gid}" /> - <dc:attribute name="out" value="${out_name}" /> - </dc:element> - </dc:for-each> - </uinfo_salix_line> + <uinfo_salix_lines> + <dc:call-macro name="collection-group"> + <uinfo_salix_line description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> + </dc:element> + </dc:for-each> + </uinfo_salix_line> + </dc:call-macro> + </uinfo_salix_lines> </dc:if> </dc:filter> </dc:macro>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Mon Aug 06 11:48:49 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Mon Aug 06 11:51:19 2018 +0200 @@ -1499,6 +1499,8 @@ String sinfo_predefined_collision(); + String sinfo_collisions(); + String sinfo_collision(); String uinfo(); @@ -1539,6 +1541,8 @@ String error_no_data_for_river(); + String sinfo_flood_durations(); + String sinfo_flood_duration(); String sinfo_collision_export(); @@ -1571,6 +1575,8 @@ String uinfo_salix_input_complete(); + String uinfo_salix_lines(); + String uinfo_salix_line(); String common_input_hint_year();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Mon Aug 06 11:48:49 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Mon Aug 06 11:51:19 2018 +0200 @@ -816,9 +816,11 @@ sinfo_predefined_infrastructure = Infrastrukturen BWaStr sinfo_predefined_collision = Grundber\u00fchrungen +sinfo_collisions = Grundber\u00fchrungen sinfo_collision = Grundber\u00fchrungen sinfo_collision_report = Grundber\u00fchrungen Bericht +sinfo_flood_durations = \u00dcberflutungsdauern Infrastrukturen BWaStr sinfo_flood_duration = \u00dcberflutungsdauer Infrastrukturen BWaStr sinfo_flood_height = H\u00f6he Infrastrukturen BWaStr sinfo_floodduration_curve = \u00dcberflutungsdauer Infrastrukturen BWaStr - Dauerlinie @@ -846,6 +848,7 @@ uinfo_salix_km_has_gaps = Der Km-Bereich ist nicht vollst. belegt. uinfo_salix_km_anschluss = Der eingegebene Bereich schlie\u00dft nicht an den letzten Wert an. uinfo_salix_input_complete = Die gesamte Strecke ist bereits mit Werten belegt. +uinfo_salix_lines = Salix-Linien uinfo_salix_line = Salix-Linie - L\u00e4ngsschnitt bundu = Betrieb und Unterhaltung
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Mon Aug 06 11:48:49 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Mon Aug 06 11:51:19 2018 +0200 @@ -816,9 +816,11 @@ sinfo_predefined_infrastructure = Infrastrukturen BWaStr sinfo_predefined_collision = Grundber\u00fchrungen +sinfo_collisions = Grundber\u00fchrungen sinfo_collision = Grundber\u00fchrungen sinfo_collision_report = Grundber\u00fchrungen Bericht +sinfo_flood_durations = \u00dcberflutungsdauern Infrastrukturen BWaStr sinfo_flood_duration = \u00dcberflutungsdauer Infrastrukturen BWaStr sinfo_flood_height = H\u00f6he Infrastrukturen BWaStr sinfo_floodduration_curve = \u00dcberflutungsdauer Infrastrukturen BWaStr - Dauerlinie @@ -846,6 +848,7 @@ uinfo_salix_km_has_gaps = Der Km-Bereich ist nicht vollst. belegt. uinfo_salix_km_anschluss = Der eingegebene Bereich schlie\u00dft nicht an den letzten Wert an. uinfo_salix_input_complete = Die gesamte Strecke ist bereits mit Werten belegt. +uinfo_salix_lines = Salix-Linien uinfo_salix_line = Salix-Linie - L\u00e4ngsschnitt bundu = Betrieb und Unterhaltung