OpenLayers OpenLayers

Changeset 8016

Show
Ignore:
Timestamp:
09/15/08 07:51:50 (3 months ago)
Author:
ahocevar
Message:

Fixed fatal typo that broke getComponentString when working with two-point geometries. Added tests to check that everything works as expected now. r=pagameba (pullup #1730)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers/Renderer/SVG.js

    r8002 r8016  
    662662                // valid range bounds. 
    663663                if (i > 0) { 
    664                     if (this.getShortString(components[i + 1])) { 
     664                    if (this.getShortString(components[i - 1])) { 
    665665                        strings.push(this.clipLine(components[i], 
    666666                            components[i-1])); 

  • trunk/openlayers/tests/Renderer/SVG.html

    r7930 r8016  
    438438        } 
    439439         
    440         t.plan(1); 
     440        t.plan(3); 
    441441         
    442442        var r = new OpenLayers.Renderer.SVG(document.body); 
    …… 
    449449        r.setExtent(new OpenLayers.Bounds(0, 0, 0, 0)); 
    450450 
     451        var node = document.createElement('div'); 
     452 
    451453        var geometry = new OpenLayers.Geometry.LineString([ 
    452454            new OpenLayers.Geometry.Point(0, -5000), 
    …… 
    454456            new OpenLayers.Geometry.Point(0, 5000) 
    455457        ]); 
    456          
    457         var node = document.createElement('div'); 
    458          
    459458        r.drawLineString(node, geometry); 
    460         t.eq(node.getAttribute("points"), "0,10000,15000,2500,15000,-2500,0,-10000", "Geometry correctly clipped at inValidRange bounds"); 
     459        t.eq(node.getAttribute("points"), "0,10000,15000,2500,15000,-2500,0,-10000", "Line with 3 points correctly clipped at inValidRange bounds"); 
     460         
     461        geometry = new OpenLayers.Geometry.LineString([ 
     462            new OpenLayers.Geometry.Point(0, -5000), 
     463            new OpenLayers.Geometry.Point(10000, 0) 
     464        ]); 
     465        r.drawLineString(node, geometry); 
     466        t.eq(node.getAttribute("points"), "0,10000,15000,2500", "2-point line with 2nd point outside range correctly clipped at inValidRange bounds"); 
     467 
     468        var geometry = new OpenLayers.Geometry.LineString([ 
     469            new OpenLayers.Geometry.Point(10000, 0), 
     470            new OpenLayers.Geometry.Point(0, 5000) 
     471        ]); 
     472        r.drawLineString(node, geometry); 
     473        t.eq(node.getAttribute("points"), "15000,-2500,0,-10000", "2-point line with 1st point outside range correctly clipped at inValidRange bounds"); 
    461474    } 
    462475