[Dive4elements-commits] [PATCH] Create better titles for floodmap calculation results. Include the rivername and the km range

Wald Commits scm-commit at wald.intevation.org
Mon Oct 29 09:12:30 CET 2012


# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl at intevation.de>
# Date 1351498336 -3600
# Node ID 6ccdcb956c14fd19502dfdb63fd3884269695308
# Parent  005f359954681172c9ae95fac48967c96b73af82
Create better titles for floodmap calculation results. Include the rivername and the km range.

diff -r 005f35995468 -r 6ccdcb956c14 flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java
--- 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,
diff -r 005f35995468 -r 6ccdcb956c14 flys-artifacts/src/main/resources/messages.properties
--- 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
diff -r 005f35995468 -r 6ccdcb956c14 flys-artifacts/src/main/resources/messages_de.properties
--- 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
diff -r 005f35995468 -r 6ccdcb956c14 flys-artifacts/src/main/resources/messages_de_DE.properties
--- 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
diff -r 005f35995468 -r 6ccdcb956c14 flys-artifacts/src/main/resources/messages_en.properties
--- 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


More information about the Dive4elements-commits mailing list