[Dive4elements-commits] [PATCH 3 of 4] Change HWS Strings in the floodmap for current calculations

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1365174652 -7200
# Node ID fa5868a52f14a654c031637fe17108c8d410db57
# Parent  d8209556c6fa5325936dfdf7fdec5ddca8bf4069
Change HWS Strings in the floodmap for current calculations

diff -r d8209556c6fa -r fa5868a52f14 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Fri Apr 05 16:48:07 2013 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Fri Apr 05 17:10:52 2013 +0200
@@ -111,8 +111,8 @@
 
     private static final String HWS_LINES_SHAPE = "hws-lines.shp";
 
-    private static final String I18N_HWS_POINTS = "floodmap.hws.points";
-    private static final String I18N_HWS_LINES = "floodmap.hws.lines";
+    private static final String I18N_HWS_POINTS_OFFICIAL = "floodmap.hws.points.official";
+    private static final String I18N_HWS_LINES_OFFICIAL = "floodmap.hws.lines.official";
     private static final String HWS_LINES = "hws-lines";
     private static final String HWS_POINT_SHAPE = "hws-points.shp";
     private static final String HWS_POINTS = "hws-points";
@@ -378,7 +378,7 @@
         logger.debug("shp file exists: " + lines);
         if (lines) {
             job.addLin(dir + "/" + HWS_LINES_SHAPE);
-            facetCreator.createShapeFacet(I18N_HWS_LINES,
+            facetCreator.createShapeFacet(I18N_HWS_LINES_OFFICIAL,
                 MapfileGenerator.MS_LAYER_PREFIX + HWS_LINES,
                 FLOODMAP_LINES, 2);
         }
@@ -386,7 +386,7 @@
         boolean points = point.exists();
         logger.debug("shp file exists: " + points);
         if (points) {
-            facetCreator.createShapeFacet(I18N_HWS_POINTS,
+            facetCreator.createShapeFacet(I18N_HWS_POINTS_OFFICIAL,
                 MapfileGenerator.MS_LAYER_PREFIX + HWS_POINTS,
                 FLOODMAP_FIXPOINTS, 3);
         }
@@ -425,7 +425,7 @@
                 "31467",
                 "hws");
             job.addLin(artifactDir + "/" + HWS_LINES_SHAPE);
-            facetCreator.createShapeFacet(I18N_HWS_LINES,
+            facetCreator.createShapeFacet(I18N_HWS_LINES_OFFICIAL,
                 MapfileGenerator.MS_LAYER_PREFIX + HWS_LINES,
                 FLOODMAP_HWS_LINES,2);
         }
diff -r d8209556c6fa -r fa5868a52f14 flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties	Fri Apr 05 16:48:07 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages.properties	Fri Apr 05 17:10:52 2013 +0200
@@ -404,6 +404,8 @@
 floodmap.kms = Kilometrage
 floodmap.qps = Crosssection Tracks
 floodmap.hws = Flood Control Works
+floodmap.hws.lines.official = Official Flood Control Works
+floodmap.hws.points.official = Official Flood Control Works (points)
 floodmap.catchment = Catchment
 floodmap.floodplain = Floodplain
 floodmap.lines = Lines
diff -r d8209556c6fa -r fa5868a52f14 flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Fri Apr 05 16:48:07 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Fri Apr 05 17:10:52 2013 +0200
@@ -405,6 +405,8 @@
 floodmap.kms = Kilometrierung
 floodmap.qps = Querprofilspuren
 floodmap.hws = Hochwasserschutzanlagen
+floodmap.hws.lines.official = HWS-Offiziell
+floodmap.hws.points.official = HWS-Offiziell (Punkte)
 floodmap.catchment = Einzugsgebiet
 floodmap.floodplain = Talaue
 floodmap.lines = Linien
diff -r d8209556c6fa -r fa5868a52f14 flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Apr 05 16:48:07 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Apr 05 17:10:52 2013 +0200
@@ -401,6 +401,8 @@
 floodmap.kms = Kilometrierung
 floodmap.qps = Querprofilspuren
 floodmap.hws = Hochwasserschutzanlagen
+floodmap.hws.lines.official = HWS-Offiziell
+floodmap.hws.points.official = HWS-Offiziell (Punkte)
 floodmap.catchment = Einzugsgebiet
 floodmap.floodplain = Talaue
 floodmap.lines = Linien
diff -r d8209556c6fa -r fa5868a52f14 flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties	Fri Apr 05 16:48:07 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Fri Apr 05 17:10:52 2013 +0200
@@ -406,6 +406,8 @@
 floodmap.kms = Kilometrage
 floodmap.qps = Crosssection Tracks
 floodmap.hws = Flood Control Works
+floodmap.hws.lines.official = Official Flood Control Works
+floodmap.hws.points.official = Official Flood Control Works (points)
 floodmap.catchment = Catchment
 floodmap.floodplain = Floodplain
 floodmap.lines = Lines