Remove Geometry.Surface

build/library.cfg

@@ -30,7 +30,6 @@ OpenLayers/Geometry/MultiPolygon.js
 OpenLayers/Geometry/Point.js
 OpenLayers/Geometry/Polygon.js
 OpenLayers/Geometry/Rectangle.js
-OpenLayers/Geometry/Surface.js
 OpenLayers/Geometry.js
 OpenLayers/Layer/GML.js
 OpenLayers/Layer/Vector.js

lib/OpenLayers.js

@@ -212,7 +212,6 @@
                 "OpenLayers/Geometry/Polygon.js",
                 "OpenLayers/Geometry/MultiLineString.js",
                 "OpenLayers/Geometry/MultiPolygon.js",
-                "OpenLayers/Geometry/Surface.js",
                 "OpenLayers/Renderer.js",
                 "OpenLayers/Renderer/Elements.js",
                 "OpenLayers/Renderer/NG.js",

lib/OpenLayers/Geometry/Surface.js

@@ -1,13 +0,0 @@
-/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for 
- * full list of contributors). Published under the Clear BSD license.  
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry.js
- */
-
-OpenLayers.Geometry.Surface = OpenLayers.Class(OpenLayers.Geometry, {
-
-    CLASS_NAME: "OpenLayers.Geometry.Surface"
-});

lib/OpenLayers/Renderer/Elements.js

@@ -740,9 +740,6 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
             case "OpenLayers.Geometry.Polygon":
                 drawn = this.drawPolygon(node, geometry);
                 break;
-            case "OpenLayers.Geometry.Surface":
-                drawn = this.drawSurface(node, geometry);
-                break;
             case "OpenLayers.Geometry.Rectangle":
                 drawn = this.drawRectangle(node, geometry);
                 break;
@@ -867,21 +864,6 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
      */ 
     drawCircle: function(node, geometry) {},
 
-    /**
-     * Method: drawSurface
-     * Virtual function for drawing Surface Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the surface
-     */ 
-    drawSurface: function(node, geometry) {},
-
     /**
      * Method: removeText
      * Removes a label

lib/OpenLayers/Renderer/SVG.js

@@ -214,7 +214,6 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
                 break;
             case "OpenLayers.Geometry.Polygon":
             case "OpenLayers.Geometry.Curve":
-            case "OpenLayers.Geometry.Surface":
                 nodeType = "path";
                 break;
             default:
@@ -628,46 +627,6 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         }
     },
     
-    /**
-     * Method: drawSurface
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the surface
-     */ 
-    drawSurface: function(node, geometry) {
-
-        // create the svg path string representation
-        var d = null;
-        var draw = true;
-        for (var i=0, len=geometry.components.length; i<len; i++) {
-            if ((i%3) == 0 && (i/3) == 0) {
-                var component = this.getShortString(geometry.components[i]);
-                if (!component) { draw = false; }
-                d = "M " + component;
-            } else if ((i%3) == 1) {
-                var component = this.getShortString(geometry.components[i]);
-                if (!component) { draw = false; }
-                d += " C " + component;
-            } else {
-                var component = this.getShortString(geometry.components[i]);
-                if (!component) { draw = false; }
-                d += " " + component;
-            }
-        }
-        d += " Z";
-        if (draw) {
-            node.setAttributeNS(null, "d", d);
-            return node;
-        } else {
-            return false;
-        }    
-    },
-    
     /**
      * Method: drawText
      * This method is only called by the renderer itself.

lib/OpenLayers/Renderer/SVG2.js

@@ -146,7 +146,6 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
                 break;
             case "OpenLayers.Geometry.Polygon":
             case "OpenLayers.Geometry.Curve":
-            case "OpenLayers.Geometry.Surface":
                 nodeType = "path";
                 break;
             default:
@@ -532,39 +531,6 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
         return node;
     },
     
-    /**
-     * Method: drawSurface
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the surface
-     */ 
-    drawSurface: function(node, geometry) {
-
-        // create the svg path string representation
-        var d = [];
-        var draw = true;
-        for (var i=0, len=geometry.components.length; i<len; i++) {
-            if ((i%3) == 0 && (i/3) == 0) {
-                var component = this.getShortString(geometry.components[i]);
-                d.push("M", component);
-            } else if ((i%3) == 1) {
-                var component = this.getShortString(geometry.components[i]);
-                d.push("C", component);
-            } else {
-                var component = this.getShortString(geometry.components[i]);
-                d.push(component);
-            }
-        }
-        d.push("Z");
-        node.setAttributeNS(null, "d", d.join(" "));
-        return node;
-    },
-    
     /**
      * Method: drawText
      * Function for drawing text labels.

lib/OpenLayers/Renderer/VML.js

@@ -182,7 +182,6 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
             case "OpenLayers.Geometry.LinearRing":
             case "OpenLayers.Geometry.Polygon":
             case "OpenLayers.Geometry.Curve":
-            case "OpenLayers.Geometry.Surface":
                 nodeType = "olv:shape";
                 break;
             default:
@@ -878,41 +877,6 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         label.style.top = parseInt(label.style.top)+yshift+"px";
         
     },
-
-    /**
-     * Method: drawSurface
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawSurface: function(node, geometry) {
-
-        this.setNodeDimension(node, geometry);
-
-        var resolution = this.getResolution();
-    
-        var path = [];
-        var comp, x, y;
-        for (var i=0, len=geometry.components.length; i<len; i++) {
-            comp = geometry.components[i];
-            x = ((comp.x - this.featureDx) / resolution - this.offset.x) | 0;
-            y = (comp.y / resolution - this.offset.y) | 0;
-            if ((i%3)==0 && (i/3)==0) {
-                path.push("m");
-            } else if ((i%3)==1) {
-                path.push(" c");
-            }
-            path.push(" " + x + "," + y);
-        }
-        path.push(" x e");
-
-        node.path = path.join("");
-        return node;
-    },
     
     /**
      * Method: moveRoot

tests/Geometry/Surface.html

@@ -1,22 +0,0 @@
-<html>
-<head>
-  <script src="../OLLoader.js"></script>
-  <script type="text/javascript">
-
-    function test_Surface_constructor (t) {
-        t.plan( 2 );
-        
-        var g = new OpenLayers.Geometry.Surface();
-        
-        t.eq(g.CLASS_NAME, "OpenLayers.Geometry.Surface", "correct CLASS_NAME")
-        t.ok(OpenLayers.String.startsWith(g.id, "OpenLayers.Geometry.Surface_"),
-             "id correctly set");
-    }
-
-
-
-  </script>
-</head>
-<body>
-</body>
-</html>

tests/Renderer/Elements.html

@@ -188,7 +188,7 @@
     }
 
     function test_Elements_drawGeometry_2(t) {
-        t.plan(9);
+        t.plan(8);
         
         setUp();
         
@@ -253,17 +253,6 @@
         r.drawGeometry(polygon, style);
         t.ok(properDraw, "drawGeometry called drawPolygon when passed a polygon");
 
-        // surface
-        var properDraw = false;
-        r.drawSurface = function(g) {
-            properDraw = true;
-            return {};
-        }
-        var surface = OpenLayers.Util.applyDefaults({CLASS_NAME: 'OpenLayers.Geometry.Surface'}, geometry);
-        style = true;
-        r.drawGeometry(surface, style);
-        t.ok(properDraw, "drawGeometry called drawSurface when passed a surface");
-
         // rectangle
         var properDraw = false;
         r.drawRectangle = function(g) {

tests/Renderer/SVG.html

@@ -297,40 +297,6 @@
         t.eq(node.getAttributeNS(null, "height"), "8", "height attribute is correctly set");
     }
     
-    function test_SVG_drawsurface(t) {
-        if (!OpenLayers.Renderer.SVG.prototype.supported()) {
-            t.plan(0);
-            return;
-        }
-        
-        t.plan(3);
-        
-        var r = new OpenLayers.Renderer.SVG(document.body);
-        
-        var node = document.createElement('div');
-        
-        var geometry = {
-            components: ['foo', 'bar', 'dude']
-        }
-        g_GetString = false;
-        r.getShortString = function(c) {
-            g_GetString = true;
-            return c;
-        }
-        
-        r.drawSurface(node, geometry);
-        
-        t.ok(g_GetString, "getShortString is called");
-        
-        t.eq(node.getAttributeNS(null, "d"), "M foo C bar dude Z", "d attribute is correctly set");
-        
-        r.getShortString = function(c) {
-            return false;
-        }
-
-        t.eq(r.drawSurface(node, geometry), false, "drawSurface returns false if one linearRing cannot be drawn");
-    }
-    
     function test_SVG_getcomponentsstring(t) {
         if (!OpenLayers.Renderer.SVG.prototype.supported()) {
             t.plan(0);

tests/Renderer/SVG2.html

@@ -282,34 +282,6 @@
         t.eq(node.getAttributeNS(null, "height"), "4", "height attribute is correctly set");
     }
     
-    function test_SVG_drawsurface(t) {
-        if (!OpenLayers.Renderer.SVG2.prototype.supported()) {
-            t.plan(0);
-            return;
-        }
-        
-        t.plan(2);
-        
-        var r = new OpenLayers.Renderer.SVG2(document.body);
-        
-        var node = document.createElement('div');
-        
-        var geometry = {
-            components: ['foo', 'bar', 'dude']
-        }
-        g_GetString = false;
-        r.getShortString = function(c) {
-            g_GetString = true;
-            return c;
-        }
-        
-        r.drawSurface(node, geometry);
-        
-        t.ok(g_GetString, "getShortString is called");
-        
-        t.eq(node.getAttributeNS(null, "d"), "M foo C bar dude Z", "d attribute is correctly set");
-    }
-    
     function test_SVG_getcomponentsstring(t) {
         if (!OpenLayers.Renderer.SVG2.prototype.supported()) {
             t.plan(0);

tests/list-tests.html

@@ -124,7 +124,6 @@
     <li>Geometry/Point.html</li>
     <li>Geometry/Polygon.html</li>
     <li>Geometry/Rectangle.html</li>
-    <li>Geometry/Surface.html</li>
     <li>Handler.html</li>
     <li>Handler/Box.html</li>
     <li>Handler/Click.html</li>