From c47eb3642ab5765858ffef51e52aea40ca3e1588 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sat, 3 Mar 2012 13:49:28 +0100
Subject: [PATCH] Reformat test and extend to verify text is centered
 correctly.

---
 tests/visual_tests/lines-1.xml |  24 ++--
 tests/visual_tests/lines.osm   | 198 ++++++++++++++++++---------------
 2 files changed, 119 insertions(+), 103 deletions(-)

diff --git a/tests/visual_tests/lines-1.xml b/tests/visual_tests/lines-1.xml
index e90947932..7df2294c7 100644
--- a/tests/visual_tests/lines-1.xml
+++ b/tests/visual_tests/lines-1.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE Map>
 <Map background-color="white" srs="+proj=latlong +datum=WGS84">
 
-  <Layer name="layer" srs="+proj=latlong +datum=WGS84">
-    <StyleName>My Style</StyleName>
-    <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">lines.osm</Parameter>
-    </Datasource>
-  </Layer>
+    <Layer name="layer" srs="+proj=latlong +datum=WGS84">
+        <StyleName>My Style</StyleName>
+        <Datasource>
+            <Parameter name="type">osm</Parameter>
+            <Parameter name="file">lines.osm</Parameter>
+        </Datasource>
+    </Layer>
 
     <Style name="My Style">
-    <Rule>
-      <LineSymbolizer/>
-      <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]</TextSymbolizer>
-    </Rule>
-  </Style>
+        <Rule>
+            <LineSymbolizer stroke-width="12" stroke="red"/>
+            <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]</TextSymbolizer>
+        </Rule>
+    </Style>
 
 </Map>
diff --git a/tests/visual_tests/lines.osm b/tests/visual_tests/lines.osm
index 0bd8f1bb0..59f01b538 100644
--- a/tests/visual_tests/lines.osm
+++ b/tests/visual_tests/lines.osm
@@ -1,101 +1,117 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.6' upload='true' generator='JOSM'>
-  <node id='-261' action='modify' visible='true' lat='-0.1332891529545811' lon='0.1504154935636508' />
-  <node id='-260' action='modify' visible='true' lat='-0.1757169043083409' lon='0.1305231545125279' />
-  <node id='-259' action='modify' visible='true' lat='-0.21978370904872907' lon='0.1464582071314902' />
-  <node id='-258' action='modify' visible='true' lat='-0.2396758881013458' lon='0.18888611371347797' />
-  <node id='-257' action='modify' visible='true' lat='-0.2237409658387897' lon='0.23295318200586176' />
-  <node id='-256' action='modify' visible='true' lat='-0.18131332528509406' lon='0.25284552105698477' />
-  <node id='-255' action='modify' visible='true' lat='-0.13724642835761083' lon='0.23691046843802263' />
-  <node id='-254' action='modify' visible='true' lat='-0.11735413850500562' lon='0.1944825618560347' />
-  <node id='-241' action='modify' visible='true' lat='-0.1655217334959332' lon='0.6833758097485068' />
-  <node id='-240' action='modify' visible='true' lat='-0.2095885646018953' lon='0.6993108623674691' />
-  <node id='-239' action='modify' visible='true' lat='-0.22948075753179561' lon='0.7417387689494566' />
-  <node id='-238' action='modify' visible='true' lat='-0.17111815748676526' lon='0.8056981762929635' />
-  <node id='-237' action='modify' visible='true' lat='-0.12705123945853983' lon='0.7897631236740015' />
-  <node id='-236' action='modify' visible='true' lat='-0.10715894205645898' lon='0.7473352170920137' />
-  <node id='-213' action='modify' visible='true' lat='-0.21354582405473055' lon='0.7858058372418406' />
-  <node id='-212' action='modify' visible='true' lat='-0.12309396245573988' lon='0.7032681487996296' />
-  <node id='-162' action='modify' visible='true' lat='-0.24021531354004155' lon='0.5353063117093004' />
-  <node id='-161' action='modify' visible='true' lat='-0.24021531354004155' lon='0.3464872162319133' />
-  <node id='-92' action='modify' visible='true' lat='-0.12211234158461091' lon='0.5358780838867709' />
-  <node id='-91' action='modify' visible='true' lat='-0.12211234158461091' lon='0.34705898840938354' />
-  <node id='-73' action='modify' visible='true' lat='-0.01764759069089235' lon='0.9034048508876044' />
-  <node id='-72' action='modify' visible='true' lat='-0.01764759069089235' lon='0.003404850887603978' />
-  <node id='-53' action='modify' visible='true' lat='0.07317849201080144' lon='0.9022677520769676' />
-  <node id='-52' action='modify' visible='true' lat='0.07317849201080144' lon='0.0022677520769677586' />
-  <node id='-22' action='modify' visible='true' lat='0.17252937235850266' lon='0.9034112964319083' />
-  <node id='-20' action='modify' visible='true' lat='0.17252937235851112' lon='0.8034112964319083' />
-  <node id='-18' action='modify' visible='true' lat='0.17252937235851112' lon='0.7034112964319083' />
-  <node id='-16' action='modify' visible='true' lat='0.17252937235851112' lon='0.6034112964319084' />
-  <node id='-14' action='modify' visible='true' lat='0.17252937235851112' lon='0.5034112964319082' />
-  <node id='-12' action='modify' visible='true' lat='0.17252937235851112' lon='0.40341129643190826' />
-  <node id='-10' action='modify' visible='true' lat='0.17252937235851112' lon='0.30341129643190823' />
-  <node id='-8' action='modify' visible='true' lat='0.17252937235851112' lon='0.20341129643190828' />
-  <node id='-6' action='modify' visible='true' lat='0.17252937235851112' lon='0.10341129643190829' />
-  <node id='-4' action='modify' visible='true' lat='0.17252937235850266' lon='0.0034112964319082647' />
-  <way id='-253' action='modify' visible='true'>
-    <nd ref='-254' />
-    <nd ref='-255' />
-    <nd ref='-256' />
-    <nd ref='-257' />
-    <nd ref='-258' />
-    <nd ref='-259' />
-    <nd ref='-260' />
-    <nd ref='-261' />
-    <nd ref='-254' />
-    <tag k='name' v='Circle' />
-    <tag k='nr' v='6' />
-  </way>
-  <way id='-214' action='modify' visible='true'>
-    <nd ref='-236' />
-    <nd ref='-237' />
-    <nd ref='-238' />
-    <nd ref='-213' />
-    <nd ref='-239' />
-    <nd ref='-240' />
+  <node id='-242' action='modify' visible='true' lat='-0.051' lon='0.9' />
+  <node id='-241' action='modify' visible='true' lat='-0.051' lon='0' />
+  <node id='-218' action='modify' visible='true' lat='0.2504581833214932' lon='0.9028405870305672' />
+  <node id='-217' action='modify' visible='true' lat='0.2504581833214932' lon='0.0028405870305671026' />
+  <node id='-198' action='modify' visible='true' lat='0.17252937235850266' lon='0.0034112964319082647' />
+  <node id='-196' action='modify' visible='true' lat='0.17252937235851112' lon='0.10341129643190829' />
+  <node id='-194' action='modify' visible='true' lat='0.17252937235851112' lon='0.20341129643190828' />
+  <node id='-192' action='modify' visible='true' lat='0.17252937235851112' lon='0.30341129643190823' />
+  <node id='-190' action='modify' visible='true' lat='0.17252937235851112' lon='0.40341129643190826' />
+  <node id='-188' action='modify' visible='true' lat='0.17252937235851112' lon='0.5034112964319082' />
+  <node id='-186' action='modify' visible='true' lat='0.17252937235851112' lon='0.6034112964319084' />
+  <node id='-184' action='modify' visible='true' lat='0.17252937235851112' lon='0.7034112964319083' />
+  <node id='-182' action='modify' visible='true' lat='0.17252937235851112' lon='0.8034112964319083' />
+  <node id='-180' action='modify' visible='true' lat='0.17252937235850266' lon='0.9034112964319083' />
+  <node id='-178' action='modify' visible='true' lat='0.07317849201080144' lon='0.0022677520769677586' />
+  <node id='-176' action='modify' visible='true' lat='0.07317849201080144' lon='0.9022677520769676' />
+  <node id='-174' action='modify' visible='true' lat='-0.0' lon='0.0' />
+  <node id='-172' action='modify' visible='true' lat='-0.0' lon='0.9' />
+  <node id='-170' action='modify' visible='true' lat='-0.12211234158461091' lon='0.34705898840938354' />
+  <node id='-168' action='modify' visible='true' lat='-0.12211234158461091' lon='0.5358780838867709' />
+  <node id='-166' action='modify' visible='true' lat='-0.24021531354004155' lon='0.3464872162319133' />
+  <node id='-164' action='modify' visible='true' lat='-0.24021531354004155' lon='0.5353063117093004' />
+  <node id='-162' action='modify' visible='true' lat='-0.12309396245573988' lon='0.7032681487996296' />
+  <node id='-160' action='modify' visible='true' lat='-0.21354582405473055' lon='0.7858058372418406' />
+  <node id='-158' action='modify' visible='true' lat='-0.10715894205645898' lon='0.7473352170920137' />
+  <node id='-156' action='modify' visible='true' lat='-0.12705123945853983' lon='0.7897631236740015' />
+  <node id='-154' action='modify' visible='true' lat='-0.17111815748676526' lon='0.8056981762929635' />
+  <node id='-152' action='modify' visible='true' lat='-0.22948075753179561' lon='0.7417387689494566' />
+  <node id='-150' action='modify' visible='true' lat='-0.2095885646018953' lon='0.6993108623674691' />
+  <node id='-148' action='modify' visible='true' lat='-0.1655217334959332' lon='0.6833758097485068' />
+  <node id='-146' action='modify' visible='true' lat='-0.11735413850500562' lon='0.1944825618560347' />
+  <node id='-144' action='modify' visible='true' lat='-0.13724642835761083' lon='0.23691046843802263' />
+  <node id='-142' action='modify' visible='true' lat='-0.18131332528509406' lon='0.25284552105698477' />
+  <node id='-140' action='modify' visible='true' lat='-0.2237409658387897' lon='0.23295318200586176' />
+  <node id='-138' action='modify' visible='true' lat='-0.2396758881013458' lon='0.18888611371347797' />
+  <node id='-136' action='modify' visible='true' lat='-0.21978370904872907' lon='0.1464582071314902' />
+  <node id='-134' action='modify' visible='true' lat='-0.1757169043083409' lon='0.1305231545125279' />
+  <node id='-132' action='modify' visible='true' lat='-0.1332891529545811' lon='0.1504154935636508' />
+  <way id='-240' action='modify' visible='true'>
     <nd ref='-241' />
-    <nd ref='-212' />
-    <nd ref='-236' />
-    <tag k='name' v='Circle with long name' />
-    <tag k='nr' v='7' />
+    <nd ref='-242' />
+    <tag k='name' v='XXX Rendered at non-integer position ABCDEFGHIJKLMNOPQRSTUVWXYZ' />
+    <tag k='nr' v='9' />
   </way>
-  <way id='-160' action='modify' visible='true'>
-    <nd ref='-161' />
-    <nd ref='-162' />
-    <tag k='name' v='Short line with long name' />
-    <tag k='nr' v='5' />
-  </way>
-  <way id='-90' action='modify' visible='true'>
-    <nd ref='-91' />
-    <nd ref='-92' />
-    <tag k='name' v='Short line' />
-    <tag k='nr' v='4' />
-  </way>
-  <way id='-71' action='modify' visible='true'>
-    <nd ref='-72' />
-    <nd ref='-73' />
+  <way id='-216' action='modify' visible='true'>
+    <nd ref='-217' />
+    <nd ref='-218' />
     <tag k='name' v='Short name' />
-    <tag k='nr' v='3' />
+    <tag k='nr' v='8' />
   </way>
-  <way id='-51' action='modify' visible='true'>
-    <nd ref='-52' />
-    <nd ref='-53' />
-    <tag k='name' v='Long line with long name' />
-    <tag k='nr' v='2' />
-  </way>
-  <way id='-25' action='modify' visible='true'>
-    <nd ref='-4' />
-    <nd ref='-6' />
-    <nd ref='-8' />
-    <nd ref='-10' />
-    <nd ref='-12' />
-    <nd ref='-14' />
-    <nd ref='-16' />
-    <nd ref='-18' />
-    <nd ref='-20' />
-    <nd ref='-22' />
+  <way id='-212' action='modify' visible='true'>
+    <nd ref='-198' />
+    <nd ref='-196' />
+    <nd ref='-194' />
+    <nd ref='-192' />
+    <nd ref='-190' />
+    <nd ref='-188' />
+    <nd ref='-186' />
+    <nd ref='-184' />
+    <nd ref='-182' />
+    <nd ref='-180' />
     <tag k='name' v='Long line with long name and many points' />
     <tag k='nr' v='1' />
   </way>
+  <way id='-210' action='modify' visible='true'>
+    <nd ref='-178' />
+    <nd ref='-176' />
+    <tag k='name' v='Long line with long name' />
+    <tag k='nr' v='2' />
+  </way>
+  <way id='-208' action='modify' visible='true'>
+    <nd ref='-174' />
+    <nd ref='-172' />
+    <tag k='name' v='XXX Rendered at integer position ABCDEFGHIJKLMNOPQRSTUVWXYZ' />
+    <tag k='nr' v='3' />
+  </way>
+  <way id='-206' action='modify' visible='true'>
+    <nd ref='-170' />
+    <nd ref='-168' />
+    <tag k='name' v='Short line' />
+    <tag k='nr' v='4' />
+  </way>
+  <way id='-204' action='modify' visible='true'>
+    <nd ref='-166' />
+    <nd ref='-164' />
+    <tag k='name' v='Short line with long name' />
+    <tag k='nr' v='5' />
+  </way>
+  <way id='-202' action='modify' visible='true'>
+    <nd ref='-158' />
+    <nd ref='-156' />
+    <nd ref='-154' />
+    <nd ref='-160' />
+    <nd ref='-152' />
+    <nd ref='-150' />
+    <nd ref='-148' />
+    <nd ref='-162' />
+    <nd ref='-158' />
+    <tag k='name' v='Circle with long name' />
+    <tag k='nr' v='7' />
+  </way>
+  <way id='-200' action='modify' visible='true'>
+    <nd ref='-146' />
+    <nd ref='-144' />
+    <nd ref='-142' />
+    <nd ref='-140' />
+    <nd ref='-138' />
+    <nd ref='-136' />
+    <nd ref='-134' />
+    <nd ref='-132' />
+    <nd ref='-146' />
+    <tag k='name' v='Circle' />
+    <tag k='nr' v='6' />
+  </way>
 </osm>