From 3dc8745757d7389736ee239e334a77e4acfef63c Mon Sep 17 00:00:00 2001 From: "Federico C. Guizzardi" Date: Thu, 3 Mar 2016 15:01:32 +0100 Subject: [PATCH 1/2] Changed layergroup xml encorer to allow nesting layergroups --- .../rest/encoder/GSLayerGroupEncoder.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerGroupEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerGroupEncoder.java index 09fb03c..5683887 100755 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerGroupEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSLayerGroupEncoder.java @@ -61,9 +61,11 @@ public class GSLayerGroupEncoder extends PropertyXMLEncoder { } public void addLayer(String layer, String styleName) { - initPublishables("layers"); + initPublishables("publishables"); + Element e = elem("published", elem("name", layer)); + e.setAttribute("type", "layer"); - publishablesElem.addContent(elem("layer", elem("name", layer))); + publishablesElem.addContent(e); Element style = new Element("style"); stylesElem.addContent(style); @@ -72,6 +74,17 @@ public class GSLayerGroupEncoder extends PropertyXMLEncoder { } } + public void addLayerGroup(String layer) { + initPublishables("publishables"); + Element e = elem("published", elem("name", layer)); + e.setAttribute("type", "layerGroup"); + + publishablesElem.addContent(e); + + Element style = new Element("style"); + stylesElem.addContent(style); + } + public void setBounds(String crs, double minx, double maxx, double miny, double maxy) { boundsElem = elem("bounds", elem("minx", Double.toString(minx)), From 7ab329a17b6c5286a7274fccb522a598647bb26c Mon Sep 17 00:00:00 2001 From: "Federico C. Guizzardi" Date: Thu, 3 Mar 2016 15:06:05 +0100 Subject: [PATCH 2/2] Added parser for srs --- .../geosolutions/geoserver/rest/decoder/RESTResource.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java b/src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java index d66a1aa..2e367da 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java +++ b/src/main/java/it/geosolutions/geoserver/rest/decoder/RESTResource.java @@ -136,7 +136,12 @@ public class RESTResource { RESTBoundingBox bbox = this.getLatLonBoundingBox(); return bbox.getCRS(); } - + + public String getSrs(){ + return rootElem.getChildText("srs"); + } + + public double getMinX() { return this.getLatLonBoundingBox().getMinX(); }