Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java @ 4656:442fbb290fa8
Introduce river mapfile generation (WARNING: Changes in config xml files required!).
On startup the RiverMapfileGeneratorStarter is called by the server app.
The starter invokes a call to RiverMapfileGenerator.generate() which
reads all available rivers from the database and generates
layers for each river (in theory...uncompleted) in a
river.map file.
The old MapfileGenerator which generates layers that have
artifact dependencies is now in ArtifactMapfileGenerator.
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Tue, 11 Dec 2012 15:24:24 +0100 |
| parents | c04db3178d09 |
| children | 38ec171544de |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Tue Dec 11 09:44:04 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Tue Dec 11 15:24:24 2012 +0100 @@ -70,27 +70,48 @@ public static final Pattern NUMBERS_PATTERN = Pattern.compile("\\D*(\\d++.\\d*)\\D*"); - public static final String XPATH_RIVER_PROJECTION = + public static final String XPATH_FLOODMAP_RIVER_PROJECTION = "/artifact-database/floodmap/river[@name=$name]/srid/@value"; - public static final String XPATH_SHAPEFILE_DIR = + public static final String XPATH_FLOODMAP_SHAPEFILE_DIR = "/artifact-database/floodmap/shapefile-path/@value"; - public static final String XPATH_VELOCITY_LOGFILE = + public static final String XPATH_FLOODMAP_VELOCITY_LOGFILE = "/artifact-database/floodmap/velocity/logfile/@path"; - public static final String XPATH_MAPSERVER_URL = + public static final String XPATH_FLOODMAP_MAPSERVER_URL = "/artifact-database/floodmap/mapserver/server/@path"; - public static final String XPATH_MAPFILE_PATH = + public static final String XPATH_FLOODMAP_MAPFILE_PATH = "/artifact-database/floodmap/mapserver/mapfile/@path"; - public static final String XPATH_MAPFILE_TEMPLATE = + public static final String XPATH_FLOODMAP_MAPFILE_TEMPLATE = "/artifact-database/floodmap/mapserver/map-template/@path"; - public static final String XPATH_MAPSERVER_TEMPLATE_PATH = + public static final String XPATH_FLOODMAP_MAPSERVER_TEMPLATE_PATH = "/artifact-database/floodmap/mapserver/templates/@path"; + public static final String XPATH_RIVERMAP_RIVER_PROJECTION = + "/artifact-database/rivermap/river[@name=$name]/srid/@value"; + + public static final String XPATH_RIVERMAP_SHAPEFILE_DIR = + "/artifact-database/rivermap/shapefile-path/@value"; + + public static final String XPATH_RIVERMAP_VELOCITY_LOGFILE = + "/artifact-database/rivermap/velocity/logfile/@path"; + + public static final String XPATH_RIVERMAP_MAPSERVER_URL = + "/artifact-database/rivermap/mapserver/server/@path"; + + public static final String XPATH_RIVERMAP_MAPFILE_PATH = + "/artifact-database/rivermap/mapserver/mapfile/@path"; + + public static final String XPATH_RIVERMAP_MAPFILE_TEMPLATE = + "/artifact-database/rivermap/mapserver/map-template/@path"; + + public static final String XPATH_RIVERMAP_MAPSERVER_TEMPLATE_PATH = + "/artifact-database/rivermap/mapserver/templates/@path"; + private FLYSUtils() { } @@ -348,6 +369,7 @@ locations.add(Double.parseDouble(l)); } catch (NumberFormatException nfe) { + logger.debug(nfe.getLocalizedMessage(), nfe); } } @@ -452,7 +474,7 @@ return (String) XMLUtils.xpath( cfg, - XPATH_RIVER_PROJECTION, + XPATH_FLOODMAP_RIVER_PROJECTION, XPathConstants.STRING, null, variables); @@ -694,7 +716,7 @@ * @return the URL of the user wms. */ public static String getUserWMSUrl(String artifactId) { - String url = getXPathString(XPATH_MAPSERVER_URL); + String url = getXPathString(XPATH_FLOODMAP_MAPSERVER_URL); url = url.endsWith("/") ? url + "user-wms" : url + "/" + "user-wms"; return url;