Ticket #7722: 7722.patch

File 7722.patch, 3.3 KB (added by simon04, 9 years ago)
  • styles/standard/elemstyles.xml

     
    691691   
    692692        <rule>
    693693                <condition k="highway" v="turning_circle"/>
    694                 <area colour="turningcircle#c0c0c0"/>
    695694                <icon annotate="true" src="vehicle/turning_circle.png"/>
    696695        </rule>
    697696
     
    739738        <rule>
    740739                <condition k="junction" v="roundabout"/>
    741740                <line width="2" colour="roundabout#eeeeee"/>
    742                 <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
    743                 <icon annotate="true" src="misc/deprecated.png"/>
     741                <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
    744742        </rule>
    745743
    746744<!-- cycleway tags -->
  • data/defaultpresets.xml

     
    571571            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
    572572        </item>
    573573        <separator/>
    574         <item name="Roundabout" icon="presets/roundabout.png" type="closedway">
     574        <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway">
    575575            <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
    576576                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
    577577                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:junction=roundabout"
  • data/tagchecker.cfg

     
    8888# see ticket #5017
    8989# Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000;
    9090*    : W : incline              == * && highway != *                                   # incline without highway
    91   : W : junction             == * && highway != *                                   # junction without highway
     91way  : W : junction             == * && highway != *                                   # junction without highway
    9292*    : W : lanes                == * && highway != *                                   # lanes without highway
    9393*    : W : lcn                  == * && highway != *                                   # lcn without highway
    9494*    : W : lit                  == * && highway != * && public_transport != platform   # lit without highway