Changeset 12476 in josm for trunk/test


Ignore:
Timestamp:
2017-07-13T23:02:13+02:00 (7 years ago)
Author:
michael2402
Message:

Fix #15006: Separate offset handling for ways, areas and node. Handle offset for all three of them.

Location:
trunk/test/data/renderer/way-text
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/data/renderer/way-text/data.osm

    r12465 r12476  
    11<?xml version='1.0' encoding='UTF-8'?>
    22<osm version='0.6' upload='false' generator='JOSM'>
    3   <node id='-36014' action='modify' visible='true' lat='0.95462883113' lon='0.69245784308' />
    4   <node id='-36015' action='modify' visible='true' lat='0.93599139732' lon='0.64577386324' />
    5   <node id='-36016' action='modify' visible='true' lat='0.92917836022' lon='0.61790219137' />
    6   <node id='-36017' action='modify' visible='true' lat='0.83632453647' lon='0.35060605628' />
    7   <node id='-36018' action='modify' visible='true' lat='0.66045089174' lon='0.27991121964'>
     3  <node id='-41240' action='modify' lat='0.95462883113' lon='0.69245784308' />
     4  <node id='-41242' action='modify' lat='0.93599139732' lon='0.64577386324' />
     5  <node id='-41244' action='modify' lat='0.92917836022' lon='0.61790219137' />
     6  <node id='-41246' action='modify' lat='0.83632453647' lon='0.35060605628' />
     7  <node id='-41248' action='modify' lat='0.66045089174' lon='0.27991121964'>
    88    <tag k='railway' v='level_crossing' />
    99  </node>
    10   <node id='-36019' action='modify' visible='true' lat='0.65770696505' lon='0.18596808237' />
    11   <node id='-36020' action='modify' visible='true' lat='0.59627545707' lon='0.10271148998' />
    12   <node id='-36104' action='modify' visible='true' lat='0.87616034313' lon='0.70190515136' />
    13   <node id='-36106' action='modify' visible='true' lat='0.67834542545' lon='0.84762454988' />
    14   <node id='-36108' action='modify' visible='true' lat='0.45474826559' lon='0.7793912778' />
    15   <node id='-36110' action='modify' visible='true' lat='0.41652482996' lon='0.59838396312' />
    16   <node id='-36112' action='modify' visible='true' lat='0.51601034903' lon='0.48176548874' />
    17   <node id='-36114' action='modify' visible='true' lat='0.60557084089' lon='0.63849966061' />
    18   <node id='-41946' action='modify' visible='true' lat='0.33593750068' lon='0.10942032794' />
    19   <node id='-41955' action='modify' visible='true' lat='0.33278745947' lon='0.61343550409' />
    20   <node id='-41982' action='modify' visible='true' lat='0.13433323194' lon='0.80559129' />
    21   <node id='-41983' action='modify' visible='true' lat='0.30758709437' lon='0.91899470463' />
    22   <node id='-42030' action='modify' visible='true' lat='0.1563838248' lon='0.39607895937' />
    23   <node id='-42032' action='modify' visible='true' lat='0.18473455255' lon='0.1377711816' />
    24   <way id='-36013' action='modify' visible='true'>
    25     <nd ref='-36014' />
    26     <nd ref='-36015' />
    27     <nd ref='-36016' />
    28     <nd ref='-36017' />
    29     <nd ref='-36018' />
    30     <nd ref='-36019' />
    31     <nd ref='-36020' />
     10  <node id='-41250' action='modify' lat='0.65770696505' lon='0.18596808237' />
     11  <node id='-41252' action='modify' lat='0.59627545707' lon='0.10271148998' />
     12  <node id='-41254' action='modify' lat='0.87616034313' lon='0.70190515136' />
     13  <node id='-41256' action='modify' lat='0.67834542545' lon='0.84762454988' />
     14  <node id='-41258' action='modify' lat='0.45474826559' lon='0.7793912778' />
     15  <node id='-41260' action='modify' lat='0.41652482996' lon='0.59838396312' />
     16  <node id='-41262' action='modify' lat='0.51601034903' lon='0.48176548874' />
     17  <node id='-41264' action='modify' lat='0.60557084089' lon='0.63849966061' />
     18  <node id='-41266' action='modify' lat='0.33593750068' lon='0.10942032794' />
     19  <node id='-41268' action='modify' lat='0.33278745947' lon='0.61343550409' />
     20  <node id='-41270' action='modify' lat='0.06664816464' lon='0.84078758118' />
     21  <node id='-41272' action='modify' lat='0.23990269548' lon='0.95419099581' />
     22  <node id='-41274' action='modify' lat='0.0886988082' lon='0.43127525055' />
     23  <node id='-41276' action='modify' lat='0.11704961586' lon='0.17296747278' />
     24  <node id='-41313' action='modify' lat='0.24096122132' lon='0.05685283988' />
     25  <node id='-41314' action='modify' lat='0.21659475263' lon='0.67414163902' />
     26  <node id='-41328' action='modify' lat='0.33187955464' lon='0.76055992767' />
     27  <node id='-41329' action='modify' lat='0.36121780698' lon='0.99112699543' />
     28  <node id='-41361' action='modify' lat='0.28427927747' lon='0.86907494401' />
     29  <node id='-41372' action='modify' lat='0.48191547356' lon='0.99361566664' />
     30  <node id='-41374' action='modify' lat='0.52523231165' lon='0.93405271234' />
     31  <node id='-41398' action='modify' lat='0.43589103184' lon='0.11370838717' />
     32  <node id='-41399' action='modify' lat='0.74993303663' lon='0.59833424263' />
     33  <node id='-41424' action='modify' lat='0.75264021089' lon='0.09475653807' />
     34  <node id='-41425' action='modify' lat='0.98003625368' lon='0.40340093764' />
     35  <way id='-41278' action='modify'>
     36    <nd ref='-41240' />
     37    <nd ref='-41242' />
     38    <nd ref='-41244' />
     39    <nd ref='-41246' />
     40    <nd ref='-41248' />
     41    <nd ref='-41250' />
     42    <nd ref='-41252' />
    3243    <tag k='highway' v='tertiary' />
    3344    <tag k='name' v='An der Actien-Zuckerfabrik' />
    3445    <tag k='test' v='w1' />
    3546  </way>
    36   <way id='-36105' action='modify' visible='true'>
    37     <nd ref='-36114' />
    38     <nd ref='-36112' />
    39     <nd ref='-36110' />
    40     <nd ref='-36108' />
    41     <nd ref='-36106' />
    42     <nd ref='-36104' />
     47  <way id='-41280' action='modify'>
     48    <nd ref='-41264' />
     49    <nd ref='-41262' />
     50    <nd ref='-41260' />
     51    <nd ref='-41258' />
     52    <nd ref='-41256' />
     53    <nd ref='-41254' />
    4354    <tag k='test' v='w2' />
    4455  </way>
    45   <way id='-41948' action='modify' visible='true'>
    46     <nd ref='-41946' />
    47     <nd ref='-41955' />
     56  <way id='-41282' action='modify'>
     57    <nd ref='-41266' />
     58    <nd ref='-41268' />
    4859    <tag k='name' v='گلستان ۲' />
    4960    <tag k='test' v='bidi' />
    5061  </way>
    51   <way id='-41984' action='modify' visible='true'>
    52     <nd ref='-42032' />
    53     <nd ref='-42030' />
    54     <nd ref='-41982' />
    55     <nd ref='-41983' />
     62  <way id='-41284' action='modify'>
     63    <nd ref='-41276' />
     64    <nd ref='-41274' />
     65    <nd ref='-41270' />
     66    <nd ref='-41272' />
    5667    <tag k='name' v='Wolfenbütteler Straße' />
    5768    <tag k='test' v='opacity' />
    5869  </way>
     70  <way id='-41315' action='modify'>
     71    <nd ref='-41313' />
     72    <nd ref='-41314' />
     73    <tag k='name' v='Teststraße' />
     74    <tag k='test' v='opacity' />
     75  </way>
     76  <way id='-41327' action='modify'>
     77    <nd ref='-41328' />
     78    <nd ref='-41361' />
     79    <nd ref='-41329' />
     80    <nd ref='-41372' />
     81    <nd ref='-41374' />
     82    <tag k='name' v='گلستان ۲' />
     83    <tag k='test' v='bidi' />
     84  </way>
     85  <way id='-41400' action='modify'>
     86    <nd ref='-41398' />
     87    <nd ref='-41399' />
     88    <tag k='test' v='w2' />
     89  </way>
     90  <way id='-41426' action='modify'>
     91    <nd ref='-41424' />
     92    <nd ref='-41425' />
     93    <tag k='highway' v='tertiary' />
     94    <tag k='name' v='An der A.-Z.' />
     95    <tag k='test' v='w1' />
     96  </way>
    5997</osm>

  • trunk/test/data/renderer/way-text/style.mapcss

    r12465 r12476  
    4646    color: cyan;
    4747    width: 3;
    48     text-offset-y: -2;
     48    text-offset-y: -5.5;
    4949}
Note: See TracChangeset for help on using the changeset viewer.