Changeset 947 in josm for trunk/styles


Ignore:
Timestamp:
2008-09-12T09:38:53+02:00 (11 years ago)
Author:
stoecker
Message:

fixed minor display bug in mappaint

Location:
trunk/styles/standard
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/styles/standard/elemstyles.xml

    r945 r947  
    6464        <rule>
    6565                <condition k="bridge" b="no"/>
    66                 <line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
     66                <line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000" priority="-50000"/>
    6767                <icon annotate="true" src="misc/deprecated.png"/>
    6868                <scale_min>1</scale_min>
  • trunk/styles/standard/overview.osm

    r789 r947  
    907907    <nd ref="-44204"/>
    908908    <nd ref="-44201"/>
    909     <tag k="bridge" v=""/>
    910     <tag k="name" v=""/>
     909    <tag k="bridge" v="yes"/>
     910    <tag k="name" v="yes"/>
    911911  </way>
    912912  <node id="-44400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00060">
     
    924924    <nd ref="-44404"/>
    925925    <nd ref="-44401"/>
    926     <tag k="bridge" v=""/>
    927     <tag k="name" v=""/>
     926    <tag k="bridge" v="no"/>
     927    <tag k="name" v="no"/>
    928928  </way>
    929929  <node id="-44600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00060">
     
    996996    <nd ref="-46204"/>
    997997    <nd ref="-46201"/>
    998     <tag k="tunnel" v=""/>
    999     <tag k="name" v=""/>
     998    <tag k="tunnel" v="yes"/>
     999    <tag k="name" v="yes"/>
    10001000  </way>
    10011001  <node id="-46400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00060">
     
    10131013    <nd ref="-46404"/>
    10141014    <nd ref="-46401"/>
    1015     <tag k="tunnel" v=""/>
    1016     <tag k="name" v=""/>
     1015    <tag k="tunnel" v="no"/>
     1016    <tag k="name" v="no"/>
    10171017  </way>
    10181018  <node id="-47000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00060">
     
    15881588    <tag k="name" v="oneway"/>
    15891589  </node>
    1590   <node id="-84000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00120"/>
     1590  <node id="-84000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00120">
     1591    <tag k="oneway" v="any"/>
     1592    <tag k="name" v="any"/>
     1593  </node>
    15911594  <node id="-84001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00116"/>
    15921595  <node id="-84002" user="overview-creator" visible="true" lat="-0.00196" lon="0.00144"/>
     
    15991602    <nd ref="-84004"/>
    16001603    <nd ref="-84001"/>
    1601     <tag k="oneway" v=""/>
    1602     <tag k="name" v=""/>
     1604    <tag k="oneway" v="any"/>
     1605    <tag k="name" v="any"/>
    16031606  </way>
    16041607  <node id="-100200" user="overview-creator" visible="true" lat="-0.00010" lon="0.00150">
     
    64906493  </way>
    64916494  <node id="-322000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00480">
    6492     <tag k="landuse" v="residential"/>
    6493     <tag k="name" v="residential"/>
     6495    <tag k="landuse" v="grass"/>
     6496    <tag k="name" v="grass"/>
    64946497  </node>
    64956498  <node id="-322001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00476"/>
     
    65036506    <nd ref="-322004"/>
    65046507    <nd ref="-322001"/>
     6508    <tag k="landuse" v="grass"/>
     6509    <tag k="name" v="grass"/>
     6510  </way>
     6511  <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
    65056512    <tag k="landuse" v="residential"/>
    65066513    <tag k="name" v="residential"/>
    6507   </way>
    6508   <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
    6509     <tag k="landuse" v="farmyard"/>
    6510     <tag k="name" v="farmyard"/>
    65116514  </node>
    65126515  <node id="-322201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00476"/>
     
    65206523    <nd ref="-322204"/>
    65216524    <nd ref="-322201"/>
     6525    <tag k="landuse" v="residential"/>
     6526    <tag k="name" v="residential"/>
     6527  </way>
     6528  <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
    65226529    <tag k="landuse" v="farmyard"/>
    65236530    <tag k="name" v="farmyard"/>
    6524   </way>
    6525   <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
    6526     <tag k="landuse" v="retail"/>
    6527     <tag k="name" v="retail"/>
    65286531  </node>
    65296532  <node id="-322401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00476"/>
     
    65376540    <nd ref="-322404"/>
    65386541    <nd ref="-322401"/>
     6542    <tag k="landuse" v="farmyard"/>
     6543    <tag k="name" v="farmyard"/>
     6544  </way>
     6545  <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
    65396546    <tag k="landuse" v="retail"/>
    65406547    <tag k="name" v="retail"/>
    6541   </way>
    6542   <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
    6543     <tag k="landuse" v="commercial"/>
    6544     <tag k="name" v="commercial"/>
    65456548  </node>
    65466549  <node id="-322601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00476"/>
     
    65546557    <nd ref="-322604"/>
    65556558    <nd ref="-322601"/>
     6559    <tag k="landuse" v="retail"/>
     6560    <tag k="name" v="retail"/>
     6561  </way>
     6562  <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
    65566563    <tag k="landuse" v="commercial"/>
    65576564    <tag k="name" v="commercial"/>
    6558   </way>
    6559   <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
    6560     <tag k="landuse" v="industrial"/>
    6561     <tag k="name" v="industrial"/>
    65626565  </node>
    65636566  <node id="-322801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00476"/>
     
    65716574    <nd ref="-322804"/>
    65726575    <nd ref="-322801"/>
     6576    <tag k="landuse" v="commercial"/>
     6577    <tag k="name" v="commercial"/>
     6578  </way>
     6579  <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
    65736580    <tag k="landuse" v="industrial"/>
    65746581    <tag k="name" v="industrial"/>
    6575   </way>
    6576   <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
    6577     <tag k="landuse" v="brownfield"/>
    6578     <tag k="name" v="brownfield"/>
    65796582  </node>
    65806583  <node id="-323001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00476"/>
     
    65886591    <nd ref="-323004"/>
    65896592    <nd ref="-323001"/>
     6593    <tag k="landuse" v="industrial"/>
     6594    <tag k="name" v="industrial"/>
     6595  </way>
     6596  <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
    65906597    <tag k="landuse" v="brownfield"/>
    65916598    <tag k="name" v="brownfield"/>
    6592   </way>
    6593   <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
    6594     <tag k="landuse" v="greenfield"/>
    6595     <tag k="name" v="greenfield"/>
    65966599  </node>
    65976600  <node id="-323201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00476"/>
     
    66056608    <nd ref="-323204"/>
    66066609    <nd ref="-323201"/>
     6610    <tag k="landuse" v="brownfield"/>
     6611    <tag k="name" v="brownfield"/>
     6612  </way>
     6613  <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
    66076614    <tag k="landuse" v="greenfield"/>
    66086615    <tag k="name" v="greenfield"/>
    6609   </way>
    6610   <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
    6611     <tag k="landuse" v="railway"/>
    6612     <tag k="name" v="railway"/>
    66136616  </node>
    66146617  <node id="-323401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00476"/>
     
    66226625    <nd ref="-323404"/>
    66236626    <nd ref="-323401"/>
     6627    <tag k="landuse" v="greenfield"/>
     6628    <tag k="name" v="greenfield"/>
     6629  </way>
     6630  <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
    66246631    <tag k="landuse" v="railway"/>
    66256632    <tag k="name" v="railway"/>
    6626   </way>
    6627   <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
    6628     <tag k="landuse" v="construction"/>
    6629     <tag k="name" v="construction"/>
    66306633  </node>
    66316634  <node id="-323601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00476"/>
     
    66396642    <nd ref="-323604"/>
    66406643    <nd ref="-323601"/>
     6644    <tag k="landuse" v="railway"/>
     6645    <tag k="name" v="railway"/>
     6646  </way>
     6647  <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
    66416648    <tag k="landuse" v="construction"/>
    66426649    <tag k="name" v="construction"/>
    6643   </way>
    6644   <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
    6645     <tag k="landuse" v="military"/>
    6646     <tag k="name" v="military"/>
    66476650  </node>
    66486651  <node id="-323801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00476"/>
     
    66566659    <nd ref="-323804"/>
    66576660    <nd ref="-323801"/>
     6661    <tag k="landuse" v="construction"/>
     6662    <tag k="name" v="construction"/>
     6663  </way>
     6664  <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
    66586665    <tag k="landuse" v="military"/>
    66596666    <tag k="name" v="military"/>
    6660   </way>
    6661   <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
    6662     <tag k="landuse" v="cemetery"/>
    6663     <tag k="name" v="cemetery"/>
    66646667  </node>
    66656668  <node id="-324001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00476"/>
     
    66736676    <nd ref="-324004"/>
    66746677    <nd ref="-324001"/>
     6678    <tag k="landuse" v="military"/>
     6679    <tag k="name" v="military"/>
     6680  </way>
     6681  <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
    66756682    <tag k="landuse" v="cemetery"/>
    66766683    <tag k="name" v="cemetery"/>
    6677   </way>
    6678   <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
    6679     <tag k="landuse" v="village_green"/>
    6680     <tag k="name" v="village_green"/>
    66816684  </node>
    66826685  <node id="-324201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00476"/>
     
    66906693    <nd ref="-324204"/>
    66916694    <nd ref="-324201"/>
     6695    <tag k="landuse" v="cemetery"/>
     6696    <tag k="name" v="cemetery"/>
     6697  </way>
     6698  <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
    66926699    <tag k="landuse" v="village_green"/>
    66936700    <tag k="name" v="village_green"/>
    6694   </way>
    6695   <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
    6696     <tag k="landuse" v="recreation_ground"/>
    6697     <tag k="name" v="recreation_ground"/>
    66986701  </node>
    66996702  <node id="-324401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00476"/>
     
    67076710    <nd ref="-324404"/>
    67086711    <nd ref="-324401"/>
     6712    <tag k="landuse" v="village_green"/>
     6713    <tag k="name" v="village_green"/>
     6714  </way>
     6715  <node id="-324600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00480">
     6716    <tag k="landuse" v="recreation_ground"/>
     6717    <tag k="name" v="recreation_ground"/>
     6718  </node>
     6719  <node id="-324601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00476"/>
     6720  <node id="-324602" user="overview-creator" visible="true" lat="-0.00226" lon="0.00504"/>
     6721  <node id="-324603" user="overview-creator" visible="true" lat="-0.00234" lon="0.00504"/>
     6722  <node id="-324604" user="overview-creator" visible="true" lat="-0.00234" lon="0.00476"/>
     6723  <way id="-324604" user="overview-creator" visible="true">
     6724    <nd ref="-324601"/>
     6725    <nd ref="-324602"/>
     6726    <nd ref="-324603"/>
     6727    <nd ref="-324604"/>
     6728    <nd ref="-324601"/>
    67096729    <tag k="landuse" v="recreation_ground"/>
    67106730    <tag k="name" v="recreation_ground"/>
     
    67286748    <nd ref="-327204"/>
    67296749    <nd ref="-327201"/>
    6730     <tag k="building" v=""/>
    6731     <tag k="name" v=""/>
     6750    <tag k="building" v="yes"/>
     6751    <tag k="name" v="yes"/>
    67326752  </way>
    67336753  <node id="-327400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00480">
  • trunk/styles/standard/overview.xsl

    r789 r947  
    117117                                <xsl:attribute name="k">name</xsl:attribute>
    118118                                <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
     119                        </xsl:element>
     120                </xsl:if>
     121                <xsl:if test="not(rule[$index]/condition/@b) and not(rule[$index]/condition/@v)">
     122                        <xsl:element name="tag">
     123                                <xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
     124                                <xsl:attribute name="v">any</xsl:attribute>
     125                        </xsl:element>
     126                        <xsl:element name="tag">
     127                                <xsl:attribute name="k">name</xsl:attribute>
     128                                <xsl:attribute name="v">any</xsl:attribute>
    119129                        </xsl:element>
    120130                </xsl:if>
     
    194204                </xsl:element>
    195205               
    196                 <xsl:element name="tag">
    197                         <xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
    198                         <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
    199                 </xsl:element>
    200                 <xsl:element name="tag">
    201                         <xsl:attribute name="k">name</xsl:attribute>
    202                         <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
    203                 </xsl:element>
     206                <xsl:if test="rule[$index]/condition/@v">
     207                        <xsl:element name="tag">
     208                                <xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
     209                                <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
     210                        </xsl:element>
     211                        <xsl:element name="tag">
     212                                <xsl:attribute name="k">name</xsl:attribute>
     213                                <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@v" /></xsl:attribute>
     214                        </xsl:element>
     215                </xsl:if>
     216                <xsl:if test="rule[$index]/condition/@b">
     217                        <xsl:element name="tag">
     218                                <xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
     219                                <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
     220                        </xsl:element>
     221                        <xsl:element name="tag">
     222                                <xsl:attribute name="k">name</xsl:attribute>
     223                                <xsl:attribute name="v"><xsl:value-of select = "rule[$index]/condition/@b" /></xsl:attribute>
     224                        </xsl:element>
     225                </xsl:if>
     226                <xsl:if test="not(rule[$index]/condition/@b) and not(rule[$index]/condition/@v)">
     227                        <xsl:element name="tag">
     228                                <xsl:attribute name="k"><xsl:value-of select = "rule[$index]/condition/@k" /></xsl:attribute>
     229                                <xsl:attribute name="v">any</xsl:attribute>
     230                        </xsl:element>
     231                        <xsl:element name="tag">
     232                                <xsl:attribute name="k">name</xsl:attribute>
     233                                <xsl:attribute name="v">any</xsl:attribute>
     234                        </xsl:element>
     235                </xsl:if>
    204236        </xsl:element>
    205237</xsl:template>
Note: See TracChangeset for help on using the changeset viewer.