Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java @ 6831:8c7433b8656d
Backed out changeset 74a437805e2a
Description does not match. Why changing logging behavior? Why re-sorting imports? This can be done (if there is really a reason to do so) in separate commits with adequate descriptions.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 14 Aug 2013 16:50:35 +0200 |
| parents | 74a437805e2a |
| children | 20f98087664d |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Wed Aug 14 16:24:12 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Wed Aug 14 16:50:35 2013 +0200 @@ -8,13 +8,6 @@ package org.dive4elements.river.utils; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.List; - -import org.apache.log4j.Logger; -import org.apache.velocity.Template; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -23,7 +16,14 @@ import org.dive4elements.river.artifacts.model.map.WMSLayerFacet; import org.dive4elements.river.artifacts.model.map.WSPLGENLayerFacet; import org.dive4elements.river.artifacts.resources.Resources; -import org.dive4elements.river.artifacts.states.FloodMapState; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.List; + +import org.apache.log4j.Logger; +import org.apache.velocity.Template; import org.geotools.data.shapefile.ShpFiles; import org.geotools.data.shapefile.shp.ShapefileHeader; import org.geotools.data.shapefile.shp.ShapefileReader; @@ -135,11 +135,11 @@ ShapefileReader sfr = new ShapefileReader(sf, true, false, null); ShapefileHeader sfh = sfr.getHeader(); - String group = MS_USERSHAPE_PREFIX + uuid; + String group = uuid + MS_USERSHAPE_PREFIX; String groupTitle = "I18N_USER_SHAPE_TITLE"; LayerInfo info = new LayerInfo(); - info.setName(MS_LAYER_PREFIX + FloodMapState.WSPLGEN_USER_RGD + uuid); + info.setName(MS_USERSHAPE_PREFIX + uuid); if (sfh.getShapeType().isLineType()) { info.setType("LINE"); } @@ -156,11 +156,7 @@ info.setGroupTitle(groupTitle); info.setSrid(wms.getSrid()); - //String nameUser = MS_LAYER_PREFIX + wms.getName(); - // TODO: This rewrites the user-rgd mapfile fragment generated by - // HWSBarrierState. Otherwise we would have to fragments with same - // layer name. Should be refactored... - String nameUser = MS_LAYER_PREFIX + "user-rgd"; + String nameUser = MS_LAYER_PREFIX + wms.getName(); Template tpl = getTemplateByName(SHP_LAYER_TEMPLATE); if (tpl == null) {