Changeset 19015 in josm


Ignore:
Timestamp:
2024-03-08T13:22:01+01:00 (2 months ago)
Author:
taylor.smock
Message:

See #22630, see #22442: Add crossing:markings icons

These icons were created by me using crossing_ref_zebra.svg as the base and
inspiration from ​osmwiki:Key:crossing:markings.

Location:
trunk/resources
Files:
11 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18997 r19015  
    651651    <chunk id="crossing_markings">
    652652        <multiselect key="crossing:markings" text="Markings" values_sort="false" values_context="crossing:markings">
    653             <list_entry value="no" />
    654             <list_entry value="yes" />
    655             <list_entry value="surface" />
    656             <list_entry value="lines" />
    657             <list_entry value="lines:paired" />
    658             <list_entry value="dashes" />
    659             <list_entry value="dots" />
    660             <list_entry value="zebra" />
    661             <list_entry value="zebra:double" />
    662             <list_entry value="zebra:paired" />
    663             <list_entry value="zebra:bicolour" />
    664             <list_entry value="ladder" />
    665             <list_entry value="ladder:skewed" />
    666             <list_entry value="ladder:paired" />
     653            <list_entry value="no" icon="presets/vehicle/crossing_unmarked.svg" />
     654            <list_entry value="yes" icon="presets/vehicle/crossing.svg" />
     655            <list_entry value="surface" icon="presets/vehicle/crossing_markings_surface.svg" />
     656            <list_entry value="lines" icon="presets/vehicle/crossing_markings_lines.svg" />
     657            <list_entry value="lines:paired" icon="presets/vehicle/crossing_markings_lines_paired.svg" />
     658            <list_entry value="dashes" icon="presets/vehicle/crossing_markings_dashes.svg" />
     659            <list_entry value="dots" icon="presets/vehicle/crossing_markings_dots.svg" />
     660            <list_entry value="zebra" icon="presets/vehicle/crossing_ref_zebra.svg" />
     661            <list_entry value="zebra:double" icon="presets/vehicle/crossing_markings_zebra_double.svg" />
     662            <list_entry value="zebra:paired" icon="presets/vehicle/crossing_markings_zebra_paired.svg" />
     663            <list_entry value="zebra:bicolour" icon="presets/vehicle/crossing_markings_zebra_bicolour.svg" />
     664            <list_entry value="ladder" icon="presets/vehicle/crossing_markings_ladder.svg" />
     665            <list_entry value="ladder:skewed" icon="presets/vehicle/crossing_markings_ladder_skewed.svg" />
     666            <list_entry value="ladder:paired" icon="presets/vehicle/crossing_markings_ladder_paired.svg" />
    667667            <list_entry value="pictograms" />
    668668        </multiselect>

  • trunk/resources/images/presets/vehicle/crossing_ref_zebra.svg

    r13363 r19015  
    33
    44<svg
    5    xmlns:dc="http://purl.org/dc/elements/1.1/"
    6    xmlns:cc="http://creativecommons.org/ns#"
    7    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    8    xmlns:svg="http://www.w3.org/2000/svg"
    9    xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    125   width="16"
    136   height="7"
    147   id="svg3044"
    158   version="1.1"
    16    inkscape:version="0.48.4 r9939"
    17    sodipodi:docname="02.svg">
     9   xmlns="http://www.w3.org/2000/svg"
     10   xmlns:svg="http://www.w3.org/2000/svg"
     11   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     12   xmlns:cc="http://creativecommons.org/ns#"
     13   xmlns:dc="http://purl.org/dc/elements/1.1/">
    1814  <defs
    1915     id="defs3046" />
    20   <sodipodi:namedview
    21      id="base"
    22      pagecolor="#ffffff"
    23      bordercolor="#666666"
    24      borderopacity="1.0"
    25      inkscape:pageopacity="0.0"
    26      inkscape:pageshadow="2"
    27      inkscape:zoom="11.2"
    28      inkscape:cx="8.3073656"
    29      inkscape:cy="-4.3213805"
    30      inkscape:document-units="px"
    31      inkscape:current-layer="layer1"
    32      showgrid="false"
    33      fit-margin-top="0"
    34      fit-margin-left="0"
    35      fit-margin-right="0"
    36      fit-margin-bottom="0"
    37      inkscape:window-width="1680"
    38      inkscape:window-height="988"
    39      inkscape:window-x="-8"
    40      inkscape:window-y="-8"
    41      inkscape:window-maximized="1" />
    4216  <metadata
    4317     id="metadata3049">
    … …  
    4822        <dc:type
    4923           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    50         <dc:title></dc:title>
    5124      </cc:Work>
    5225    </rdf:RDF>
    5326  </metadata>
    5427  <g
    55      inkscape:label="Layer 1"
    56      inkscape:groupmode="layer"
    57      id="layer1"
    58      transform="translate(-492,-423.14789)">
     28     id="layer1">
    5929    <rect
    60        style="fill:#999999;fill-opacity:1;stroke:none"
     30       style="fill:#999999"
    6131       id="rect3784"
    6232       width="16"
    6333       height="7"
    64        x="492"
    65        y="423.14789" />
     34       x="0"
     35       y="0" />
    6636    <rect
    67        style="fill:#ffffff;fill-opacity:1;stroke:none"
     37       style="fill:#ffffff"
    6838       id="rect3786"
    6939       width="6"
    7040       height="1"
    71        x="497"
    72        y="424.14789" />
     41       x="5"
     42       y="1" />
    7343    <rect
    74        style="fill:#ffffff;fill-opacity:1;stroke:none"
     44       style="fill:#ffffff"
    7545       id="rect3788"
    7646       width="6"
    7747       height="1"
    78        x="497"
    79        y="426.14789" />
     48       x="5"
     49       y="3" />
    8050    <rect
    81        style="fill:#ffffff;fill-opacity:1;stroke:none"
     51       style="fill:#ffffff"
    8252       id="rect3790"
    8353       width="6"
    8454       height="1"
    85        x="497"
    86        y="428.14789" />
     55       x="5"
     56       y="5" />
    8757    <rect
    88        style="fill:#ffffff;fill-opacity:1;stroke:none"
     58       style="fill:#ffffff"
    8959       id="rect3853"
    9060       width="2"
    9161       height="1"
    92        x="494"
    93        y="426.14789" />
     62       x="2"
     63       y="3" />
    9464    <rect
    95        style="fill:#ffffff;fill-opacity:1;stroke:none"
     65       style="fill:#ffffff"
    9666       id="rect3855"
    9767       width="1"
    9868       height="1"
    99        x="492"
    100        y="426.14789" />
     69       x="0"
     70       y="3" />
    10171    <rect
    102        style="fill:#ffffff;fill-opacity:1;stroke:none"
     72       style="fill:#ffffff"
    10373       id="rect3857"
    10474       width="2"
    10575       height="1"
    106        x="504"
    107        y="426.14789" />
     76       x="12"
     77       y="3" />
    10878    <rect
    109        style="fill:#ffffff;fill-opacity:1;stroke:none"
     79       style="fill:#ffffff"
    11080       id="rect3859"
    11181       width="1"
    11282       height="1"
    113        x="507"
    114        y="426.14789" />
     83       x="15"
     84       y="3" />
    11585  </g>
    11686</svg>

  • trunk/resources/styles/standard/elemstyles.mapcss

    r18897 r19015  
    834834    set icon_z17;
    835835}
    836 node[highway=crossing][crossing_ref=zebra] {
     836node[highway=crossing]["crossing:markings"=surface] {
     837    icon-image: "presets/vehicle/crossing_markings_surface.svg";
     838    set icon_z17;
     839}
     840node[highway=crossing]["crossing:markings"=lines] {
     841    icon-image: "presets/vehicle/crossing_markings_lines.svg";
     842    set icon_z17;
     843}
     844node[highway=crossing]["crossing:markings"="lines:paired"] {
     845    icon-image: "presets/vehicle/crossing_markings_lines_paired.svg";
     846    set icon_z17;
     847}
     848node[highway=crossing]["crossing:markings"=dashes] {
     849    icon-image: "presets/vehicle/crossing_markings_dashes.svg";
     850    set icon_z17;
     851}
     852node[highway=crossing]["crossing:markings"=dots] {
     853    icon-image: "presets/vehicle/crossing_markings_dots.svg";
     854    set icon_z17;
     855}
     856node[highway=crossing]["crossing:markings"="zebra:double"] {
     857    icon-image: "presets/vehicle/crossing_markings_zebra_double.svg";
     858    set icon_z17;
     859}
     860node[highway=crossing]["crossing:markings"="zebra:paired"] {
     861    icon-image: "presets/vehicle/crossing_markings_zebra_paired.svg";
     862    set icon_z17;
     863}
     864node[highway=crossing]["crossing:markings"="zebra:bicolour"] {
     865    icon-image: "presets/vehicle/crossing_markings_zebra_bicolour.svg";
     866    set icon_z17;
     867}
     868node[highway=crossing]["crossing:markings"=ladder] {
     869    icon-image: "presets/vehicle/crossing_markings_ladder.svg";
     870    set icon_z17;
     871}
     872node[highway=crossing]["crossing:markings"="ladder:skewed"] {
     873    icon-image: "presets/vehicle/crossing_markings_ladder_skewed.svg";
     874    set icon_z17;
     875}
     876node[highway=crossing]["crossing:markings"="ladder:paired"] {
     877    icon-image: "presets/vehicle/crossing_markings_ladder_paired.svg";
     878    set icon_z17;
     879}
     880node[highway=crossing][crossing_ref=zebra],
     881node[highway=crossing]["crossing:markings"=zebra] {
    837882    icon-image: "presets/vehicle/crossing_ref_zebra.svg";
    838883    set icon_z17;
Note: See TracChangeset for help on using the changeset viewer.