Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java @ 1105:adb52a2005e7
Moved code to extract the river srid defined in the global configuration into FLYSUtils.
flys-artifacts/trunk@2608 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 30 Aug 2011 08:09:52 +0000 |
parents | e7c1ebfc2701 |
children | c07e9e9c7482 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java Mon Aug 29 09:26:56 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java Tue Aug 30 08:09:52 2011 +0000 @@ -1,23 +1,15 @@ package de.intevation.flys.artifacts.states; -import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.xpath.XPathConstants; - import com.vividsolutions.jts.geom.Geometry; import org.apache.log4j.Logger; -import org.w3c.dom.Document; - import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; -import de.intevation.artifacts.common.utils.Config; -import de.intevation.artifacts.common.utils.XMLUtils; - import de.intevation.artifactdatabase.state.Facet; import de.intevation.flys.model.RiverAxis; @@ -27,6 +19,7 @@ import de.intevation.flys.artifacts.model.WMSLayerFacet; import de.intevation.flys.artifacts.resources.Resources; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; +import de.intevation.flys.utils.FLYSUtils; import de.intevation.flys.utils.GeometryUtils; @@ -36,8 +29,6 @@ public static final String WMS_LAYER_NAME = "riveraxis"; - public static final String XPATH_RIVER_PROJECTION = - "/artifact-database/floodmap/river[@name=$name]/srid/@value"; private static final Logger logger = Logger.getLogger(RiverAxisState.class); @@ -97,19 +88,7 @@ facet.setExtent(bounds); } - Map<String, String> variables = new HashMap<String, String>(1); - variables.put("name", river); - - Document cfg = Config.getConfig(); - - String srid = (String) XMLUtils.xpath( - cfg, - XPATH_RIVER_PROJECTION, - XPathConstants.STRING, - null, - variables); - - facet.setSrid(srid); + facet.setSrid(FLYSUtils.getRiverSrid(artifact)); facets.add(facet);