From f0cb98a9bf969007018c0c81820e48e6d967cd26 Mon Sep 17 00:00:00 2001
From: Bart van den Eijnden <bartvde@opengeo.org>
Date: Wed, 22 Feb 2012 11:57:42 +0100
Subject: [PATCH] a bit of restructuring, also making sure that a Graphic in a
 TextSymbolizer can be read and written (this is a GeoServer extension to
 produce e.g. highway shields)

---
 lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js | 65 ++++++++++---------
 tests/Format/SLD/v1_0_0_GeoServer.html        | 12 ++++
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js b/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js
index 663db29d37..dc77fc5387 100644
--- a/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js
+++ b/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js
@@ -88,55 +88,56 @@ OpenLayers.Format.SLD.v1_0_0_GeoServer = OpenLayers.Class(
                 });
             },
             "TextSymbolizer": function(symbolizer) {
-                var node = OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"]["TextSymbolizer"].apply(this, arguments);
+                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
+                var node = writers["sld"]["TextSymbolizer"].apply(this, arguments);
                 if (symbolizer.externalGraphic || symbolizer.graphicName) {
                     this.writeNode("Graphic", symbolizer, node);
                 }
                 if ("priority" in symbolizer) {
                     this.writeNode("Priority", symbolizer.priority, node);
                 }
-                var options = symbolizer.vendorOptions;
-                if (options) {
-                    for (var i=0, ii=options.length; i<ii; ++i) {
-                        this.writeNode("VendorOption", options[i], node);
-                    }
-                }
-                return node;
+                return this.addVendorOptions(node, symbolizer);
             },
             "PointSymbolizer": function(symbolizer) {
-                var node = OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"]["PointSymbolizer"].apply(this, arguments);
-                var options = symbolizer.vendorOptions;
-                if (options) {
-                    for (var i=0, ii=options.length; i<ii; ++i) {
-                        this.writeNode("VendorOption", options[i], node);
-                    }
-                }
-                return node;
+                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
+                var node = writers["sld"]["PointSymbolizer"].apply(this, arguments);
+                return this.addVendorOptions(node, symbolizer);
             },
             "LineSymbolizer": function(symbolizer) {
-                var node = OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"]["LineSymbolizer"].apply(this, arguments);
-                var options = symbolizer.vendorOptions;
-                if (options) {
-                    for (var i=0, ii=options.length; i<ii; ++i) {
-                        this.writeNode("VendorOption", options[i], node);
-                    }
-                }
-                return node;
+                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
+                var node = writers["sld"]["LineSymbolizer"].apply(this, arguments);
+                return this.addVendorOptions(node, symbolizer);
             },
             "PolygonSymbolizer": function(symbolizer) {
-                var node = OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"]["PolygonSymbolizer"].apply(this, arguments);
-                var options = symbolizer.vendorOptions;
-                if (options) {
-                    for (var i=0, ii=options.length; i<ii; ++i) {
-                        this.writeNode("VendorOption", options[i], node);
-                    }
-                }
-                return node;
+                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
+                var node = writers["sld"]["PolygonSymbolizer"].apply(this, arguments);
+                return this.addVendorOptions(node, symbolizer);
             }
         }, OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"]),
         "ogc": OpenLayers.Format.SLD.v1_0_0.prototype.writers["ogc"]
     },
 
+    /**
+     * Method: addVendorOptions
+     * Add in the VendorOption tags and return the node again.
+     *
+     * Parameters:
+     * node - {DOMElement} A DOM node.
+     * symbolizer - {Object}
+     *
+     * Returns:
+     * {DOMElement} A DOM node.
+     */
+    addVendorOptions: function(node, symbolizer) {
+        var options = symbolizer.vendorOptions;
+        if (options) {
+            for (var i=0, ii=options.length; i<ii; ++i) {
+                this.writeNode("VendorOption", options[i], node);
+            }
+        }
+        return node;
+    },
+
     CLASS_NAME: "OpenLayers.Format.SLD.v1_0_0_GeoServer"
 
 });
diff --git a/tests/Format/SLD/v1_0_0_GeoServer.html b/tests/Format/SLD/v1_0_0_GeoServer.html
index e9ea0fbe21..94defbfe93 100644
--- a/tests/Format/SLD/v1_0_0_GeoServer.html
+++ b/tests/Format/SLD/v1_0_0_GeoServer.html
@@ -72,6 +72,18 @@
             <Fill>
               <CssParameter name="fill">#000000</CssParameter>
             </Fill>
+            <Graphic>
+              <Mark>
+                <WellKnownName>square</WellKnownName>
+                  <Fill>
+                    <CssParameter name="fill">#59BF34</CssParameter> 
+                  </Fill>
+                  <Stroke>
+                    <CssParameter name="stroke">#2D6917</CssParameter>
+                  </Stroke>
+              </Mark>
+              <Size>24</Size>
+            </Graphic>
             <Priority>
                 <ogc:PropertyName>population</ogc:PropertyName>
             </Priority>