Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java @ 803:feae2f9d6c6f
Removed trailing whitespace.
gnv-artifacts/trunk@885 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 07 Apr 2010 07:52:27 +0000 |
parents | feeaf5aec552 |
children | 79c1db3ca7cc |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 07 07:52:27 2010 +0000 @@ -77,7 +77,7 @@ private String shapeFilePath; private String templateID = null; - + private String geometryType = null; public static final String SHAPEFILE_NAME = "data.shp"; @@ -251,27 +251,27 @@ String returnValue = null; String[] tables = tableName.toUpperCase().split(","); String[] filter = tables[0].split("\\."); - + try { - Collection<Result> result = + Collection<Result> result = queryExecutor.executeQuery(this.geometryTypeQueryID, filter); if (result != null && !result.isEmpty()) { int geometryCode = result.iterator().next().getInteger(0); - if (geometryCode == 11 || + if (geometryCode == 11 || geometryCode == 10){ returnValue = "MultiPolygon"; - }else if (geometryCode == 9 || + }else if (geometryCode == 9 || geometryCode == 8){ returnValue = "MultiLineString"; }else if (geometryCode == 7){ returnValue = "MultiPoint"; }else if (geometryCode == 6){ returnValue = "GeometryCollection"; - }else if (geometryCode == 5 || + }else if (geometryCode == 5 || geometryCode == 4){ returnValue = "Polygon"; - }else if (geometryCode == 3 || + }else if (geometryCode == 3 || geometryCode == 2){ returnValue = "LineString"; }else if (geometryCode == 1){ @@ -283,7 +283,7 @@ } catch (QueryException e) { log.error(e,e); } - + return returnValue; } private String fetchColumns(String tableName){ @@ -500,7 +500,7 @@ if (!MapfileGenerator.getInstance().templateExists(paramType)){ // If the template doesn't exist the Defaulttemplates will be used. - paramType = LAYER_MODEL+"_"+ + paramType = LAYER_MODEL+"_"+ this.determineDefaultTemplateName(geometryType); } Document meta = MetaWriter.writeLayerMeta(callContext, uuid, @@ -531,7 +531,7 @@ } return returnValue; } - + private String determineDefaultTemplateName(String geometryType){ String returnValue = geometryType.toLowerCase();