Ticket #4308: turning_circle_markers.patch

File turning_circle_markers.patch, 10.7 KB (added by ajashton, 7 years ago)

Uses MarkersSymbolizer? for highway=turning_circle instead of PointSymbolizer?

  • osm.xml

    diff --git a/osm.xml b/osm.xml
    index 34e09b2..1a6a4ca 100644
    a b  
    1010      &maxscale_zoom15;
    1111      &minscale_zoom16;
    1212      <Filter>[int_tc_type]='tertiary'</Filter>
    13       <PointSymbolizer file="&symbols;/turning_circle-tert-casing.18.png" allow-overlap="true"/>
     13      <MarkersSymbolizer width="8" stroke="#bbb" stroke-width="1.6" allow-overlap="true"/>
    1414    </Rule>
    1515    <Rule>
    1616      &maxscale_zoom15;
    1717      &minscale_zoom15;
    1818      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    19       <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.16.png" allow-overlap="true"/>
     19      <MarkersSymbolizer width="6" stroke="#bbb" stroke-width="1.6" allow-overlap="true"/>
    2020    </Rule>
    2121    <Rule>
    2222      &maxscale_zoom15;
    2323      &minscale_zoom15;
    2424      <Filter>[int_tc_type]='living_street'</Filter>
    25       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.16.png" allow-overlap="true"/>
     25      <MarkersSymbolizer width="5" stroke="#fff" stroke-width="1.6" allow-overlap="true"/>
    2626    </Rule>
    2727    <Rule>
    2828      &maxscale_zoom16;
    2929      &minscale_zoom16;
    3030      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    31       <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.18.png" allow-overlap="true"/>
     31      <MarkersSymbolizer width="8" stroke="#bbb" stroke-width="1.6" allow-overlap="true"/>
    3232    </Rule>
    3333    <Rule>
    3434      &maxscale_zoom16;
    3535      &minscale_zoom16;
    3636      <Filter>[int_tc_type]='service'</Filter>
    37       <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.14.png" allow-overlap="true"/>
     37      <MarkersSymbolizer width="5" stroke="#bbb" stroke-width="1.6" allow-overlap="true"/>
    3838    </Rule>
    3939    <Rule>
    4040      &maxscale_zoom16;
    4141      &minscale_zoom16;
    4242      <Filter>[int_tc_type]='living_street'</Filter>
    43       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.18.png" allow-overlap="true"/>
     43      <MarkersSymbolizer width="7" stroke="#fff" stroke-width="1.6" allow-overlap="true"/>
    4444    </Rule>
    4545    <Rule>
    4646      &maxscale_zoom17;
    4747      <Filter>[int_tc_type]='tertiary'</Filter>
    48       <PointSymbolizer file="&symbols;/turning_circle-tert-casing.24.png" allow-overlap="true"/>
     48      <MarkersSymbolizer width="13" stroke="#bbb" stroke-width="3" allow-overlap="true"/>
    4949    </Rule>
    5050    <Rule>
    5151      &maxscale_zoom17;
    5252      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    53       <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.24.png" allow-overlap="true"/>
     53      <MarkersSymbolizer width="12" stroke="#bbb" stroke-width="3" allow-overlap="true"/>
    5454    </Rule>
    5555    <Rule>
    5656      &maxscale_zoom17;
    5757      <Filter>[int_tc_type]='service'</Filter>
    58       <PointSymbolizer file="&symbols;/turning_circle-uncl-casing.16.png" allow-overlap="true"/>
     58      <MarkersSymbolizer width="6" stroke="#bbb" stroke-width="1.6" allow-overlap="true"/>
    5959    </Rule>
    6060    <Rule>
    6161      &maxscale_zoom17;
    6262      <Filter>[int_tc_type]='living_street'</Filter>
    63       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.24.png" allow-overlap="true"/>
     63      <MarkersSymbolizer width="11" stroke="#fff" stroke-width="3" allow-overlap="true"/>
    6464    </Rule>
    6565</Style>
    6666<Style name="turning_circle-fill">
     
    6868      &maxscale_zoom15;
    6969      &minscale_zoom16;
    7070      <Filter>[int_tc_type]='tertiary'</Filter>
    71       <PointSymbolizer file="&symbols;/turning_circle-tert-fill.16.png" allow-overlap="true"/>
     71      <MarkersSymbolizer width="8" fill="#ffffb3" stroke-width="0" allow-overlap="true"/>
    7272    </Rule>
    7373    <Rule>
    7474      &maxscale_zoom15;
    7575      &minscale_zoom15;
    7676      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    77       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.14.png" allow-overlap="true"/>
     77      <MarkersSymbolizer width="6" fill="#fff" stroke-width="0" allow-overlap="true"/>
    7878    </Rule>
    7979    <Rule>
    8080      &maxscale_zoom15;
    8181      &minscale_zoom15;
    8282      <Filter>[int_tc_type]='living_street'</Filter>
    83       <PointSymbolizer file="&symbols;/turning_circle-livs-fill.14.png" allow-overlap="true"/>
     83      <MarkersSymbolizer width="5" fill="#ccc" stroke-width="0" allow-overlap="true"/>
    8484    </Rule>
    8585    <Rule>
    8686      &maxscale_zoom16;
    8787      &minscale_zoom16;
    8888      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    89       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.16.png" allow-overlap="true"/>
     89      <MarkersSymbolizer width="8" fill="#fff" stroke-width="0" allow-overlap="true"/>
    9090    </Rule>
    9191    <Rule>
    9292      &maxscale_zoom16;
    9393      &minscale_zoom16;
    9494      <Filter>[int_tc_type]='service'</Filter>
    95       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.12.png" allow-overlap="true"/>
     95      <MarkersSymbolizer width="5" fill="#fff" stroke-width="0" allow-overlap="true"/>
    9696    </Rule>
    9797    <Rule>
    9898      &maxscale_zoom16;
    9999      &minscale_zoom16;
    100100      <Filter>[int_tc_type]='living_street'</Filter>
    101       <PointSymbolizer file="&symbols;/turning_circle-livs-fill.16.png" allow-overlap="true"/>
     101      <MarkersSymbolizer width="7" fill="#ccc" stroke-width="0" allow-overlap="true"/>
    102102    </Rule>
    103103    <Rule>
    104104      &maxscale_zoom17;
    105105      <Filter>[int_tc_type]='tertiary'</Filter>
    106       <PointSymbolizer file="&symbols;/turning_circle-tert-fill.22.png" allow-overlap="true"/>
     106      <MarkersSymbolizer width="13" fill="#ffffb3" stroke-width="0" allow-overlap="true"/>
    107107    </Rule>
    108108    <Rule>
    109109      &maxscale_zoom17;
    110110      <Filter>[int_tc_type]='residential' or [int_tc_type]='unclassified'</Filter>
    111       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.22.png" allow-overlap="true"/>
     111      <MarkersSymbolizer width="12" fill="#fff" stroke-width="0" allow-overlap="true"/>
    112112    </Rule>
    113113    <Rule>
    114114      &maxscale_zoom17;
    115115      <Filter>[int_tc_type]='service'</Filter>
    116       <PointSymbolizer file="&symbols;/turning_circle-uncl-fill.14.png" allow-overlap="true"/>
     116      <MarkersSymbolizer width="6" fill="#fff" stroke-width="0" allow-overlap="true"/>
    117117    </Rule>
    118118    <Rule>
    119119      &maxscale_zoom17;
    120120      <Filter>[int_tc_type]='living_street'</Filter>
    121       <PointSymbolizer file="&symbols;/turning_circle-livs-fill.22.png" allow-overlap="true"/>
     121      <MarkersSymbolizer width="11" fill="#ccc" stroke-width="0" allow-overlap="true"/>
    122122    </Rule>
    123123</Style>
    124124<Style name="highway-area-casing">