Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 6645:e5f2344f1137
Remove duplicated discharge_table_gauge macros and calls
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 24 Jul 2013 10:41:21 +0200 |
| parents | adae55f2a005 |
| children | 5e567047ef72 |
comparison
equal
deleted
inserted
replaced
| 6644:adae55f2a005 | 6645:e5f2344f1137 |
|---|---|
| 166 <dc:call-macro name="basedata_2_fixations_wqkms"/> | 166 <dc:call-macro name="basedata_2_fixations_wqkms"/> |
| 167 <dc:call-macro name="basedata_3_officials"/> | 167 <dc:call-macro name="basedata_3_officials"/> |
| 168 <dc:call-macro name="basedata_4_heightmarks-points"/> | 168 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 169 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> | 169 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> |
| 170 <dc:call-macro name="discharge_table_gauge"/> | 170 <dc:call-macro name="discharge_table_gauge"/> |
| 171 <dc:call-macro name="discharge_fix_wq"/> | |
| 172 </dc:when> | 171 </dc:when> |
| 173 <dc:when test="$out = 'fix_longitudinal_section_curve'"> | 172 <dc:when test="$out = 'fix_longitudinal_section_curve'"> |
| 174 <dc:call-macro name="longitudinal-section-prototype"/> | 173 <dc:call-macro name="longitudinal-section-prototype"/> |
| 175 </dc:when> | 174 </dc:when> |
| 176 <dc:when test="$out = 'map'"> | 175 <dc:when test="$out = 'map'"> |
| 252 <dc:call-macro name="flood-map-complete"/> | 251 <dc:call-macro name="flood-map-complete"/> |
| 253 </dc:otherwise> | 252 </dc:otherwise> |
| 254 </dc:choose> | 253 </dc:choose> |
| 255 </dc:when> | 254 </dc:when> |
| 256 <dc:when test="$out = 'computed_discharge_curve'"> | 255 <dc:when test="$out = 'computed_discharge_curve'"> |
| 257 <dc:call-macro name="discharge_computed"/> | 256 <dc:call-macro name="discharge_table_gauge"/> |
| 258 <dc:call-macro name="basedata_2_fixations_wqkms"/> | 257 <dc:call-macro name="basedata_2_fixations_wqkms"/> |
| 259 <dc:call-macro name="basedata_5_flood-protections"/> | 258 <dc:call-macro name="basedata_5_flood-protections"/> |
| 260 <dc:call-macro name="basedata_0"/> | 259 <dc:call-macro name="basedata_0"/> |
| 261 <dc:call-macro name="basedata_1_additionals"/> | 260 <dc:call-macro name="basedata_1_additionals"/> |
| 262 <dc:call-macro name="basedata_4_heightmarks-points"/> | 261 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 1301 </discharge_table_nn> | 1300 </discharge_table_nn> |
| 1302 </dc:if> | 1301 </dc:if> |
| 1303 </dc:context> | 1302 </dc:context> |
| 1304 </dc:macro> | 1303 </dc:macro> |
| 1305 | 1304 |
| 1306 <dc:comment>TODO: Why is this just a copy of the discharge_table_gauge?</dc:comment> | |
| 1307 <dc:macro name="discharge_computed"> | |
| 1308 <dc:call-macro name="discharge_table_gauge"/> | |
| 1309 </dc:macro> | |
| 1310 | |
| 1311 <dc:comment>TODO: Why is this just a copy of the discharge_table_gauge?</dc:comment> | |
| 1312 <dc:macro name="discharge_fix_wq"> | |
| 1313 <dc:call-macro name="discharge_table_gauge"/> | |
| 1314 </dc:macro> | |
| 1315 | |
| 1316 <dc:macro name="qsectors"> | 1305 <dc:macro name="qsectors"> |
| 1317 <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" /> | 1306 <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" /> |
| 1318 </dc:macro> | 1307 </dc:macro> |
| 1319 | 1308 |
| 1320 <dc:macro name="flood-map-recommended"> | 1309 <dc:macro name="flood-map-recommended"> |