[mapserver-commits] r13251 - in trunk/msautotest/renderers: . expected

svn at osgeo.org svn at osgeo.org
Wed Mar 14 09:35:43 EDT 2012 

Author: tbonfort
Date: 2012-03-14 06:35:43 -0700 (Wed, 14 Mar 2012)
New Revision: 13251

Added:
   trunk/msautotest/renderers/baseline_text.map
   trunk/msautotest/renderers/expected/baseline_text.cairopng.png
   trunk/msautotest/renderers/expected/baseline_text.gif.png
   trunk/msautotest/renderers/expected/baseline_text.pdf.png
   trunk/msautotest/renderers/expected/baseline_text.png.png
   trunk/msautotest/renderers/expected/baseline_text.svg.png
Log:
add test for text alignment accounting for baselines (#3784)


Added: trunk/msautotest/renderers/baseline_text.map
===================================================================
--- trunk/msautotest/renderers/baseline_text.map	                        (rev 0)
+++ trunk/msautotest/renderers/baseline_text.map	2012-03-14 13:35:43 UTC (rev 13251)
@@ -0,0 +1,86 @@
+MAP
+  EXTENT -13635099.5235881 4519599.48089225 -13629192.6958111 4524397.72866942
+  IMAGECOLOR 255 255 255
+  IMAGETYPE png
+  FONTSET "../misc/fonts.lst"
+  SIZE 500 500
+  STATUS ON
+  UNITS METERS
+  NAME "text_test"
+
+  OUTPUTFORMAT
+    NAME "AGG"
+    MIMETYPE "image/png; mode=24bit"
+    DRIVER "AGG/PNG"
+    EXTENSION "png"
+    IMAGEMODE "RGB"
+    TRANSPARENT FALSE
+  END
+
+  LAYER
+    EXTENT -13633543.0245125 4521840.27083848 -13630749.1948867 4522156.93872318
+    LABELCACHE OFF
+    NAME "text_test"
+    STATUS default
+    TEMPLATE "dummy.html"
+    TYPE ANNOTATION
+    UNITS METERS
+    FEATURE 
+      POINTS -13632840.560000000521541 4521903.099000000394881 END
+      TEXT "bq"
+    END
+    CLASS
+      LABEL
+        ANGLE 0.000000
+        ANTIALIAS TRUE
+        FONT "default"
+        SIZE 20
+        TYPE TRUETYPE
+        BUFFER 0
+        COLOR 0 0 0
+        FORCE FALSE
+        MINDISTANCE -1
+        MINFEATURESIZE -1
+        OFFSET 0 0
+        PARTIALS TRUE
+        POSITION UR
+      END
+    END
+    CLASS
+    END
+  END
+
+  LAYER
+    EXTENT -13633543.0245125 4521840.27083848 -13630749.1948867 4522156.93872318
+    LABELCACHE OFF
+    NAME "text_test2"
+    STATUS default
+    TEMPLATE "dummy.html"
+    TYPE ANNOTATION
+    UNITS METERS
+    FEATURE 
+      POINTS -13633517.220000000670552 4521903.099000000394881 END
+      TEXT "aaa"
+    END
+    CLASS
+      LABEL
+        ANGLE 0.000000
+        ANTIALIAS TRUE
+        FONT "default"
+        SIZE 20
+        TYPE TRUETYPE
+        BUFFER 0
+        COLOR 0 0 0
+        FORCE FALSE
+        MINDISTANCE -1
+        MINFEATURESIZE -1
+        OFFSET 0 0
+        PARTIALS TRUE
+        POSITION UR
+      END
+    END
+    CLASS
+    END
+  END
+
+END

Added: trunk/msautotest/renderers/expected/baseline_text.cairopng.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/baseline_text.cairopng.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/baseline_text.gif.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/baseline_text.gif.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/baseline_text.pdf.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/baseline_text.pdf.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/baseline_text.png.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/baseline_text.png.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/baseline_text.svg.png
===================================================================
--- trunk/msautotest/renderers/expected/baseline_text.svg.png	                        (rev 0)
+++ trunk/msautotest/renderers/expected/baseline_text.svg.png	2012-03-14 13:35:43 UTC (rev 13251)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500pt" height="500pt" viewBox="0 0 500 500" version="1.1">
+<defs>
+<clipPath id="clip1">
+  <rect width="500" height="500"/>
+</clipPath>
+<g id="surface6" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 194.078125 257.15625 L 194.078125 239.8125 L 194 238.515625 C 193.96875 238.027344 193.882812 237.714844 193.75 237.578125 C 193.613281 237.445312 193.296875 237.359375 192.796875 237.328125 L 191.921875 237.25 L 191.671875 237.25 L 191.671875 236.4375 L 196.65625 236.4375 L 196.65625 245.515625 C 197.925781 243.539062 199.582031 242.546875 201.625 242.546875 C 203.21875 242.546875 204.488281 243.179688 205.4375 244.4375 C 206.382812 245.699219 206.859375 247.390625 206.859375 249.515625 C 206.859375 251.871094 206.316406 253.761719 205.234375 255.1875 C 204.148438 256.617188 202.707031 257.328125 200.90625 257.328125 C 199.25 257.328125 197.832031 256.683594 196.65625 255.390625 L 196.5 255.390625 L 196.171875 257.15625 Z M 196.65625 254.375 C 198.007812 255.386719 199.3125 255.890625 200.5625 255.890625 C 201.71875 255.890625 202.597656 255.40625 203.203125 254.4375 C 203.816406 253.460938
  204.125 252.054688 204.125 250.21875 C 204.125 248.199219 203.835938 246.695312 203.265625 245.703125 C 202.691406 244.703125 201.828125 244.203125 200.671875 244.203125 C 199.960938 244.203125 199.242188 244.402344 198.515625 244.796875 C 197.796875 245.195312 197.175781 245.730469 196.65625 246.40625 Z M 219.945312 254.34375 C 218.683594 256.335938 217.03125 257.328125 214.992188 257.328125 C 213.386719 257.328125 212.109375 256.699219 211.164062 255.4375 C 210.226562 254.167969 209.757812 252.46875 209.757812 250.34375 C 209.757812 247.980469 210.296875 246.089844 211.382812 244.671875 C 212.464844 243.257812 213.902344 242.546875 215.695312 242.546875 C 217.351562 242.546875 218.765625 243.1875 219.945312 244.46875 L 219.945312 242.859375 L 222.523438 242.859375 L 222.523438 258.765625 C 222.523438 259.472656 222.578125 260.097656 222.695312 260.640625 C 222.746094 260.867188 222.839844 261.019531 222.976562 261.09375 C 223.121094 261.175781 223.402344 261.234375 223.82
 0312 261.265625 L 224.695312 261.328125 L 224.929688 261.34375 L 224.929688 262.140625 L 217.539062 262.140625 L 217.539062 261.34375 L 217.789062 261.328125 L 218.664062 261.265625 C 219.078125 261.234375 219.355469 261.175781 219.492188 261.09375 C 219.625 261.019531 219.71875 260.867188 219.773438 260.640625 C 219.886719 260.109375 219.945312 259.484375 219.945312 258.765625 Z M 219.945312 245.46875 C 218.609375 244.480469 217.308594 243.984375 216.039062 243.984375 C 214.882812 243.984375 213.996094 244.46875 213.382812 245.4375 C 212.777344 246.40625 212.476562 247.808594 212.476562 249.640625 C 212.476562 251.652344 212.761719 253.15625 213.335938 254.15625 C 213.90625 255.15625 214.773438 255.65625 215.929688 255.65625 C 216.648438 255.65625 217.371094 255.460938 218.101562 255.0625 C 218.839844 254.65625 219.453125 254.117188 219.945312 253.4375 Z M 219.945312 245.46875 "/>
+</g>
+<clipPath id="clip2">
+  <rect width="500" height="500"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 143.03125 255.0625 C 142.175781 255.90625 141.414062 256.496094 140.75 256.828125 C 140.082031 257.160156 139.332031 257.328125 138.5 257.328125 C 137.300781 257.328125 136.300781 256.949219 135.5 256.1875 C 134.695312 255.429688 134.296875 254.476562 134.296875 253.328125 C 134.296875 251.996094 134.816406 250.914062 135.859375 250.078125 C 136.523438 249.546875 137.304688 249.179688 138.203125 248.96875 C 139.097656 248.75 140.332031 248.640625 141.90625 248.640625 L 142.4375 248.640625 L 142.4375 246.875 C 142.4375 244.648438 141.59375 243.53125 139.90625 243.53125 C 139.113281 243.53125 138.414062 243.777344 137.8125 244.265625 C 137.445312 244.558594 137.21875 245.164062 137.125 246.078125 L 137.109375 246.328125 L 135.375 246.328125 L 135.375 243.734375 C 137.175781 242.945312 138.84375 242.546875 140.375 242.546875 C 141.71875 242.546875 142.8125 242.859375 143.65625 243.484375 C 144.
 175781 243.882812 144.53125 244.3125 144.71875 244.78125 C 144.90625 245.242188 145 245.90625 145 246.78125 L 145 253.078125 C 145 254.203125 145.097656 255 145.296875 255.46875 C 145.492188 255.929688 145.835938 256.15625 146.328125 256.15625 C 146.492188 256.15625 146.722656 256.117188 147.015625 256.03125 L 147.09375 257 C 146.476562 257.21875 145.921875 257.328125 145.421875 257.328125 C 144.160156 257.328125 143.363281 256.574219 143.03125 255.0625 Z M 142.4375 254.765625 L 142.4375 249.453125 L 141.84375 249.453125 C 140.332031 249.453125 139.148438 249.765625 138.296875 250.390625 C 137.453125 251.007812 137.03125 251.867188 137.03125 252.96875 C 137.03125 253.78125 137.289062 254.460938 137.8125 255 C 138.332031 255.53125 138.988281 255.796875 139.78125 255.796875 C 140.539062 255.796875 141.425781 255.453125 142.4375 254.765625 Z M 157.511719 255.0625 C 156.65625 255.90625 155.894531 256.496094 155.230469 256.828125 C 154.5625 257.160156 153.8125 257.328125 152.9804
 69 257.328125 C 151.78125 257.328125 150.78125 256.949219 149.980469 256.1875 C 149.175781 255.429688 148.777344 254.476562 148.777344 253.328125 C 148.777344 251.996094 149.296875 250.914062 150.339844 250.078125 C 151.003906 249.546875 151.785156 249.179688 152.683594 248.96875 C 153.578125 248.75 154.8125 248.640625 156.386719 248.640625 L 156.917969 248.640625 L 156.917969 246.875 C 156.917969 244.648438 156.074219 243.53125 154.386719 243.53125 C 153.59375 243.53125 152.894531 243.777344 152.292969 244.265625 C 151.925781 244.558594 151.699219 245.164062 151.605469 246.078125 L 151.589844 246.328125 L 149.855469 246.328125 L 149.855469 243.734375 C 151.65625 242.945312 153.324219 242.546875 154.855469 242.546875 C 156.199219 242.546875 157.292969 242.859375 158.136719 243.484375 C 158.65625 243.882812 159.011719 244.3125 159.199219 244.78125 C 159.386719 245.242188 159.480469 245.90625 159.480469 246.78125 L 159.480469 253.078125 C 159.480469 254.203125 159.578125 255 1
 59.777344 255.46875 C 159.972656 255.929688 160.316406 256.15625 160.808594 256.15625 C 160.972656 256.15625 161.203125 256.117188 161.496094 256.03125 L 161.574219 257 C 160.957031 257.21875 160.402344 257.328125 159.902344 257.328125 C 158.640625 257.328125 157.84375 256.574219 157.511719 255.0625 Z M 156.917969 254.765625 L 156.917969 249.453125 L 156.324219 249.453125 C 154.8125 249.453125 153.628906 249.765625 152.777344 250.390625 C 151.933594 251.007812 151.511719 251.867188 151.511719 252.96875 C 151.511719 253.78125 151.769531 254.460938 152.292969 255 C 152.8125 255.53125 153.46875 255.796875 154.261719 255.796875 C 155.019531 255.796875 155.90625 255.453125 156.917969 254.765625 Z M 171.996094 255.0625 C 171.140625 255.90625 170.378906 256.496094 169.714844 256.828125 C 169.046875 257.160156 168.296875 257.328125 167.464844 257.328125 C 166.265625 257.328125 165.265625 256.949219 164.464844 256.1875 C 163.660156 255.429688 163.261719 254.476562 163.261719 253.3281
 25 C 163.261719 251.996094 163.78125 250.914062 164.824219 250.078125 C 165.488281 249.546875 166.269531 249.179688 167.167969 248.96875 C 168.0625 248.75 169.296875 248.640625 170.871094 248.640625 L 171.402344 248.640625 L 171.402344 246.875 C 171.402344 244.648438 170.558594 243.53125 168.871094 243.53125 C 168.078125 243.53125 167.378906 243.777344 166.777344 244.265625 C 166.410156 244.558594 166.183594 245.164062 166.089844 246.078125 L 166.074219 246.328125 L 164.339844 246.328125 L 164.339844 243.734375 C 166.140625 242.945312 167.808594 242.546875 169.339844 242.546875 C 170.683594 242.546875 171.777344 242.859375 172.621094 243.484375 C 173.140625 243.882812 173.496094 244.3125 173.683594 244.78125 C 173.871094 245.242188 173.964844 245.90625 173.964844 246.78125 L 173.964844 253.078125 C 173.964844 254.203125 174.0625 255 174.261719 255.46875 C 174.457031 255.929688 174.800781 256.15625 175.292969 256.15625 C 175.457031 256.15625 175.6875 256.117188 175.980469 256
 .03125 L 176.058594 257 C 175.441406 257.21875 174.886719 257.328125 174.386719 257.328125 C 173.125 257.328125 172.328125 256.574219 171.996094 255.0625 Z M 171.402344 254.765625 L 171.402344 249.453125 L 170.808594 249.453125 C 169.296875 249.453125 168.113281 249.765625 167.261719 250.390625 C 166.417969 251.007812 165.996094 251.867188 165.996094 252.96875 C 165.996094 253.78125 166.253906 254.460938 166.777344 255 C 167.296875 255.53125 167.953125 255.796875 168.746094 255.796875 C 169.503906 255.796875 170.390625 255.453125 171.402344 254.765625 Z M 171.402344 254.765625 "/>
+</g>
+</defs>
+<g id="surface2">
+<rect x="0" y="0" width="500" height="500" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/>
+<use xlink:href="#surface6"/>
+<use xlink:href="#surface8"/>
+</g>
+</svg>

More information about the mapserver-commits mailing list