Mercurial > dive4elements > river

changeset 4286:6ccdcb956c14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create better titles for floodmap calculation results. Include the rivername and the km range.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 29 Oct 2012 09:12:16 +0100
parents 005f35995468
children 82c1e911dd71
files flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 5 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Mon Oct 29 07:36:56 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Mon Oct 29 09:12:16 2012 +0100
@@ -110,13 +110,18 @@
     }
 
     public void createWSPLGENFacet() {
+        String river = getRiver();
+        double kms[] = FLYSUtils.getKmRange(artifact);
+
         WSPLGENLayerFacet wsplgen = new WSPLGENLayerFacet(
             0,
             FLOODMAP_WSPLGEN,
-            Resources.getMsg(
+            Resources.format(
                 cc.getMeta(),
                 I18N_WSPLGEN_RESULT,
-                I18N_WSPLGEN_DEFAULT),
+                I18N_WSPLGEN_DEFAULT,
+                river,
+                kms[0], kms[1]),
             ComputeType.ADVANCE,
             stateId,
             hash,
--- a/flys-artifacts/src/main/resources/messages.properties	Mon Oct 29 07:36:56 2012 +0100
+++ b/flys-artifacts/src/main/resources/messages.properties	Mon Oct 29 09:12:16 2012 +0100
@@ -346,7 +346,7 @@
 
 floodmap.wmsbackground = Background Map
 floodmap.riveraxis = River Axis
-floodmap.uesk = Floodmap
+floodmap.uesk = Floodmap: {0}-km {1,number,####} - {2,number,####}
 floodmap.barriers = Digitized Objects
 floodmap.kms = Kilometrage
 floodmap.qps = Crosssection Tracks
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon Oct 29 07:36:56 2012 +0100
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon Oct 29 09:12:16 2012 +0100
@@ -346,7 +346,7 @@
 
 floodmap.wmsbackground = Hintergrundkarte
 floodmap.riveraxis = Flussachse
-floodmap.uesk = \u00dcberschwemmungsfl\u00e4che
+floodmap.uesk = \u00dcsg: {0}-km {1,number,####} - {2,number,####}
 floodmap.barriers = Digitalisierte Objekte
 floodmap.kms = Kilometrierung
 floodmap.qps = Querprofilspuren
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Oct 29 07:36:56 2012 +0100
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Oct 29 09:12:16 2012 +0100
@@ -343,7 +343,7 @@
 
 floodmap.wmsbackground = Hintergrundkarte
 floodmap.riveraxis = Flussachse
-floodmap.uesk = \u00dcberschwemmungsfl\u00e4che
+floodmap.uesk = \u00dcsg: {0}-km {1,number,####} - {2,number,####}
 floodmap.barriers = Digitalisierte Objekte
 floodmap.kms = Kilometrierung
 floodmap.qps = Querprofilspuren
--- a/flys-artifacts/src/main/resources/messages_en.properties	Mon Oct 29 07:36:56 2012 +0100
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Mon Oct 29 09:12:16 2012 +0100
@@ -347,7 +347,7 @@
 
 floodmap.wmsbackground = Background Map
 floodmap.riveraxis = River Axis
-floodmap.uesk = Floodmap
+floodmap.uesk = Floodmap: {0}-km {1,number,####} - {2,number,####}
 floodmap.barriers = Digitized Objects
 floodmap.kms = Kilometrage
 floodmap.qps = Crosssection Tracks
http://dive4elements.wald.intevation.org