Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java @ 4645:105463e2234f
Merged.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 05 Dec 2012 12:59:32 +0100 |
parents | 02cf2b1dff84 |
children | 5014a84c0c7d |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java Mon Dec 03 11:02:28 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MapInfoServiceImpl.java Wed Dec 05 12:59:32 2012 +0100 @@ -1,24 +1,20 @@ package de.intevation.flys.client.server; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import org.apache.log4j.Logger; - import com.google.gwt.user.server.rpc.RemoteServiceServlet; import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator; - import de.intevation.artifacts.httpclient.exceptions.ConnectionException; import de.intevation.artifacts.httpclient.http.HttpClient; import de.intevation.artifacts.httpclient.http.HttpClientImpl; - +import de.intevation.flys.client.client.services.MapInfoService; import de.intevation.flys.client.shared.exceptions.ServerException; import de.intevation.flys.client.shared.model.BBox; import de.intevation.flys.client.shared.model.MapInfo; -import de.intevation.flys.client.client.services.MapInfoService; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** @@ -47,6 +43,9 @@ public static final String XPATH_RIVER_WMS = "/mapinfo/river/river-wms/@url"; + public static final String XPATH_RIVER_WMS_LAYERS = + "/mapinfo/river/river-wms/@layers"; + public static final String XPATH_WMS_URL = "/mapinfo/river/background-wms/@url"; @@ -57,6 +56,7 @@ "mapinfo_service_no_result"; + @Override public MapInfo getMapInfo(String locale, String river) throws ServerException { @@ -113,7 +113,8 @@ String bboxS = XMLUtils.xpathString(result, XPATH_BBOX, null); BBox bbox = BBox.getBBoxFromString(bboxS); - String riverWMS = XMLUtils.xpathString(result, XPATH_RIVER_WMS, null); + String riverWMS = XMLUtils.xpathString(result, XPATH_RIVER_WMS, null); + String riverLayers = XMLUtils.xpathString(result, XPATH_RIVER_WMS_LAYERS, null); String wmsURL = XMLUtils.xpathString(result, XPATH_WMS_URL, null); String wmsLayers = XMLUtils.xpathString(result, XPATH_WMS_LAYERS, null); @@ -126,7 +127,7 @@ // do nothing } - return new MapInfo(river, srid, bbox, riverWMS, wmsURL, wmsLayers); + return new MapInfo(river, srid, bbox, riverWMS, riverLayers, wmsURL, wmsLayers); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :