Changeset 10706 in josm for trunk/styles


Ignore:
Timestamp:
2016-08-02T15:00:40+02:00 (3 years ago)
Author:
Klumbumbus
Message:

see #13217 - replace about 166 png icons by svg from https://trac.openstreetmap.org/browser/subversion/applications/share/map-icons/svg reworked most of them (white background or halo, resizing, pixel alignement), draw a few new svg icons from png derived; remove duplicate icons; reorder icons; adapt internal preset and mappaint styles

Location:
trunk/styles/standard
Files:
2 edited

Legend:

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

    r10579 r10706  
    7070}
    7171relation[restriction=no_left_turn][setting("alt_turn_icons")] {
    72     icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
     72    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg";
    7373    set icon_z17;
    7474    text: auto;
     
    8080}
    8181relation[restriction=no_right_turn][setting("alt_turn_icons")] {
    82     icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
     82    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg";
    8383    set icon_z17;
    8484    text: auto;
     
    9090}
    9191relation[restriction=no_straight_on][setting("alt_turn_icons")] {
    92     icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
     92    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg";
    9393    set icon_z17;
    9494    text: auto;
    9595}
    9696relation[restriction=no_u_turn] {
    97     icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
     97    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg";
    9898    set icon_z17;
    9999    text: auto;
    100100}
    101101relation[restriction=only_left_turn] {
    102     icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
     102    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg";
    103103    set icon_z17;
    104104    text: auto;
    105105}
    106106relation[restriction=only_right_turn] {
    107     icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
     107    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg";
    108108    set icon_z17;
    109109    text: auto;
    110110}
    111111relation[restriction=only_straight_on] {
    112     icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
     112    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg";
    113113    set icon_z17;
    114114    text: auto;
    115115}
    116116node[restriction] {
    117     icon-image: "presets/misc/deprecated.png";
     117    icon-image: "presets/misc/deprecated.svg";
    118118    set icon_z17;
    119119    text: auto;
     
    155155node[cutting?!],
    156156node[embankment?!] {
    157     icon-image: "presets/misc/deprecated.png";
     157    icon-image: "presets/misc/deprecated.svg";
    158158    set icon_z17;
    159159}
     
    188188}
    189189node[traffic_sign][access?!] {
    190     icon-image: "presets/vehicle/restriction/access.png";
     190    icon-image: "presets/vehicle/restriction/restrictions.svg";
    191191    set icon_z17;
    192192}
     
    194194node[traffic_sign][access=private][!is_prop_set(icon-image)],
    195195node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
    196     icon-image: "presets/misc/no_icon.png";
     196    icon-image: "presets/misc/no_icon.svg";
    197197    set icon_z17;
    198198}
    199199node[traffic_sign][bicycle?!] {
    200     icon-image: "presets/vehicle/restriction/bicycle.png";
     200    icon-image: "presets/vehicle/restriction/bicycle.svg";
    201201    set icon_z17;
    202202}
    203203node[traffic_sign][bicycle=designated] {
    204     icon-image: "presets/vehicle/restriction/bicycle-designated.png";
     204    icon-image: "presets/vehicle/restriction/bicycle-designated.svg";
    205205    set icon_z17;
    206206}
    207207node[traffic_sign][foot?!] {
    208     icon-image: "presets/vehicle/restriction/foot.png";
     208    icon-image: "presets/vehicle/restriction/foot.svg";
    209209    set icon_z17;
    210210}
    211211node[traffic_sign][foot=designated] {
    212     icon-image: "presets/vehicle/restriction/foot-designated.png";
     212    icon-image: "presets/vehicle/restriction/foot-designated.svg";
    213213    set icon_z17;
    214214}
    215215node[traffic_sign][goods?!],
    216216node[traffic_sign][hgv?!] {
    217     icon-image: "presets/vehicle/restriction/goods.png";
     217    icon-image: "presets/vehicle/restriction/goods.svg";
    218218    set icon_z17;
    219219}
    220220node[traffic_sign][horse?!] {
    221     icon-image: "presets/vehicle/restriction/horse.png";
     221    icon-image: "presets/vehicle/restriction/horse.svg";
    222222    set icon_z17;
    223223}
    224224node[traffic_sign][horse=designated] {
    225     icon-image: "presets/vehicle/restriction/horse-designated.png";
     225    icon-image: "presets/vehicle/restriction/horse-designated.svg";
    226226    set icon_z17;
    227227}
    228228node[traffic_sign][motorcycle?!] {
    229     icon-image: "presets/vehicle/restriction/motorbike.png";
     229    icon-image: "presets/vehicle/restriction/motorbike.svg";
    230230    set icon_z17;
    231231}
    232232node[traffic_sign][motorcar?!] {
    233     icon-image: "presets/vehicle/restriction/motorcar.png";
     233    icon-image: "presets/vehicle/restriction/motorcar.svg";
    234234    set icon_z17;
    235235}
    236236node[traffic_sign][psv?!] {
    237     icon-image: "presets/vehicle/restriction/psv.png";
     237    icon-image: "presets/vehicle/restriction/psv.svg";
    238238    set icon_z17;
    239239}
    240240node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
    241241node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
    242     icon-image: "presets/misc/no_icon.png";
     242    icon-image: "presets/misc/no_icon.svg";
    243243    set icon_z17;
    244244}
    245245node[noexit=yes] {
    246     icon-image: "presets/vehicle/restriction/dead_end.png";
     246    icon-image: "presets/vehicle/restriction/dead_end.svg";
    247247    set icon_z17;
    248248}
    249249node[traffic_sign][maxweight] {
    250     icon-image: "presets/vehicle/restriction/maxweight.png";
     250    icon-image: "presets/vehicle/restriction/maxweight.svg";
    251251    set icon_z17;
    252252}
    253253node[traffic_sign][maxheight] {
    254     icon-image: "presets/vehicle/restriction/maxheight.png";
     254    icon-image: "presets/vehicle/restriction/maxheight.svg";
    255255    set icon_z17;
    256256}
    257257node[traffic_sign][maxwidth] {
    258     icon-image: "presets/vehicle/restriction/maxwidth.png";
     258    icon-image: "presets/vehicle/restriction/maxwidth.svg";
    259259    set icon_z17;
    260260}
    261261node[traffic_sign][maxlength] {
    262     icon-image: "presets/vehicle/restriction/maxlength.png";
     262    icon-image: "presets/vehicle/restriction/maxlength.svg";
    263263    set icon_z17;
    264264}
    265265node[traffic_sign][minspeed] {
    266     icon-image: "presets/vehicle/restriction/minspeed.png";
     266    icon-image: "presets/vehicle/restriction/minspeed.svg";
    267267    set icon_z17;
    268268}
    269269node[traffic_sign][maxstay][!is_prop_set(icon-image)],
    270270node[traffic_sign][toll][!is_prop_set(icon-image)] {
    271     icon-image: "presets/misc/no_icon.png";
     271    icon-image: "presets/misc/no_icon.svg";
    272272    set icon_z17;
    273273}
     
    305305}
    306306node[building][!building?!] {
    307     icon-image: "presets/misc/landmark/building.png";
     307    icon-image: "presets/landmark/building.svg";
    308308    set icon_z17;
    309309}
    310310node[building=garage] {
    311     icon-image: "presets/misc/landuse/garages.png";
     311    icon-image: "presets/landuse/garages.png";
    312312    set icon_z17;
    313313}
    314314node[building=garages] {
    315     icon-image: "presets/misc/landuse/garages.png";
     315    icon-image: "presets/landuse/garages.png";
    316316    set icon_z17;
    317317}
     
    343343node[building=entrance],
    344344node[building:part] {
    345     icon-image: "presets/misc/deprecated.png";
     345    icon-image: "presets/misc/deprecated.svg";
    346346    set icon_z17;
    347347}
     
    357357}
    358358node[barrier=bollard] {
    359     icon-image: "presets/bollard.png";
     359    icon-image: "presets/barrier/bollard.svg";
    360360    set icon_z17;
    361361}
    362362node[barrier=gate] {
    363     icon-image: "presets/vehicle/gate.png";
     363    icon-image: "presets/barrier/gate.png";
    364364    set icon_z17;
    365365}
     
    390390node[barrier=retaining_wall],
    391391node[barrier=ditch] {
    392     icon-image: "presets/misc/deprecated.png";
     392    icon-image: "presets/misc/deprecated.svg";
    393393    set icon_z17;
    394394}
    395395node[barrier=kerb] {
    396     icon-image: "presets/vehicle/kerb.svg";
     396    icon-image: "presets/barrier/kerb.svg";
    397397    set icon_z17;
    398398}
    399399node[barrier=block] {
    400     icon-image: "presets/vehicle/block.svg";
     400    icon-image: "presets/barrier/block.svg";
    401401    set icon_z17;
    402402}
    403403node[barrier=chain] {
    404     icon-image: "presets/vehicle/chain.svg";
     404    icon-image: "presets/barrier/chain.svg";
    405405    set icon_z17;
    406406}
    407407node[barrier=stile] {
    408     icon-image: "presets/vehicle/stile.svg";
     408    icon-image: "presets/barrier/stile.svg";
    409409    set icon_z17;
    410410}
    411411node[barrier=turnstile] {
    412     icon-image: "presets/vehicle/turnstile.png";
     412    icon-image: "presets/barrier/turnstile.svg";
    413413    set icon_z17;
    414414}
    415415node[barrier=cycle_barrier] {
    416     icon-image: "presets/vehicle/cycle_barrier.png";
     416    icon-image: "presets/barrier/cycle_barrier.svg";
    417417    set icon_z17;
    418418}
    419419node[barrier=lift_gate] {
    420     icon-image: "presets/vehicle/lift_gate.png";
     420    icon-image: "presets/barrier/lift_gate.svg";
    421421    set icon_z17;
    422422}
    423423node[barrier=swing_gate] {
    424     icon-image: "presets/vehicle/swing_gate.png";
     424    icon-image: "presets/barrier/swing_gate.svg";
    425425    set icon_z17;
    426426}
     
    429429}
    430430node[barrier=toll_booth] {
    431     icon-image: "presets/vehicle/toll_booth.png";
     431    icon-image: "presets/barrier/toll_station.png";
     432    icon-width: 16;
    432433    set icon_z17;
    433434}
    434435node[barrier=entrance] {
    435     icon-image: "presets/vehicle/entrance.png";
     436    icon-image: "presets/barrier/entrance.svg";
    436437    set icon_z17;
    437438}
    438439node[barrier=cattle_grid] {
    439     icon-image: "presets/vehicle/cattle_grid.png";
     440    icon-image: "presets/barrier/cattle_grid.png";
    440441    set icon_z17;
    441442}
    442443node[barrier=border_control] {
    443     icon-image: "presets/vehicle/border_control.png";
     444    icon-image: "presets/barrier/douane.png";
    444445    set icon_z17;
    445446}
    446447node[barrier=sally_port] {
    447     icon-image: "presets/vehicle/sally_port.png";
     448    icon-image: "presets/barrier/sally_port.svg";
    448449    set icon_z17;
    449450}
    450451node[barrier=spikes] {
    451     icon-image: "presets/vehicle/spikes.svg";
     452    icon-image: "presets/barrier/spikes.svg";
    452453    set icon_z17;
    453454}
     
    457458node[barrier=jersey_barrier][!is_prop_set(icon-image)],
    458459node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
    459     icon-image: "presets/misc/no_icon.png";
     460    icon-image: "presets/misc/no_icon.svg";
    460461    set icon_z17;
    461462}
     
    744745}
    745746node[highway=ford], node[ford?] {
    746     icon-image: "presets/misc/ford.svg";
     747    icon-image: "presets/vehicle/ford.svg";
    747748    set icon_z17;
    748749}
     
    785786}
    786787node[highway=construction] {
    787     icon-image: "presets/misc/construction.png";
     788    icon-image: "presets/misc/construction.svg";
    788789    set icon_z17;
    789790}
     
    814815node[highway=bus_guideway],
    815816node[highway=platform] {
    816     icon-image: "presets/misc/deprecated.png";
     817    icon-image: "presets/misc/deprecated.svg";
    817818    set icon_z17;
    818819}
     
    10251026node[cycleway=track], node[cycleway=opposite_track],
    10261027node[cycleway=opposite] {
    1027     icon-image: "presets/misc/deprecated.png";
     1028    icon-image: "presets/misc/deprecated.svg";
    10281029    set icon_z17;
    10291030}
     
    11191120node[piste:type=sleigh],
    11201121node[piste:type=snow_park] {
    1121     icon-image: "presets/sport/skiing.png";
     1122    icon-image: "presets/sport/skiing.svg";
    11221123    set icon_z17;
    11231124}
     
    11631164node[power=cable],
    11641165node[power=minor_line] {
    1165     icon-image: "presets/misc/deprecated.png";
     1166    icon-image: "presets/misc/deprecated.svg";
    11661167    set icon_z17;
    11671168}
     
    12321233}
    12331234node[generator:source=nuclear] {
    1234     icon-image: "presets/power_source-nuclear.svg";
     1235    icon-image: "presets/power/power_source-nuclear.svg";
    12351236    set icon_z17;
    12361237}
    12371238node[generator:source=wind] {
    1238     icon-image: "presets/power_source-wind.svg";
     1239    icon-image: "presets/power/power_source-wind.svg";
    12391240    set icon_z17;
    12401241}
     
    12431244node[generator:source=wave],
    12441245node[generator:source=osmotic] {
    1245     icon-image: "presets/power_source-water.svg";
     1246    icon-image: "presets/power/power_source-water.svg";
    12461247    set icon_z17;
    12471248}
    12481249node[generator:source=geothermal] {
    1249     icon-image: "presets/power_source-geothermal.svg";
     1250    icon-image: "presets/power/power_source-geothermal.svg";
    12501251    set icon_z17;
    12511252}
    12521253node[generator:source=solar] {
    1253     icon-image: "presets/power_source-sun.svg";
     1254    icon-image: "presets/power/power_source-sun.svg";
    12541255    set icon_z17;
    12551256}
    12561257node[generator:source=coal] {
    1257     icon-image: "presets/power_source-coal.svg";
     1258    icon-image: "presets/power/power_source-coal.svg";
    12581259    set icon_z17;
    12591260}
    12601261node[generator:source=gas] {
    1261     icon-image: "presets/power_source-gas.svg";
     1262    icon-image: "presets/power/power_source-gas.svg";
    12621263    set icon_z17;
    12631264}
     
    12651266node[generator:source=biofuel],
    12661267node[generator:source=biogas] {
    1267     icon-image: "presets/power_source-biofuel.svg";
     1268    icon-image: "presets/power/power_source-biofuel.svg";
    12681269    set icon_z17;
    12691270}
     
    12711272node[generator:source=diesel],
    12721273node[generator:source=gasoline] {
    1273     icon-image: "presets/power_source-oil.svg";
     1274    icon-image: "presets/power/power_source-oil.svg";
    12741275    set icon_z17;
    12751276}
    12761277node[generator:source=waste] {
    1277     icon-image: "presets/power_source-waste.svg";
     1278    icon-image: "presets/power/power_source-waste.svg";
    12781279    set icon_z17;
    12791280}
    12801281node[power_source] {
    1281     icon-image: "presets/misc/deprecated.png";
     1282    icon-image: "presets/misc/deprecated.svg";
    12821283    set icon_z17;
    12831284}
     
    13001301}
    13011302node[man_made=beacon] {
    1302     icon-image: "presets/misc/landmark/beacon.png";
     1303    icon-image: "presets/landmark/beacon.png";
    13031304    set icon_z17;
    13041305}
    13051306node[man_made=bridge] {
    1306     icon-image: "presets/misc/deprecated.png";
     1307    icon-image: "presets/misc/deprecated.svg";
    13071308    set icon_z17;
    13081309}
     
    13121313}
    13131314node[man_made=chimney] {
    1314     icon-image: "presets/misc/landmark/chimney.png";
     1315    icon-image: "presets/landmark/chimney.png";
     1316    icon-width: 16;
    13151317    set icon_z17;
    13161318}
    13171319node[man_made=flagpole] {
    13181320    icon-image: "presets/misc/flag.png";
     1321    icon-width: 16;
    13191322    set icon_z17;
    13201323}
    13211324node[man_made=gasometer] {
    1322     icon-image: "presets/gasometer.png";
     1325    icon-image: "presets/landmark/gasometer.svg";
    13231326    icon-width: 16;
    13241327    set icon_z17;
    13251328}
    13261329node[man_made=silo] {
    1327     icon-image: "presets/silo.png";
     1330    icon-image: "presets/landmark/silo.svg";
    13281331    icon-width: 16;
    13291332    set icon_z17;
    13301333}
    13311334node[man_made=storage_tank] {
    1332     icon-image: "presets/storage_tank.png";
     1335    icon-image: "presets/landmark/storage_tank.svg";
    13331336    icon-width: 16;
    13341337    set icon_z17;
    13351338}
    13361339node[man_made=bunker_silo] {
    1337     icon-image: "presets/bunker_silo.svg";
     1340    icon-image: "presets/landmark/bunker_silo.svg";
    13381341    set icon_z17;
    13391342}
     
    13531356}
    13541357node[man_made=lighthouse] {
    1355     icon-image: "presets/misc/landmark/lighthouse.png";
     1358    icon-image: "presets/landmark/lighthouse.svg";
    13561359    set icon_z17;
    13571360}
    13581361node[man_made=monitoring_station] {
    1359     icon-image: "presets/misc/landmark/measurement_station.png";
     1362    icon-image: "presets/landmark/measurement_station.png";
    13601363    set icon_z17;
    13611364}
    13621365node[man_made=mineshaft] {
    1363     icon-image: "presets/misc/landmark/mine.png";
     1366    icon-image: "presets/landmark/mine.svg";
    13641367    set icon_z17;
    13651368}
     
    13721375}
    13731376node[man_made=crane] {
    1374     icon-image: "presets/misc/landmark/crane.png";
     1377    icon-image: "presets/landmark/crane.svg";
    13751378    set icon_z17;
    13761379}
    13771380node[man_made=adit] {
    1378     icon-image: "presets/misc/landmark/adit.png";
     1381    icon-image: "presets/landmark/adit.svg";
    13791382    set icon_z17;
    13801383}
     
    14211424node[man_made=embankment],
    14221425node[man_made=pipeline] {
    1423     icon-image: "presets/misc/deprecated.png";
     1426    icon-image: "presets/misc/deprecated.svg";
    14241427    set icon_z17;
    14251428}
    14261429node[man_made=petroleum_well][!is_prop_set(icon-image)] {
    1427     icon-image: "presets/misc/no_icon.png";
     1430    icon-image: "presets/misc/no_icon.svg";
    14281431    set icon_z17;
    14291432}
     
    14411444}
    14421445node[man_made=reservoir_covered] {
    1443     icon-image: "presets/misc/landmark/reservoir_covered.png";
     1446    icon-image: "presets/landmark/reservoir_covered.svg";
    14441447    set icon_z17;
    14451448}
    14461449node[man_made=surveillance] {
    1447     icon-image: "presets/surveillance.png";
     1450    icon-image: "presets/service/surveillance.png";
    14481451    icon-width: 16;
    14491452    set icon_z17;
    14501453}
    14511454node[man_made=survey_point] {
    1452     icon-image: "presets/misc/landmark/survey_point.png";
     1455    icon-image: "presets/landmark/survey_point.svg";
    14531456    set icon_z17;
    14541457}
    14551458node[man_made=tower] {
    1456     icon-image: "presets/misc/landmark/tower.png";
     1459    icon-image: "presets/landmark/tower.png";
    14571460    set icon_z17;
    14581461}
    14591462node[man_made=wastewater_plant] {
    1460     icon-image: "presets/misc/landmark/wastewater_plant.png";
     1463    icon-image: "presets/landmark/wastewater_plant.svg";
    14611464    set icon_z17;
    14621465}
    14631466node[man_made=watermill] {
    1464     icon-image: "presets/misc/landmark/watermill.png";
     1467    icon-image: "presets/landmark/watermill.png";
    14651468    set icon_z17;
    14661469}
    14671470node[man_made=water_tower] {
    1468     icon-image: "presets/misc/landmark/water_tower.svg";
     1471    icon-image: "presets/landmark/water_tower.svg";
    14691472    set icon_z17;
    14701473}
    14711474node[man_made=water_well] {
    1472     icon-image: "presets/misc/landmark/water_well.png";
     1475    icon-image: "presets/landmark/water_well.svg";
    14731476    set icon_z17;
    14741477}
    14751478node[man_made=windmill] {
    1476     icon-image: "presets/misc/landmark/windmill.png";
     1479    icon-image: "presets/landmark/windmill.svg";
    14771480    set icon_z17;
    14781481}
    14791482node[man_made=works] {
    1480     icon-image: "presets/misc/landmark/works.png";
     1483    icon-image: "presets/landmark/works.svg";
    14811484    set icon_z17;
    14821485}
    14831486node[man_made=water_works] {
    1484     icon-image: "presets/misc/landmark/water_works.png";
     1487    icon-image: "presets/landmark/water_works.png";
     1488    icon-width: 16;
    14851489    set icon_z17;
    14861490}
     
    14901494}
    14911495node[man_made=cutline] {
    1492     icon-image: "presets/misc/deprecated.png";
     1496    icon-image: "presets/misc/deprecated.svg";
    14931497    set icon_z17;
    14941498}
     
    16271631}
    16281632node[leisure=fitness_centre] {
    1629     icon-image: "presets/fitness_centre.png";
     1633    icon-image: "presets/sport/fitness_centre.png";
    16301634    icon-width: 16;
    16311635    set icon_z17;
     
    16361640}
    16371641node[leisure=horse_riding] {
    1638     icon-image: "presets/equestrian.png";
     1642    icon-image: "presets/leisure/equestrian.png";
    16391643    icon-width: 16;
    16401644    set icon_z17;
     
    17001704}
    17011705node[leisure=park] {
    1702     icon-image: "presets/misc/deprecated.png";
     1706    icon-image: "presets/misc/deprecated.svg";
    17031707    set icon_z17;
    17041708}
    17051709node[leisure=playground] {
    1706     icon-image: "presets/leisure/playground.png";
     1710    icon-image: "presets/leisure/playground.svg";
    17071711    set icon_z17;
    17081712}
     
    17271731}
    17281732node[leisure=swimming_pool] {
    1729     icon-image: "presets/sport/pool.png";
     1733    icon-image: "presets/sport/swimming.svg";
    17301734    set icon_z17;
    17311735}
     
    17461750}
    17471751node[leisure=dog_park] {
    1748     icon-image: "presets/dogpark.png";
     1752    icon-image: "presets/leisure/dogpark.png";
    17491753    icon-width: 16;
    17501754    set icon_z17;
     
    17521756node[leisure=ice_rink] {
    17531757    icon-image: "presets/sport/ice_hockey.png";
     1758    icon-width: 16;
    17541759    set icon_z17;
    17551760}
    17561761node[leisure=sauna] {
    17571762    icon-image: "presets/leisure/sauna.png";
     1763    icon-width: 16;
    17581764    set icon_z17;
    17591765}
     
    19201926node[shop=convenience] {
    19211927    icon-image: "presets/shop/convenience.png";
     1928    icon-width: 16;
    19221929    set icon_z17;
    19231930}
     
    19311938}
    19321939node[shop=bicycle] {
    1933     icon-image: "presets/sport/bicycle.png";
     1940    icon-image: "presets/shop/bicycle.svg";
    19341941    set icon_z17;
    19351942}
    19361943node[shop=doityourself] {
    1937     icon-image: "presets/shop/diy_store.png";
     1944    icon-image: "presets/shop/diy_store.svg";
    19381945    icon-width: 16;
    19391946    icon-height: 16;
     
    19421949node[shop=dry_cleaning],
    19431950node[shop=laundry] {
    1944     icon-image: "presets/shop/laundry.png";
     1951    icon-image: "presets/shop/laundry.svg";
    19451952    set icon_z17;
    19461953}
    19471954node[shop=outdoor] {
    1948     icon-image: "presets/shop/outdoor.png";
     1955    icon-image: "presets/shop/outdoor.svg";
    19491956    set icon_z17;
    19501957}
    19511958node[shop=kiosk] {
    1952     icon-image: "presets/shop/kiosk.png";
     1959    icon-image: "presets/shop/kiosk.svg";
    19531960    set icon_z17;
    19541961}
    19551962node[shop=beverages] {
    1956     icon-image: "presets/shop/beverages.png";
     1963    icon-image: "presets/shop/beverages.svg";
    19571964    set icon_z17;
    19581965}
    19591966node[shop=alcohol] {
    1960     icon-image: "presets/shop/alcohol.png";
     1967    icon-image: "presets/shop/alcohol.svg";
    19611968    set icon_z17;
    19621969}
     
    19671974node[shop=boutique] {
    19681975    icon-image: "presets/shop/boutique.png";
     1976    icon-width: 16;
    19691977    set icon_z17;
    19701978}
    19711979node[shop=car],
    19721980node[shop=car_dealer] {
    1973     icon-image: "presets/vehicle.png";
     1981    icon-image: "presets/shop/vehicle.svg";
    19741982    set icon_z17;
    19751983}
    19761984node[shop=car_repair] {
    1977     icon-image: "presets/vehicle/repair_shop.png";
     1985    icon-image: "presets/vehicle/repair_shop.svg";
    19781986    set icon_z17;
    19791987}
    19801988node[shop=tyres] {
    1981     icon-image: "presets/vehicle/tyres.png";
     1989    icon-image: "presets/vehicle/tyres.svg";
    19821990    set icon_z17;
    19831991}
    19841992node[shop=chemist] {
    1985     icon-image: "presets/shop/chemist.png";
     1993    icon-image: "presets/shop/chemist.svg";
    19861994    set icon_z17;
    19871995}
     
    19911999}
    19922000node[shop=clothes] {
    1993     icon-image: "presets/shop/clothes.png";
     2001    icon-image: "presets/shop/clothes.svg";
    19942002    set icon_z17;
    19952003}
    19962004node[shop=computer] {
    1997     icon-image: "presets/shop/computer.png";
     2005    icon-image: "presets/shop/computer.svg";
    19982006    set icon_z17;
    19992007}
    20002008node[shop=confectionery] {
    2001     icon-image: "presets/shop/groceries/confectionery.png";
     2009    icon-image: "presets/shop/groceries/confectionery.svg";
    20022010    set icon_z17;
    20032011}
    20042012node[shop=copyshop] {
    20052013    icon-image: "presets/shop/copyshop.png";
     2014    icon-width: 16;
    20062015    set icon_z17;
    20072016}
    20082017node[shop=curtain] {
    20092018    icon-image: "presets/shop/curtain.png";
     2019    icon-width: 16;
    20102020    set icon_z17;
    20112021}
    20122022node[shop=cycle_repair] {
    2013     icon-image: "presets/sport/bicycle.png";
     2023    icon-image: "presets/shop/bicycle.svg";
    20142024    set icon_z17;
    20152025}
    20162026node[shop=department_store] {
    2017     icon-image: "presets/shop/mall.png";
     2027    icon-image: "presets/shop/mall.svg";
    20182028    set icon_z17;
    20192029}
    20202030node[shop=deli] {
    20212031    icon-image: "presets/shop/groceries/deli.png";
     2032    icon-width: 16;
    20222033    set icon_z17;
    20232034}
    20242035node[shop=electronics] {
    2025     icon-image: "presets/shop/electronics.png";
     2036    icon-image: "presets/shop/electronics.svg";
    20262037    set icon_z17;
    20272038}
    20282039node[shop=erotic] {
    20292040    icon-image: "presets/shop/erotic.png";
     2041    icon-width: 16;
    20302042    set icon_z17;
    20312043}
    20322044node[shop=furniture] {
    2033     icon-image: "presets/shop/furniture.png";
     2045    icon-image: "presets/shop/furniture.svg";
    20342046    set icon_z17;
    20352047}
    20362048node[shop=fabric] {
    20372049    icon-image: "presets/shop/fabric.png";
     2050    icon-width: 16;
    20382051    set icon_z17;
    20392052}
    20402053node[shop=florist] {
    2041     icon-image: "presets/shop/florist.png";
     2054    icon-image: "presets/shop/florist.svg";
    20422055    set icon_z17;
    20432056}
    20442057node[shop=frame] {
    20452058    icon-image: "presets/shop/frame.png";
     2059    icon-width: 16;
    20462060    set icon_z17;
    20472061}
    20482062node[shop=gift] {
    2049     icon-image: "presets/present.svg";
     2063    icon-image: "presets/shop/present.svg";
    20502064    set icon_z17;
    20512065}
    20522066node[shop=greengrocer] {
    20532067    icon-image: "presets/shop/groceries/greengrocer.png";
     2068    icon-width: 16;
    20542069    set icon_z17;
    20552070}
    20562071node[shop=garden_centre] {
    2057     icon-image: "presets/shop/garden_centre.png";
     2072    icon-image: "presets/shop/garden_centre.svg";
    20582073    set icon_z17;
    20592074}
    20602075node[shop=hairdresser] {
    2061     icon-image: "presets/shop/hairdresser.png";
     2076    icon-image: "presets/shop/hairdresser.svg";
    20622077    set icon_z17;
    20632078}
    20642079node[shop=hardware] {
    20652080    icon-image: "presets/shop/hardware.png";
     2081    icon-width: 16;
    20662082    set icon_z17;
    20672083}
    20682084node[shop=hearing_aids] {
    20692085    icon-image: "presets/shop/hearing_aids.png";
     2086    icon-height: 16;
    20702087    set icon_z17;
    20712088}
     
    20792096}
    20802097node[shop=jewelry] {
    2081     icon-image: "presets/shop/jewelry.png";
     2098    icon-image: "presets/shop/jewelry.svg";
    20822099    set icon_z17;
    20832100}
    20842101node[shop=kitchen] {
    20852102    icon-image: "presets/shop/kitchen.png";
     2103    icon-width: 16;
    20862104    set icon_z17;
    20872105}
    20882106node[shop=mall] {
    2089     icon-image: "presets/shop/mall.png";
     2107    icon-image: "presets/shop/mall.svg";
    20902108    set icon_z17;
    20912109}
    20922110node[shop=mobile_phone] {
    20932111    icon-image: "presets/shop/mobile_phone.png";
     2112    icon-width: 16;
    20942113    set icon_z17;
    20952114}
    20962115node[shop=motorcycle] {
    2097     icon-image: "presets/vehicle/motorbike.png";
     2116    icon-image: "presets/vehicle/motorbike.svg";
    20982117    set icon_z17;
    20992118}
    21002119node[shop=musical_instrument] {
    21012120    icon-image: "presets/shop/musical_instrument.png";
     2121    icon-height: 16;
    21022122    set icon_z17;
    21032123}
     
    21162136node[shop=paint] {
    21172137    icon-image: "presets/shop/paint.png";
     2138    icon-width: 16;
    21182139    set icon_z17;
    21192140}
    21202141node[shop=pawnbroker] {
    2121     icon-image: "presets/pawnbroker.svg";
     2142    icon-image: "presets/shop/pawnbroker.svg";
    21222143    set icon_z17;
    21232144}
    21242145node[shop=seafood] {
    21252146    icon-image: "presets/shop/groceries/seafood.png";
     2147    icon-width: 16;
    21262148    set icon_z17;
    21272149}
    21282150node[shop=shoes] {
    2129     icon-image: "presets/shop/shoes.png";
     2151    icon-image: "presets/shop/shoes.svg";
    21302152    set icon_z17;
    21312153}
    21322154node[shop=sports] {
    2133     icon-image: "presets/sport/multi.png";
     2155    icon-image: "presets/sport/multi.svg";
    21342156    set icon_z17;
    21352157}
    21362158node[shop=stationery] {
    21372159    icon-image: "presets/shop/stationery.png";
     2160    icon-width: 16;
    21382161    set icon_z17;
    21392162}
    21402163node[shop=tailor] {
    2141     icon-image: "presets/shop/tailor.png";
     2164    icon-image: "presets/shop/tailor.svg";
    21422165    set icon_z17;
    21432166}
    21442167node[shop=travel_agency] {
    2145     icon-image: "presets/travel.png";
     2168    icon-image: "presets/shop/travel.png";
    21462169    icon-width: 16;
    21472170    set icon_z17;
    21482171}
    21492172node[shop=toys] {
    2150     icon-image: "presets/shop/toys.png";
     2173    icon-image: "presets/shop/toys.svg";
    21512174    set icon_z17;
    21522175}
    21532176node[shop=vacuum_cleaner] {
    21542177    icon-image: "presets/shop/vacuum_cleaner.png";
     2178    icon-height: 16;
    21552179    set icon_z17;
    21562180}
    21572181node[shop=variety_store] {
    21582182    icon-image: "presets/shop/variety_store.png";
     2183    icon-width: 16;
    21592184    set icon_z17;
    21602185}
     
    21642189}
    21652190node[shop=bookmaker] {
    2166     icon-image: "presets/lottery.svg";
     2191    icon-image: "presets/shop/lottery.svg";
    21672192    set icon_z17;
    21682193}
    21692194node[shop=lottery] {
    2170     icon-image: "presets/lottery.svg";
     2195    icon-image: "presets/shop/lottery.svg";
    21712196    set icon_z17;
    21722197}
    21732198/* duplicate of shopping_centre? */
    21742199node[shop=shopping_centre] {
    2175     icon-image: "presets/shop/mall.png";
     2200    icon-image: "presets/shop/mall.svg";
    21762201    set icon_z17;
    21772202}
     
    22412266}
    22422267node[shop=farm] {
    2243     icon-image: "presets/apple.png";
     2268    icon-image: "presets/shop/apple.png";
    22442269    set icon_z17;
    22452270}
     
    22732298}
    22742299node[emergency=phone] {
    2275     icon-image: "presets/vehicle/emergency_phone.png";
     2300    icon-image: "presets/vehicle/emergency_phone.svg";
    22762301    set icon_z17;
    22772302}
    22782303node[emergency=defibrillator] {
    2279     icon-image: "presets/aed.svg";
     2304    icon-image: "presets/emergency/aed.svg";
    22802305    set icon_z17;
    22812306}
    22822307node[emergency=fire_hydrant] {
    2283     icon-image: "presets/service/fire_hydrant.png";
     2308    icon-image: "presets/service/fire_hydrant.svg";
    22842309    set icon_z17;
    22852310}
     
    23492374node[amenity=cafe] {
    23502375    icon-image: "presets/food/cafe.png";
     2376    icon-width: 16;
    23512377    set icon_z17;
    23522378}
     
    23652391}
    23662392node[amenity=bar] {
    2367     icon-image: "presets/food/bar.png";
     2393    icon-image: "presets/food/bar.svg";
    23682394    set icon_z17;
    23692395}
     
    23962422}
    23972423node[amenity=parking] {
    2398     icon-image: "presets/vehicle/parking.png";
     2424    icon-image: "presets/vehicle/parking/parking.svg";
    23992425    set icon_z17;
    24002426}
    24012427node[amenity=parking_entrance] {
    2402     icon-image: "presets/vehicle/parking.png";
     2428    icon-image: "presets/vehicle/parking/parking.svg";
    24032429    set icon_z17;
    24042430}
    24052431node[amenity=parking_entrance][parking=multi-storey],
    24062432node[amenity=parking][parking=multi-storey] {
    2407     icon-image: "presets/vehicle/parking/multi-storey.png";
     2433    icon-image: "presets/vehicle/parking/multi-storey.svg";
    24082434    set icon_z17;
    24092435}
    24102436node[amenity=parking_entrance][parking=underground],
    24112437node[amenity=parking][parking=underground] {
    2412     icon-image: "presets/vehicle/parking/underground.png";
     2438    icon-image: "presets/vehicle/parking/underground.svg";
    24132439    set icon_z17;
    24142440}
    24152441node[amenity=motorcycle_parking] {
    2416     icon-image: "presets/vehicle/parking/motorbike.png";
     2442    icon-image: "presets/vehicle/parking/motorbike.svg";
    24172443    set icon_z17;
    24182444}
    24192445node[amenity=bicycle_parking] {
    2420     icon-image: "presets/vehicle/parking/bicycle.png";
     2446    icon-image: "presets/vehicle/parking/bicycle.svg";
    24212447    set icon_z17;
    24222448}
     
    24262452}
    24272453node[amenity=parking_space][wheelchair?] {
    2428     icon-image: "presets/vehicle/parking/handicapped.png";
     2454    icon-image: "presets/vehicle/parking/handicapped.svg";
    24292455    set icon_z17;
    24302456}
    24312457node[amenity=bicycle_rental] {
    2432     icon-image: "presets/vehicle/rental/bicycle.png";
     2458    icon-image: "presets/vehicle/bicycle_rental.svg";
    24332459    set icon_z17;
    24342460}
     
    24382464}
    24392465node[amenity=car_rental] {
    2440     icon-image: "presets/vehicle/rental/car.png";
     2466    icon-image: "presets/vehicle/car_rental.svg";
    24412467    set icon_z17;
    24422468}
    24432469node[amenity=car_sharing] {
    2444     icon-image: "presets/vehicle/car_sharing.png";
     2470    icon-image: "presets/vehicle/car_sharing.svg";
    24452471    set icon_z17;
    24462472}
    24472473node[amenity=car_wash] {
    2448     icon-image: "presets/vehicle/car_wash.png";
     2474    icon-image: "presets/vehicle/car_wash.svg";
    24492475    set icon_z17;
    24502476}
    24512477node[amenity=taxi] {
    2452     icon-image: "presets/transport/taxi.png";
     2478    icon-image: "presets/transport/taxi.svg";
    24532479    set icon_z17;
    24542480}
    24552481node[amenity=fuel] {
    2456     icon-image: "presets/vehicle/fuel.png";
     2482    icon-image: "presets/vehicle/fuel.svg";
    24572483    set icon_z17;
    24582484}
    24592485node[amenity=charging_station] {
    2460     icon-image: "presets/vehicle/fuel/charging_station.png";
     2486    icon-image: "presets/vehicle/charging_station.png";
    24612487    set icon_z17;
    24622488}
     
    24662492}
    24672493node[amenity=telephone] {
    2468     icon-image: "presets/service/telephone.png";
     2494    icon-image: "presets/service/telephone.svg";
    24692495    set icon_z17;
    24702496}
     
    24802506}
    24812507node[amenity=toilets] {
    2482     icon-image: "presets/service/toilets.png";
     2508    icon-image: "presets/service/toilets.svg";
    24832509    set icon_z17;
    24842510}
     
    24982524}
    24992525node[amenity=waste_basket] {
    2500     icon-image: "presets/service/recycling/trash-bin.png";
     2526    icon-image: "presets/service/recycling/trash-bin.svg";
    25012527    set icon_z17;
    25022528}
     
    25152541}
    25162542node[amenity=townhall] {
    2517     icon-image: "presets/townhall.png";
     2543    icon-image: "presets/service/townhall.png";
    25182544    set icon_z17;
    25192545}
    25202546node[amenity=embassy] {
    2521     icon-image: "presets/service/administration/embassy.png";
     2547    icon-image: "presets/service/embassy.png";
     2548    icon-width: 16;
    25222549    set icon_z17;
    25232550}
    25242551node[amenity=community_centre] {
    25252552    icon-image: "presets/service/community_centre.png";
     2553    icon-width: 16;
    25262554    set icon_z17;
    25272555}
     
    25352563}
    25362564node[amenity=water_point] {
    2537     icon-image: "presets/accommodation/camping/water.png";
     2565    icon-image: "presets/accommodation/water.svg";
    25382566    set icon_z17;
    25392567}
     
    25552583}
    25562584node[amenity=place_of_worship] {
    2557     icon-image: "presets/religion.png";
     2585    icon-image: "presets/religion/religion.svg";
    25582586    set icon_z17;
    25592587}
    25602588node[amenity=place_of_worship][religion=bahai] {
    2561     icon-image: "presets/religion/bahai.png";
     2589    icon-image: "presets/religion/bahai.svg";
    25622590    set icon_z17;
    25632591}
    25642592node[amenity=place_of_worship][religion=buddhist] {
    2565     icon-image: "presets/religion/buddhism.png";
     2593    icon-image: "presets/religion/buddhism.svg";
    25662594    set icon_z17;
    25672595}
    25682596node[amenity=place_of_worship][religion=christian] {
    2569     icon-image: "presets/religion/church.png";
     2597    icon-image: "presets/religion/church.svg";
    25702598    set icon_z17;
    25712599}
    25722600node[amenity=place_of_worship][religion=hindu] {
    2573     icon-image: "presets/religion/hinduism.png";
     2601    icon-image: "presets/religion/hinduism.svg";
    25742602    set icon_z17;
    25752603}
    25762604node[amenity=place_of_worship][religion=jain] {
    2577     icon-image: "presets/religion/jainism.png";
     2605    icon-image: "presets/religion/jainism.svg";
    25782606    set icon_z17;
    25792607}
    25802608node[amenity=place_of_worship][religion=jewish] {
    2581     icon-image: "presets/religion/jewish.png";
     2609    icon-image: "presets/religion/jewish.svg";
    25822610    set icon_z17;
    25832611}
    25842612node[amenity=place_of_worship][religion=muslim] {
    2585     icon-image: "presets/religion/muslim.png";
     2613    icon-image: "presets/religion/muslim.svg";
    25862614    set icon_z17;
    25872615}
    25882616node[amenity=place_of_worship][religion=sikh] {
    2589     icon-image: "presets/religion/sikhism.png";
     2617    icon-image: "presets/religion/sikhism.svg";
    25902618    set icon_z17;
    25912619}
    25922620node[amenity=place_of_worship][religion=shinto] {
    2593     icon-image: "presets/religion/shinto.png";
     2621    icon-image: "presets/religion/shinto.svg";
    25942622    set icon_z17;
    25952623}
    25962624node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
    2597     icon-image: "presets/misc/no_icon.png";
     2625    icon-image: "presets/misc/no_icon.svg";
    25982626    set icon_z17;
    25992627}
    26002628node[amenity=place_of_worship][religion=taoist] {
    2601     icon-image: "presets/religion/taoism.png";
     2629    icon-image: "presets/religion/taoism.svg";
    26022630    set icon_z17;
    26032631}
    26042632node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
    2605     icon-image: "presets/misc/no_icon.png";
     2633    icon-image: "presets/misc/no_icon.svg";
    26062634    set icon_z17;
    26072635}
    26082636node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
    2609     icon-image: "presets/misc/no_icon.png";
     2637    icon-image: "presets/misc/no_icon.svg";
    26102638    set icon_z17;
    26112639}
    26122640node[amenity=grave_yard] {
    2613     icon-image: "presets/rendering/landuse/cemetery.png";
     2641    icon-image: "presets/misc/landuse/graveyard.svg";
    26142642    set icon_z17;
    26152643}
    26162644node[amenity=crematorium][!is_prop_set(icon-image)] {
    2617     icon-image: "presets/misc/no_icon.png";
     2645    icon-image: "presets/misc/no_icon.svg";
    26182646    set icon_z17;
    26192647}
     
    26322660node[amenity=school] {
    26332661    icon-image: "presets/education/school.png";
     2662    icon-width: 16;
    26342663    set icon_z17;
    26352664}
     
    26432672}
    26442673node[amenity=kindergarten] {
    2645     icon-image: "presets/education/kindergarten.png";
     2674    icon-image: "presets/education/kindergarten.svg";
    26462675    set icon_z17;
    26472676}
     
    27342763}
    27352764node[amenity=police] {
    2736     icon-image: "presets/service/police.png";
     2765    icon-image: "presets/service/police.svg";
    27372766    set icon_z17;
    27382767}
     
    27422771}
    27432772node[amenity=fire_station] {
    2744     icon-image: "presets/service/firebrigade.png";
     2773    icon-image: "presets/service/firebrigade.svg";
    27452774    set icon_z17;
    27462775}
    27472776node[amenity=bus_station] {
    2748     icon-image: "presets/transport/bus.png";
     2777    icon-image: "presets/transport/bus_old.svg";
    27492778    set icon_z17;
    27502779}
     
    27542783}
    27552784node[amenity=theatre] {
    2756     icon-image: "presets/theater.png";
     2785    icon-image: "presets/leisure/theater.png";
    27572786    icon-width: 16;
    27582787    set icon_z17;
    27592788}
    27602789node[amenity=cinema] {
    2761     icon-image: "presets/leisure/cinema.png";
     2790    icon-image: "presets/leisure/cinema.svg";
    27622791    set icon_z17;
    27632792}
     
    27672796}
    27682797node[amenity=courthouse] {
    2769     icon-image: "presets/service/administration/courthouse.svg";
     2798    icon-image: "presets/service/courthouse.svg";
    27702799    set icon_z17;
    27712800}
    27722801node[amenity=prison] {
    2773     icon-image: "presets/service/administration/prison.svg";
     2802    icon-image: "presets/service/prison.svg";
    27742803    set icon_z17;
    27752804}
    27762805node[amenity=bank] {
    2777     icon-image: "presets/money/bank.png";
     2806    icon-image: "presets/money/bank.svg";
    27782807    set icon_z17;
    27792808}
    27802809node[amenity=bureau_de_change] {
    2781     icon-image: "presets/money/exchange.png";
     2810    icon-image: "presets/money/exchange.svg";
    27822811    set icon_z17;
    27832812}
    27842813node[amenity=atm] {
    2785     icon-image: "presets/money/atm.png";
     2814    icon-image: "presets/money/atm.svg";
    27862815    set icon_z17;
    27872816}
     
    27962825node[amenity=bbq] {
    27972826    icon-image: "presets/leisure/bbq.png";
     2827    icon-width: 16;
    27982828    set icon_z17;
    27992829}
     
    28282858}
    28292859node[amenity=hunting_stand] {
    2830     icon-image: "presets/hunting_stand.png";
     2860    icon-image: "presets/landmark/hunting_stand.png";
    28312861    set icon_z17;
    28322862}
    28332863node[amenity=marketplace] {
    2834     icon-image: "presets/place/marketplace.png";
     2864    icon-image: "presets/shop/marketplace.png";
    28352865    set icon_z17;
    28362866}
    28372867node[amenity=wlan] {
    2838     icon-image: "presets/wlan.png";
     2868    icon-image: "presets/misc/wlan.svg";
    28392869    set icon_z17;
    28402870}
    28412871node[amenity=vending_machine] {
    2842     icon-image: "presets/transport/ticket-machine.png";
     2872    icon-image: "presets/transport/ticket-machine.svg";
    28432873    set icon_z17;
    28442874}
     
    28792909}
    28802910node[craft=carpenter][!is_prop_set(icon-image)] {
    2881     icon-image: "presets/misc/no_icon.png";
     2911    icon-image: "presets/misc/no_icon.svg";
    28822912    set icon_z17;
    28832913}
    28842914node[craft=shoemaker][!is_prop_set(icon-image)] {
    2885     icon-image: "presets/misc/no_icon.png";
     2915    icon-image: "presets/misc/no_icon.svg";
    28862916    set icon_z17;
    28872917}
    28882918node[craft=photographer][!is_prop_set(icon-image)] {
    2889     icon-image: "presets/misc/no_icon.png";
     2919    icon-image: "presets/misc/no_icon.svg";
    28902920    set icon_z17;
    28912921}
    28922922node[craft=metal_construction][!is_prop_set(icon-image)] {
    2893     icon-image: "presets/misc/no_icon.png";
     2923    icon-image: "presets/misc/no_icon.svg";
    28942924    set icon_z17;
    28952925}node[craft=electrician][!is_prop_set(icon-image)] {
    2896     icon-image: "presets/misc/no_icon.png";
     2926    icon-image: "presets/misc/no_icon.svg";
    28972927    set icon_z17;
    28982928}
    28992929node[craft=brewery][!is_prop_set(icon-image)] {
    2900     icon-image: "presets/misc/no_icon.png";
     2930    icon-image: "presets/misc/no_icon.svg";
    29012931    set icon_z17;
    29022932}
     
    29062936}
    29072937node[craft=sawmill][!is_prop_set(icon-image)] {
    2908     icon-image: "presets/misc/no_icon.png";
     2938    icon-image: "presets/misc/no_icon.svg";
    29092939    set icon_z17;
    29102940}
    29112941node[craft=gardener][!is_prop_set(icon-image)] {
    2912     icon-image: "presets/misc/no_icon.png";
     2942    icon-image: "presets/misc/no_icon.svg";
    29132943    set icon_z17;
    29142944}
    29152945node[craft=winery][!is_prop_set(icon-image)] {
    2916     icon-image: "presets/misc/no_icon.png";
     2946    icon-image: "presets/misc/no_icon.svg";
    29172947    set icon_z17;
    29182948}
    29192949node[craft=hvac][!is_prop_set(icon-image)] {
    2920     icon-image: "presets/misc/no_icon.png";
     2950    icon-image: "presets/misc/no_icon.svg";
    29212951    set icon_z17;
    29222952}
     
    29262956}
    29272957node[craft=stonemason][!is_prop_set(icon-image)] {
    2928     icon-image: "presets/misc/no_icon.png";
     2958    icon-image: "presets/misc/no_icon.svg";
    29292959    set icon_z17;
    29302960}
    29312961node[craft=handicraft][!is_prop_set(icon-image)] {
    2932     icon-image: "presets/misc/no_icon.png";
     2962    icon-image: "presets/misc/no_icon.svg";
    29332963    set icon_z17;
    29342964}
     
    29382968}
    29392969node[craft=key_cutter][!is_prop_set(icon-image)] {
    2940     icon-image: "presets/misc/no_icon.png";
     2970    icon-image: "presets/misc/no_icon.svg";
    29412971    set icon_z17;
    29422972}
    29432973node[craft=caterer][!is_prop_set(icon-image)] {
    2944     icon-image: "presets/misc/no_icon.png";
     2974    icon-image: "presets/misc/no_icon.svg";
    29452975    set icon_z17;
    29462976}
    29472977node[craft=roofer][!is_prop_set(icon-image)] {
    2948     icon-image: "presets/misc/no_icon.png";
     2978    icon-image: "presets/misc/no_icon.svg";
    29492979    set icon_z17;
    29502980}
    29512981node[craft=beekeeper][!is_prop_set(icon-image)] {
    2952     icon-image: "presets/misc/no_icon.png";
     2982    icon-image: "presets/misc/no_icon.svg";
    29532983    set icon_z17;
    29542984}
    29552985node[craft=blacksmith][!is_prop_set(icon-image)] {
    2956     icon-image: "presets/misc/no_icon.png";
     2986    icon-image: "presets/misc/no_icon.svg";
    29572987    set icon_z17;
    29582988}
    29592989node[craft=locksmith][!is_prop_set(icon-image)] {
    2960     icon-image: "presets/misc/no_icon.png";
     2990    icon-image: "presets/misc/no_icon.svg";
    29612991    set icon_z17;
    29622992}
     
    29662996}
    29672997node[craft=upholsterer][!is_prop_set(icon-image)] {
    2968     icon-image: "presets/misc/no_icon.png";
     2998    icon-image: "presets/misc/no_icon.svg";
    29692999    set icon_z17;
    29703000}
     
    29983028}
    29993029node[tourism=guest_house] {
    3000     icon-image: "presets/accommodation/guest_house.png";
     3030    icon-image: "presets/accommodation/guest_house.svg";
    30013031    set icon_z17;
    30023032}
     
    30063036}
    30073037node[tourism=chalet] {
    3008     icon-image: "presets/accommodation/chalet.png";
     3038    icon-image: "presets/accommodation/chalet.svg";
    30093039    set icon_z17;
    30103040}
     
    30183048}
    30193049node[tourism=camp_site] {
    3020     icon-image: "presets/accommodation/camping.png";
     3050    icon-image: "presets/accommodation/camping.svg";
    30213051    set icon_z17;
    30223052}
    30233053node[tourism=caravan_site] {
    3024     icon-image: "presets/accommodation/camping/caravan.png";
     3054    icon-image: "presets/accommodation/caravan.svg";
    30253055    set icon_z17;
    30263056}
     
    30383068}
    30393069node[tourism=viewpoint] {
    3040     icon-image: "presets/sightseeing/viewpoint.png";
     3070    icon-image: "presets/sightseeing/viewpoint.svg";
    30413071    set icon_z17;
    30423072}
    30433073node[tourism=theme_park] {
    3044     icon-image: "presets/leisure/theme_park.png";
     3074    icon-image: "presets/leisure/theme_park.svg";
    30453075    set icon_z17;
    30463076}
    30473077node[tourism=attraction] {
    3048     icon-image: "presets/sightseeing.png";
     3078    icon-image: "presets/sightseeing/attraction.svg";
    30493079    icon-width: 16;
    30503080    set icon_z17;
    30513081}
    30523082node[tourism=zoo] {
    3053     icon-image: "presets/leisure/zoo.png";
     3083    icon-image: "presets/leisure/zoo.svg";
    30543084    set icon_z17;
    30553085}
     
    30783108}
    30793109node[tourism=information] {
    3080     icon-image: "presets/misc/information.png";
     3110    icon-image: "presets/misc/information/information.svg";
    30813111    set icon_z17;
    30823112}
    30833113node[tourism=information][information=guidepost] {
    3084     icon-image: "presets/misc/information/guidepost.png";
     3114    icon-image: "presets/misc/information/guidepost.svg";
    30853115    set icon_z17;
    30863116}
     
    30893119}
    30903120node[tourism=information][information=office] {
    3091     icon-image: "presets/misc/information/informationoffice.png";
     3121    icon-image: "presets/misc/information/informationoffice.svg";
    30923122    set icon_z17;
    30933123}
    30943124node[tourism=information][information=map] {
    3095     icon-image: "presets/misc/information/map.png";
     3125    icon-image: "presets/misc/information/map.svg";
    30963126    set icon_z17;
    30973127}
    30983128node[tourism=information][information=board] {
    3099     icon-image: "presets/misc/information/board.png";
     3129    icon-image: "presets/misc/information/board.svg";
    31003130    set icon_z17;
    31013131}
     
    31223152}
    31233153node[historic=monument] {
    3124     icon-image: "presets/sightseeing/monument.png";
     3154    icon-image: "presets/sightseeing/monument.svg";
    31253155    set icon_z17;
    31263156}
    31273157node[historic=memorial] {
    3128     icon-image: "presets/sightseeing/memorial.png";
     3158    icon-image: "presets/sightseeing/memorial.svg";
    31293159    set icon_z17;
    31303160}
    31313161node[historic=archaeological_site] {
    3132     icon-image: "presets/sightseeing/archaeological.png";
     3162    icon-image: "presets/sightseeing/archaeological.svg";
    31333163    set icon_z17;
    31343164}
    31353165node[historic=ruins] {
    3136     icon-image: "presets/sightseeing/ruins.png";
     3166    icon-image: "presets/sightseeing/ruins.svg";
    31373167    set icon_z17;
    31383168}
    31393169node[historic=battlefield] {
    3140     icon-image: "presets/sightseeing/battlefield.png";
     3170    icon-image: "presets/sightseeing/battlefield.svg";
    31413171    set icon_z17;
    31423172}
    31433173node[geological=palaeontological_site] {
    3144     icon-image: "presets/historic/palaeontological_site.png";
     3174    icon-image: "presets/sightseeing/palaeontological_site.png";
     3175    icon-width: 16;
    31453176    set icon_z17;
    31463177}
    31473178node[historic=wayside_cross] {
    3148     icon-image: "presets/religion/wayside_cross.png";
     3179    icon-image: "presets/religion/wayside_cross.svg";
    31493180    set icon_z17;
    31503181}
    31513182node[historic=wayside_shrine] {
    3152     icon-image: "presets/religion/wayside_shrine.png";
     3183    icon-image: "presets/religion/wayside_shrine.svg";
    31533184    set icon_z17;
    31543185}
    31553186node[historic=boundary_stone] {
    3156     icon-image: "presets/historic/boundary_stone.png";
     3187    icon-image: "presets/misc/boundary_stone.png";
    31573188    set icon_z17;
    31583189}
     
    32523283}
    32533284node[landuse] {
    3254     icon-image: "presets/misc/deprecated.png";
     3285    icon-image: "presets/misc/deprecated.svg";
    32553286    set icon_z17;
    32563287}
     
    32683299}
    32693300node[military=airfield] {
    3270     icon-image: "presets/transport/airport/airfield.png";
     3301    icon-image: "presets/transport/airport/airfield.svg";
    32713302    set icon_z17;
    32723303}
    32733304node[military=bunker] {
    3274     icon-image: "presets/misc/landmark/bunker.png";
     3305    icon-image: "presets/landmark/bunker.svg";
    32753306    set icon_z17;
    32763307}
    32773308node[military=barracks][!is_prop_set(icon-image)] {
    3278     icon-image: "presets/misc/no_icon.png";
     3309    icon-image: "presets/misc/no_icon.svg";
    32793310    set icon_z17;
    32803311}
    32813312node[military=danger_area] {
    3282     icon-image: "presets/misc/danger.png";
     3313    icon-image: "presets/misc/danger.svg";
    32833314    set icon_z17;
    32843315}
    32853316node[military=range] {
    3286     icon-image: "presets/misc/landmark/range.png";
     3317    icon-image: "presets/sport/range.svg";
    32873318    set icon_z17;
    32883319}
     
    32963327}
    32973328node[railway=station] {
    3298     icon-image: "presets/transport/railway_station.png";
     3329    icon-image: "presets/transport/railway_station.svg";
    32993330    set icon_z17;
    33003331}
    33013332node[railway=halt] {
    3302     icon-image: "presets/station16.png";
     3333    icon-image: "presets/transport/station.png";
     3334    icon-width: 16;
    33033335    set icon_z17;
    33043336}
    33053337node[railway=tram_stop] {
    3306     icon-image: "presets/transport/tram.png";
     3338    icon-image: "presets/transport/tram.svg";
    33073339    set icon_z17;
    33083340}
     
    34623494node[railway=platform], node[railway=funicular],
    34633495node[service=yard], node[service=siding], node[service=spur] {
    3464     icon-image: "presets/misc/deprecated.png";
     3496    icon-image: "presets/misc/deprecated.svg";
    34653497    set icon_z17;
    34663498}
     
    35013533}
    35023534node[aeroway=aerodrome][military!=airfield] {
    3503     icon-image: "presets/transport/airport.png";
     3535    icon-image: "presets/transport/airport.svg";
    35043536    set icon_z17;
    35053537}
     
    35083540}
    35093541node[aeroway=terminal] {
    3510     icon-image: "presets/transport/airport/terminal.png";
     3542    icon-image: "presets/transport/airport/terminal.svg";
    35113543    set icon_z17;
    35123544}
     
    35153547}
    35163548node[aeroway=helipad] {
    3517     icon-image: "presets/transport/airport/helipad.png";
     3549    icon-image: "presets/transport/airport/helipad.svg";
    35183550    set icon_z17;
    35193551}
     
    35473579node[aeroway=runway],
    35483580node[aeroway=taxiway] {
    3549     icon-image: "presets/misc/deprecated.png";
     3581    icon-image: "presets/misc/deprecated.svg";
    35503582    set icon_z17;
    35513583}
    35523584node[aeroway=hangar] {
    3553     icon-image: "presets/transport/airport/hangar.png";
     3585    icon-image: "presets/transport/airport/hangar.svg";
    35543586    set icon_z17;
    35553587}
    35563588node[aeroway=gate] {
    3557     icon-image: "presets/transport/airport/gate.png";
     3589    icon-image: "presets/transport/airport/gate.svg";
    35583590    set icon_z17;
    35593591}
    35603592node[aeroway=windsock] {
    3561     icon-image: "presets/transport/airport/windsock.png";
     3593    icon-image: "presets/transport/airport/windsock.svg";
    35623594    set icon_z17;
    35633595}
     
    36063638}
    36073639node[aerialway=station] {
    3608     icon-image: "presets/transport/aerialway/station.png";
     3640    icon-image: "presets/transport/aerialway/station.svg";
    36093641    set icon_z17;
    36103642}
     
    36243656node[aerialway=rope_tow],
    36253657node[aerialway=goods] {
    3626     icon-image: "presets/misc/deprecated.png";
     3658    icon-image: "presets/misc/deprecated.svg";
    36273659    set icon_z17;
    36283660}
     
    36733705}
    36743706node[public_transport=stop_position][aerialway=yes] {
    3675     icon-image: "presets/transport/aerialway/station.png";
     3707    icon-image: "presets/transport/aerialway/station.svg";
    36763708    set icon_z17;
    36773709}
     
    37183750}
    37193751node[sport="9pin"] {
    3720     icon-image: "presets/sport/10pin.png";
     3752    icon-image: "presets/sport/10pin.svg";
    37213753    set icon_z17;
    37223754}
    37233755node[sport="10pin"] {
    3724     icon-image: "presets/sport/10pin.png";
     3756    icon-image: "presets/sport/10pin.svg";
    37253757    set icon_z17;
    37263758}
    37273759node[sport=athletics] {
    37283760    icon-image: "presets/sport/athletics.png";
     3761    icon-width: 16;
    37293762    set icon_z17;
    37303763}
     
    37353768node[sport=soccer],
    37363769node[sport=gaelic_games] {
    3737     icon-image: "presets/sport/soccer.png";
     3770    icon-image: "presets/sport/soccer.svg";
    37383771    set icon_z17;
    37393772}
     
    37433776node[sport=rugby_league],
    37443777node[sport=rugby_union] {
    3745     icon-image: "presets/sport/football.png";
     3778    icon-image: "presets/sport/football.svg";
    37463779    icon-width: 20;
    37473780    icon-height: 20;
     
    37603793}
    37613794node[sport=baseball] {
    3762     icon-image: "presets/sport/baseball.png";
     3795    icon-image: "presets/sport/baseball.svg";
    37633796    set icon_z17;
    37643797}
    37653798node[sport=basketball] {
    3766     icon-image: "presets/sport/basketball.png";
     3799    icon-image: "presets/sport/basketball.svg";
    37673800    icon-width: 16;
    37683801    icon-height: 16;
     
    37703803}
    37713804node[sport=boules] {
    3772     icon-image: "presets/sport/boule.png";
     3805    icon-image: "presets/sport/boule.svg";
    37733806    set icon_z17;
    37743807}
    37753808node[sport=bowls] {
    3776     icon-image: "presets/sport/boule.png";
     3809    icon-image: "presets/sport/boule.svg";
    37773810    set icon_z17;
    37783811}
     
    37863819}
    37873820node[sport=climbing] {
    3788     icon-image: "presets/sport/climbing.png";
     3821    icon-image: "presets/sport/climbing.svg";
    37893822    set icon_z17;
    37903823}
    37913824node[sport=cricket] {
    3792     icon-image: "presets/sport/cricket.png";
     3825    icon-image: "presets/sport/cricket.svg";
    37933826    set icon_z17;
    37943827}
    37953828node[sport=croquet] {
    3796     icon-image: "presets/sport/croquet.png";
     3829    icon-image: "presets/sport/croquet.svg";
    37973830    set icon_z17;
    37983831}
     
    38143847}
    38153848node[sport=cycling] {
    3816     icon-image: "presets/sport/cycling.png";
     3849    icon-image: "presets/sport/cycling.svg";
    38173850    set icon_z17;
    38183851}
     
    38223855}
    38233856node[sport=equestrian] {
    3824     icon-image: "presets/equestrian.png";
     3857    icon-image: "presets/leisure/equestrian.png";
    38253858    icon-width: 16;
    38263859    set icon_z17;
     
    38313864}
    38323865node[sport=gymnastics] {
    3833     icon-image: "presets/gymnastics.svg";
     3866    icon-image: "presets/sport/gymnastics.svg";
    38343867    set icon_z17;
    38353868}
    38363869node[sport=field_hockey] {
    38373870    icon-image: "presets/sport/field_hockey.png";
     3871    icon-width: 16;
    38383872    set icon_z17;
    38393873}
    38403874node[sport=ice_hockey] {
    38413875    icon-image: "presets/sport/ice_hockey.png";
     3876    icon-width: 16;
    38423877    set icon_z17;
    38433878}
    38443879node[sport=horse_racing] {
    3845     icon-image: "presets/sport/riding.png";
     3880    icon-image: "presets/sport/riding.svg";
    38463881    set icon_z17;
    38473882}
    38483883node[sport=karting] {
    38493884    icon-image: "presets/sport/karting.png";
     3885    icon-width: 16;
    38503886    set icon_z17;
    38513887}
    38523888node[sport=motocross] {
    3853     icon-image: "presets/sport/motocross.png";
     3889    icon-image: "presets/sport/motocross.svg";
    38543890    set icon_z17;
    38553891}
     
    38673903}
    38683904node[sport=multi] {
    3869     icon-image: "presets/sport/multi.png";
     3905    icon-image: "presets/sport/multi.svg";
    38703906    set icon_z17;
    38713907}
    38723908node[sport=pelota] {
    38733909    icon-image: "presets/sport/pelota.png";
     3910    icon-width: 16;
    38743911    set icon_z17;
    38753912}
    38763913node[sport=racquet] {
    3877     icon-image: "presets/sport/racquetball.png";
     3914    icon-image: "presets/sport/racquetball.svg";
    38783915    set icon_z17;
    38793916}
    38803917node[sport=ice_skating] {
    38813918    icon-image: "presets/sport/skating.png";
     3919    icon-width: 16;
    38823920    set icon_z17;
    38833921}
     
    38873925}
    38883926node[sport=skating] {
    3889     icon-image: "presets/misc/deprecated.png";
     3927    icon-image: "presets/misc/deprecated.svg";
    38903928    set icon_z17;
    38913929}
    38923930node[sport=skateboard] {
    3893     icon-image: "presets/sport/skateboard.png";
     3931    icon-image: "presets/sport/skateboard.svg";
    38943932    set icon_z17;
    38953933}
     
    38983936}
    38993937node[sport=swimming] {
    3900     icon-image: "presets/sport/pool.png";
     3938    icon-image: "presets/sport/swimming.svg";
    39013939    set icon_z17;
    39023940}
     
    39073945}
    39083946node[sport=table_tennis] {
    3909     icon-image: "presets/sport/table_tennis.png";
     3947    icon-image: "presets/sport/table_tennis.svg";
    39103948    set icon_z17;
    39113949}
    39123950node[sport=tennis] {
    3913     icon-image: "presets/sport/tennis.png";
     3951    icon-image: "presets/sport/tennis.svg";
    39143952    set icon_z17;
    39153953}
    39163954node[sport=paintball][!is_prop_set(icon-image)] {
    3917     icon-image: "presets/misc/no_icon.png";
     3955    icon-image: "presets/misc/no_icon.svg";
    39183956    set icon_z17;
    39193957}
     
    39323970}
    39333971node[sport=squash][!is_prop_set(icon-image)] {
    3934     icon-image: "presets/misc/no_icon.png";
     3972    icon-image: "presets/misc/no_icon.svg";
    39353973    set icon_z17;
    39363974}
    39373975node[sport=shooting] {
    3938     icon-image: "presets/range.png";
     3976    icon-image: "presets/sport/range.svg";
    39393977    icon-width: 16;
    39403978    set icon_z17;
    39413979}
    39423980node[sport=volleyball] {
    3943     icon-image: "presets/sport/volleyball.png";
     3981    icon-image: "presets/sport/volleyball.svg";
    39443982    set icon_z17;
    39453983}
    39463984node[sport=beachvolleyball] {
    39473985    icon-image: "presets/sport/beachvolleyball.png";
     3986    icon-width: 16;
    39483987    set icon_z17;
    39493988}
     
    39533992}
    39543993node[sport=bowling] {
    3955     icon-image: "presets/sport/10pin.png";
     3994    icon-image: "presets/sport/10pin.svg";
    39563995    set icon_z17;
    39573996}
    39583997node[sport=handball] {
    3959     icon-image: "presets/sport/handball.png";
     3998    icon-image: "presets/sport/handball.svg";
    39603999    set icon_z17;
    39614000}
    39624001node[sport=rowing] {
    3963     icon-image: "presets/sport/rowing.png";
     4002    icon-image: "presets/sport/rowing.svg";
    39644003    set icon_z17;
    39654004}
    39664005node[sport=sailing][!is_prop_set(icon-image)] {
    3967     icon-image: "presets/misc/no_icon.png";
     4006    icon-image: "presets/misc/no_icon.svg";
    39684007    set icon_z17;
    39694008}
     
    39734012}
    39744013node[sport=badminton][!is_prop_set(icon-image)] {
    3975     icon-image: "presets/misc/no_icon.png";
     4014    icon-image: "presets/misc/no_icon.svg";
    39764015    set icon_z17;
    39774016}
     
    39834022}
    39844023node[sport=archery] {
    3985     icon-image: "presets/sport/archery.png";
     4024    icon-image: "presets/sport/archery.svg";
    39864025    set icon_z17;
    39874026}
     
    39914030}
    39924031node[sport=model_aerodrome] {
    3993     icon-image: "presets/transport/airport.png";
     4032    icon-image: "presets/transport/airport.svg";
    39944033    set icon_z17;
    39954034}
    39964035node[sport=rc_car] {
    3997     icon-image: "presets/transport/car.png";
     4036    icon-image: "presets/sport/rc_car.svg";
    39984037    set icon_z17;
    39994038}
     
    40074046}
    40084047node[natural=spring] {
    4009     icon-image: "presets/misc/landmark/spring.svg";
     4048    icon-image: "presets/landmark/spring.svg";
    40104049    set icon_z17;
    40114050}
    40124051node[natural=saddle] {
    4013     icon-image: "presets/saddle.svg";
     4052    icon-image: "presets/landmark/saddle.svg";
    40144053    set icon_z0;
    40154054    set text_z0;
    40164055}
    40174056node[natural=peak] {
    4018     icon-image: "presets/peak.svg";
     4057    icon-image: "presets/landmark/peak.svg";
    40194058    set icon_z0;
    40204059    set text_z0;
     
    40294068}
    40304069node[natural=volcano] {
    4031     icon-image: "presets/misc/landmark/volcano_small.png";
     4070    icon-image: "presets/landmark/volcano.svg";
    40324071    set icon_z0;
    40334072    set text_z0;
     
    41284167}
    41294168node[natural=cave_entrance] {
    4130     icon-image: "presets/misc/landmark/cave_entrance.png";
     4169    icon-image: "presets/landmark/cave_entrance.png";
    41314170    set icon_z17;
    41324171}
    41334172node[natural=tree] {
    4134     icon-image: "presets/misc/landmark/trees.png";
     4173    icon-image: "presets/landmark/trees.svg";
    41354174    set icon_z17;
    41364175}
    41374176node[natural=tree][type=conifer],
    41384177node[natural=tree][leaf_type=needleleaved] {
    4139     icon-image: "presets/misc/landmark/trees_conifer.png";
     4178    icon-image: "presets/landmark/trees_conifer.svg";
    41404179    set icon_z17;
    41414180}
    41424181node[natural=tree][type=broad_leaved],
    41434182node[natural=tree][leaf_type=broadleaved] {
    4144     icon-image: "presets/misc/landmark/trees_broad_leaved.png";
     4183    icon-image: "presets/landmark/trees_broad_leaved.svg";
    41454184    set icon_z17;
    41464185}
    41474186node[natural=tree][type=palm] {
    4148     icon-image: "presets/misc/landmark/trees_palm.png";
     4187    icon-image: "presets/landmark/trees_palm.png";
    41494188    set icon_z17;
    41504189}
     
    41674206node[natural=ridge],
    41684207node[natural=valley] {
    4169     icon-image: "presets/misc/deprecated.png";
     4208    icon-image: "presets/misc/deprecated.svg";
    41704209    set icon_z17;
    41714210}
     
    42124251}
    42134252node[waterway=lock_gate] {
    4214     icon-image: "presets/nautical/lock_gate.png";
     4253    icon-image: "presets/nautical/lock_gate.svg";
    42154254    set icon_z17;
    42164255}
    42174256node[waterway=turning_point] {
    4218     icon-image: "presets/nautical/turning.png";
     4257    icon-image: "presets/nautical/turning.svg";
    42194258    set icon_z17;
    42204259}
     
    42294268node[waterway=waste_disposal],
    42304269node[waterway=mooring] {
    4231     icon-image: "presets/misc/deprecated.png";
     4270    icon-image: "presets/misc/deprecated.svg";
    42324271    set icon_z17;
    42334272}
     
    42764315node[waterway=stream],
    42774316node[waterway=ditch], node[waterway=drain] {
    4278     icon-image: "presets/misc/deprecated.png";
     4317    icon-image: "presets/misc/deprecated.svg";
    42794318    set icon_z17;
    42804319}
     
    42974336node[route=tour],
    42984337node[route=pub_crawl] {
    4299     icon-image: "presets/misc/deprecated.png";
     4338    icon-image: "presets/misc/deprecated.svg";
    43004339    set icon_z17;
    43014340}
     
    43064345
    43074346node[mountain_pass?] {
    4308     icon-image: "presets/misc/landmark/mountain_pass.svg";
     4347    icon-image: "presets/landmark/mountain_pass.svg";
    43094348    set icon_z0;
    43104349    set text_z0;
     
    43824421node[boundary=political],
    43834422node[boundary=national_park] {
    4384     icon-image: "presets/misc/deprecated.png";
     4423    icon-image: "presets/misc/deprecated.svg";
    43854424    set icon_z17;
    43864425}
     
    45434582node|z15-[place=locality],
    45444583node|z-14[place=locality][!setting("hide_icons")] {
    4545     icon-image: "presets/place/locality.png";
     4584    icon-image: "presets/place/locality.svg";
    45464585    font-weight: bold;
    45474586    text-color:black;
     
    45504589}
    45514590node[place=island] {
    4552     icon-image: "presets/place/island.png";
     4591    icon-image: "presets/place/island.svg";
    45534592}
    45544593node[place=islet] {
    4555     icon-image: "presets/place/islet.png";
     4594    icon-image: "presets/place/islet.svg";
    45564595}
    45574596
  • trunk/styles/standard/potlatch2.mapcss

    r10565 r10706  
    2727
    2828relation[restriction=no_left_turn] {
    29     icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
     29    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg";
    3030}
    3131relation[restriction=no_right_turn] {
    32     icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
     32    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg";
    3333}
    3434relation[restriction=no_straight_on] {
    35     icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
     35    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg";
    3636}
    3737relation[restriction=no_u_turn] {
    38     icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
     38    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg";
    3939}
    4040relation[restriction=only_left_turn] {
    41     icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
     41    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg";
    4242}
    4343relation[restriction=only_right_turn] {
    44     icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
     44    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg";
    4545}
    4646relation[restriction=only_straight_on] {
    47     icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
     47    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg";
    4848}
    4949
Note: See TracChangeset for help on using the changeset viewer.