Changeset 13052 in josm


Ignore:
Timestamp:
2017-10-29T15:54:50+01:00 (3 weeks ago)
Author:
Klumbumbus
Message:

fix #15357 - prioritize tomb over grave icon, fix grave icon

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/images/presets/misc/grave.svg

    r12993 r13052  
    1010   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    1111   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    12    version="1.0"
    13    width="580"
    14    height="580"
     12   width="16"
     13   height="16"
     14   viewBox="0 0 16 16"
    1515   id="svg2"
    16    sodipodi:version="0.32"
     16   version="1.1"
    1717   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
    18    sodipodi:docname="grave.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     18   sodipodi:docname="07.svg">
     19  <defs
     20     id="defs4" />
     21  <sodipodi:namedview
     22     id="base"
     23     pagecolor="#ffffff"
     24     bordercolor="#666666"
     25     borderopacity="1.0"
     26     inkscape:pageopacity="0.0"
     27     inkscape:pageshadow="2"
     28     inkscape:zoom="48.59375"
     29     inkscape:cx="6.7346129"
     30     inkscape:cy="7.4608132"
     31     inkscape:document-units="px"
     32     inkscape:current-layer="layer1"
     33     showgrid="true"
     34     units="px"
     35     inkscape:window-width="1680"
     36     inkscape:window-height="987"
     37     inkscape:window-x="-8"
     38     inkscape:window-y="-8"
     39     inkscape:window-maximized="1"
     40     viewbox-height="16">
     41    <inkscape:grid
     42       type="xygrid"
     43       id="grid4136"
     44       originx="0"
     45       originy="0"
     46       spacingx="1"
     47       spacingy="1" />
     48  </sodipodi:namedview>
    2049  <metadata
    21      id="metadata2975">
     50     id="metadata7">
    2251    <rdf:RDF>
    2352      <cc:Work
     
    2655        <dc:type
    2756           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     57        <dc:title></dc:title>
    2858        <cc:license
    2959           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
    30         <dc:language></dc:language>
    31         <dc:title></dc:title>
    32         <dc:source>https://raw.githubusercontent.com/osmandapp/OsmAnd-resources/master/icons/svg/tourist/tomb.svg</dc:source>
    3360      </cc:Work>
    3461      <cc:License
     
    4370    </rdf:RDF>
    4471  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="1027"
    47      inkscape:window-width="1920"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      inkscape:zoom="0.92167712"
    58      inkscape:cx="301.39185"
    59      inkscape:cy="290.92215"
    60      inkscape:window-x="1272"
    61      inkscape:window-y="-8"
    62      inkscape:current-layer="svg2"
    63      showgrid="false"
    64      inkscape:window-maximized="1"
    65      inkscape:pagecheckerboard="false"
    66      borderlayer="false" />
    67   <defs
    68      id="defs4" />
    69   <path
    70      inkscape:connector-curvature="0"
    71      style="color:#000000;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;block-progression:tb;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    72      d="m 290.00001,48.422309 c -81.42694,0 -109.23127,59.580691 -109.23127,59.580691 l -49.65058,0 19.86023,357.48413 278.04322,0 19.86023,-357.48413 -49.65058,0 c 0,0 -27.80432,-59.580691 -109.23125,-59.580691 z m -91.37569,139.021611 184.92132,0 0,19.86023 -184.92132,0 z m 0,59.58069 184.92132,0 0,19.86023 -184.92132,0 z m -87.36639,244.83262 0,39.72046 357.48414,0 0,-39.72047 z"
    73      overflow="visible"
    74      id="path4"
    75      sodipodi:nodetypes="sccccccsccccccccccccccc" />
    76   <path
    77      style="fill:#000000;stroke-width:1.0849787"
    78      d="m 199.40386,197.39715 v -9.22231 h 91.68069 91.6807 v 9.22231 9.22232 h -91.6807 -91.68069 z"
    79      id="path3787"
    80      inkscape:connector-curvature="0" />
    81   <path
    82      style="fill:#000000;stroke-width:1.0849787"
    83      d="m 199.40386,257.07098 v -9.22232 h 91.68069 91.6807 v 9.22232 9.22232 h -91.6807 -91.68069 z"
    84      id="path3789"
    85      inkscape:connector-curvature="0" />
     72  <g
     73     inkscape:label="Layer 1"
     74     inkscape:groupmode="layer"
     75     id="layer1"
     76     transform="translate(0,-1037.3622)">
     77    <path
     78       inkscape:connector-curvature="0"
     79       style="color:#000000;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-transform:none;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke-width:0.03334057;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     80       d="m 8,1037.3626 c -2.73333,0 -3.66667,1.973 -3.66667,1.973 L 3,1039.3622 l 1,11 h 8 l 1,-11 -1.33333,-0.027 c 0,0 -0.93334,-1.973 -3.66667,-1.973 z m -3,4.9996 h 6 v 1 H 5 Z m 0,2 h 6 v 1 H 5 Z m -3,7 v 2 h 12 v -2 z"
     81       overflow="visible"
     82       id="path4"
     83       sodipodi:nodetypes="sccccccsccccccccccccccc" />
     84    <rect
     85       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     86       id="rect826"
     87       width="6"
     88       height="1"
     89       x="5"
     90       y="1044.3622"
     91       ry="0" />
     92    <rect
     93       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.55400002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     94       id="rect828"
     95       width="6"
     96       height="1"
     97       x="5"
     98       y="1042.3622" />
     99  </g>
    86100</svg>
  • trunk/styles/standard/elemstyles.mapcss

    r13008 r13052  
    31803180    set icon_z17;
    31813181}
     3182node[historic=archaeological_site] {
     3183    icon-image: "presets/sightseeing/archaeological.svg";
     3184    set icon_z17;
     3185}
     3186node[historic=ruins] {
     3187    icon-image: "presets/sightseeing/ruins.svg";
     3188    set icon_z17;
     3189}
     3190node[historic=battlefield] {
     3191    icon-image: "presets/sightseeing/battlefield.svg";
     3192    set icon_z17;
     3193}
     3194node[geological=palaeontological_site] {
     3195    icon-image: "presets/sightseeing/palaeontological_site.svg";
     3196    set icon_z17;
     3197}
     3198node[historic=wayside_cross] {
     3199    icon-image: "presets/religion/wayside_cross.svg";
     3200    set icon_z17;
     3201}
     3202node[historic=wayside_shrine] {
     3203    icon-image: "presets/religion/wayside_shrine.svg";
     3204    set icon_z17;
     3205}
     3206node[historic=boundary_stone] {
     3207    icon-image: "presets/landmark/boundary_stone.svg";
     3208    set icon_z17;
     3209}
     3210area[cemetery=grave] {
     3211    fill-color: grave#663300;
     3212}
     3213node[cemetery=grave] {
     3214    icon-image: "presets/misc/grave.svg";
     3215    set icon_z17;
     3216}
    31823217node[historic=tomb] {
    31833218    icon-image: "presets/misc/tomb.svg";
    3184     set icon_z17;
    3185 }
    3186 node[historic=archaeological_site] {
    3187     icon-image: "presets/sightseeing/archaeological.svg";
    3188     set icon_z17;
    3189 }
    3190 node[historic=ruins] {
    3191     icon-image: "presets/sightseeing/ruins.svg";
    3192     set icon_z17;
    3193 }
    3194 node[historic=battlefield] {
    3195     icon-image: "presets/sightseeing/battlefield.svg";
    3196     set icon_z17;
    3197 }
    3198 node[geological=palaeontological_site] {
    3199     icon-image: "presets/sightseeing/palaeontological_site.svg";
    3200     set icon_z17;
    3201 }
    3202 node[historic=wayside_cross] {
    3203     icon-image: "presets/religion/wayside_cross.svg";
    3204     set icon_z17;
    3205 }
    3206 node[historic=wayside_shrine] {
    3207     icon-image: "presets/religion/wayside_shrine.svg";
    3208     set icon_z17;
    3209 }
    3210 node[historic=boundary_stone] {
    3211     icon-image: "presets/landmark/boundary_stone.svg";
    32123219    set icon_z17;
    32133220}
     
    33053312area[landuse=cemetery] {
    33063313    fill-color: cemetery#b1efc8;
    3307 }
    3308 area[cemetery=grave] {
    3309     fill-color: grave#663300;
    3310 }
    3311 node[cemetery=grave] {
    3312     icon-image: "presets/misc/grave.svg";
    3313     set icon_z17;
    33143314}
    33153315area[landuse=village_green] {
Note: See TracChangeset for help on using the changeset viewer.