Allow coloured Polygons even if we have a graphic specified

Author: flavour

examples/graphicfill.html

@@ -35,7 +35,7 @@
                 polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer", { renderers: renderer });
 
                 map.addLayers([wmsLayer, polygonLayer]);
-                map.addControl(new OpenLayers.Control.LayerSwitcher());
+                //map.addControl(new OpenLayers.Control.LayerSwitcher());
                 map.addControl(new OpenLayers.Control.MousePosition());
 
                 drawControls = {

lib/OpenLayers.js

@@ -416,10 +416,10 @@
         // use "parser-inserted scripts" for guaranteed execution order
         // http://hsivonen.iki.fi/script-execution/
         var scriptTags = new Array(jsFiles.length);
-        if (undefined != 'S3.Ap') {
+        try {
             // Sahana loader, required when running in pr_contacts()
             var host = S3.Ap.concat('/static/scripts/gis/openlayers/lib/');
-        } else {
+        } catch(e) {
             // Revert to normal OpenLayers loader
             var host = OpenLayers._getScriptLocation() + "lib/";
         }

lib/OpenLayers/Renderer/SVG.js

@@ -352,9 +352,9 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
 				var pid = this.createImagePattern(style);
 				node.setAttributeNS(null, "fill", "url(#" + pid + ")");
 				node.setAttributeNS(null, "fill-opacity", 1);
-			} else if (style.graphicName && node._geometryClass !== "OpenLayers.Geometry.Point") {
+			//} else if (style.graphicName && node._geometryClass !== "OpenLayers.Geometry.Point") {
 				//this can also happen if a rule based style applies to both points and other types of geometries. TODO: better handling of rule based styles!
-				OpenLayers.Console.error('WellKnownName is not yet supported as GraphicFill by the SVG renderer!');
+			//	OpenLayers.Console.error('WellKnownName is not yet supported as GraphicFill by the SVG renderer!');
 				//var pid = this.createMarkPattern(style);
 				//node.setAttributeNS(null, "fill", "url(#" + pid + ")");
 				//node.setAttributeNS(null, "fill-opacity", 1);

lib/OpenLayers/Renderer/VML.js

@@ -305,9 +305,9 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
 						fill.aspect = "atmost";
 					}
 				}
-			} else if (style.graphicName && node._geometryClass !== "OpenLayers.Geometry.Point") {
+			//} else if (style.graphicName && node._geometryClass !== "OpenLayers.Geometry.Point") {
 				//this can also happen if a rule based style applies to both points and other types of geometries. TODO: better handling of rule based styles!
-				OpenLayers.Console.error('WellKnownName is not yet supported as GraphicFill by the VML renderer!');
+			//	OpenLayers.Console.error('WellKnownName is not yet supported as GraphicFill by the VML renderer!');
 			}
             if (fill.parentNode != node) {
                 node.appendChild(fill);