Changeset 3860 for print

Show
Ignore:
Timestamp:
11/04/11 09:21:50 (7 months ago)
Author:
jeichar
Message:

removed the dependency on transformer to render context and fixed tests

Location:
print/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • print/trunk/build.gradle

    r3826 r3860  
    4444manifest.mainAttributes('Main-Class':'org.mapfish.print.ShellMapPrinter', 'Build-Time': new Date().getDateTimeString()) 
    4545 
    46 sourceCompatibility = 1.5 
    47 targetCompatibility = 1.5 
     46sourceCompatibility = 1.6 
     47targetCompatibility = 1.6 
    4848 
    4949jar { 

  • print/trunk/src/main/java/org/mapfish/print/Transformer.java

    r3858 r3860  
    9696    public Transformer(float centerX, float centerY, float paperWidth, 
    9797            float paperHeight, int scale, int dpi, DistanceUnit unitEnum, 
    98             double rotation, String geodeticSRS, RenderingContext context) { 
     98            double rotation, String geodeticSRS, boolean isIntegerSvg) { 
    9999        this.dpi = dpi; 
    100100        pixelPerGeoUnit = (float) (unitEnum.convertTo(dpi, DistanceUnit.IN) / scale); 
    … …  
    120120         * to get bigger if DPI increases and at standard 72 DPI needs to be 1.0 
    121121         */ 
    122         if (context.getConfig().getIntegerSvg()) { // integerSvg: true # in yaml 
     122        if (isIntegerSvg) { // integerSvg: true # in yaml 
    123123                                                   // config file 
    124124            if (dpi < 600) { // target at least 600 DPI, this is a hack and only 

  • print/trunk/src/main/java/org/mapfish/print/config/layout/MapBlock.java

    r3858 r3860  
    149149        double rotation = params.optFloat("rotation", 0.0F) * Math.PI / 180.0; 
    150150        return new Transformer(centerX, centerY, width, height, scale, dpi, 
    151                 unitEnum, rotation, srs, context); 
     151                unitEnum, rotation, srs, context.getConfig().getIntegerSvg()); 
    152152    } 
    153153 

  • print/trunk/src/test/java/org/mapfish/print/TransformerTest.java

    r3789 r3860  
    2828 
    2929    public void testStraight() { 
    30         Transformer t = new Transformer(0, 0, 100, 70, 10, 2, DistanceUnit.fromString("m"), 0, null); 
     30        Transformer t = new Transformer(0, 0, 100, 70, 10, 2, DistanceUnit.fromString("m"), 0, null, false); 
    3131        assertEquals(100.0F, t.getPaperW()); 
    3232        assertEquals(70.0F, t.getPaperH()); 
    … …  
    4444                int dpi = 2; 
    4545                int scale = 10; 
    46         Transformer geodetic = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, "EPSG:4326"); 
    47         Transformer linear = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, null); 
     46        Transformer geodetic = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, "EPSG:4326", false); 
     47        Transformer linear = new Transformer(0, 0, 100, 70, scale, dpi, unitEnum, 0, null, false); 
    4848        assertEquals(linear.getPaperW(), geodetic.getPaperW()); 
    4949        assertEquals(linear.getPaperH(), geodetic.getPaperH()); 
    … …  
    5757                int dpi = 2; 
    5858                int scale = 10; 
    59         Transformer geodetic = new Transformer(731033.0f,5864001.0f, 100, 70, scale, dpi, unitEnum, 0, "EPSG:900913"); 
    60         Transformer linear = new Transformer(6.566981170957462f, 46.51954387957121f, 100, 70, scale, dpi, unitEnum, 0, null); 
     59        Transformer geodetic = new Transformer(731033.0f,5864001.0f, 100, 70, scale, dpi, unitEnum, 0, "EPSG:900913", false); 
     60        Transformer linear = new Transformer(6.566981170957462f, 46.51954387957121f, 100, 70, scale, dpi, unitEnum, 0, null, false); 
    6161        assertEquals(linear.getPaperW(), geodetic.getPaperW()); 
    6262        assertEquals(linear.getPaperH(), geodetic.getPaperH());