Changeset 9681 in josm


Ignore:
Timestamp:
2016-01-29T23:05:46+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #12227 - add craft=* to preset and mappaint style, warn about craft=yes; fix office area style (see #12035); add traffic_sign to validator ignore list

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r9654 r9681  
    81868186    </item>
    81878187  </group> <!-- Offices -->
     8188  <group name="Craft" icon="styles/standard/craft/stonemason.png">
     8189    <item name="Carpenter" type="node,closedway,multipolygon" preset_name_label="true">
     8190        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=carpenter" />
     8191        <space />
     8192        <key key="craft" value="carpenter" />
     8193        <reference ref="name_operator_oh_wheelchair" />
     8194        <reference ref="link_contact_address" />
     8195    </item> <!-- Carpenter -->
     8196    <item name="Shoemaker" type="node,closedway,multipolygon" preset_name_label="true">
     8197        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=shoemaker" />
     8198        <space />
     8199        <key key="craft" value="shoemaker" />
     8200        <reference ref="name_operator_oh_wheelchair" />
     8201        <reference ref="link_contact_address" />
     8202    </item> <!-- Shoemaker -->
     8203    <item name="Photographer" type="node,closedway,multipolygon" preset_name_label="true">
     8204        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=photographer" />
     8205        <space />
     8206        <key key="craft" value="photographer" />
     8207        <reference ref="name_operator_oh_wheelchair" />
     8208        <reference ref="link_contact_address" />
     8209    </item> <!-- Photographer -->
     8210    <item name="Metal construction" type="node,closedway,multipolygon" preset_name_label="true">
     8211        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=metal_construction" />
     8212        <space />
     8213        <key key="craft" value="metal_construction" />
     8214        <reference ref="name_operator_oh_wheelchair" />
     8215        <reference ref="link_contact_address" />
     8216    </item> <!-- Metal construction -->
     8217    <item name="Electrician" type="node,closedway,multipolygon" preset_name_label="true">
     8218        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=electrician" />
     8219        <space />
     8220        <key key="craft" value="electrician" />
     8221        <reference ref="name_operator_oh_wheelchair" />
     8222        <reference ref="link_contact_address" />
     8223    </item> <!-- Electrician -->
     8224    <item name="Brewery" type="node,closedway,multipolygon" preset_name_label="true">
     8225        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=brewery" />
     8226        <space />
     8227        <key key="craft" value="brewery" />
     8228        <reference ref="name_operator_oh_wheelchair" />
     8229        <reference ref="link_contact_address" />
     8230    </item> <!-- Brewery -->
     8231    <item name="Plumber" icon="styles/standard/craft/plumber.png" type="node,closedway,multipolygon" preset_name_label="true">
     8232        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=plumber" />
     8233        <space />
     8234        <key key="craft" value="plumber" />
     8235        <reference ref="name_operator_oh_wheelchair" />
     8236        <reference ref="link_contact_address" />
     8237    </item> <!-- Plumber -->
     8238    <item name="Sawmill" type="node,closedway,multipolygon" preset_name_label="true">
     8239        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=sawmill" />
     8240        <space />
     8241        <key key="craft" value="sawmill" />
     8242        <reference ref="name_operator_oh_wheelchair" />
     8243        <reference ref="link_contact_address" />
     8244    </item> <!-- Sawmill -->
     8245    <item name="Gardener" type="node,closedway,multipolygon" preset_name_label="true">
     8246        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=gardener" />
     8247        <space />
     8248        <key key="craft" value="gardener" />
     8249        <reference ref="name_operator_oh_wheelchair" />
     8250        <reference ref="link_contact_address" />
     8251    </item> <!-- Gardener -->
     8252    <item name="Winery" type="node,closedway,multipolygon" preset_name_label="true">
     8253        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=winery" />
     8254        <space />
     8255        <key key="craft" value="winery" />
     8256        <reference ref="name_operator_oh_wheelchair" />
     8257        <reference ref="link_contact_address" />
     8258    </item> <!-- Winery -->
     8259    <item name="Hvac" type="node,closedway,multipolygon" preset_name_label="true">
     8260        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=hvac" />
     8261        <space />
     8262        <key key="craft" value="hvac" />
     8263        <reference ref="name_operator_oh_wheelchair" />
     8264        <reference ref="link_contact_address" />
     8265    </item> <!-- Hvac -->
     8266    <item name="Painter" icon="styles/standard/craft/painter.png" type="node,closedway,multipolygon" preset_name_label="true">
     8267        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=painter" />
     8268        <space />
     8269        <key key="craft" value="painter" />
     8270        <reference ref="name_operator_oh_wheelchair" />
     8271        <reference ref="link_contact_address" />
     8272    </item> <!-- Painter -->
     8273    <item name="Stonemason" icon="styles/standard/craft/stonemason.png" type="node,closedway,multipolygon" preset_name_label="true">
     8274        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=stonemason" />
     8275        <space />
     8276        <key key="craft" value="stonemason" />
     8277        <reference ref="name_operator_oh_wheelchair" />
     8278        <reference ref="link_contact_address" />
     8279    </item> <!-- Stonemason -->
     8280    <item name="Handicraft" type="node,closedway,multipolygon" preset_name_label="true">
     8281        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=handicraft" />
     8282        <space />
     8283        <key key="craft" value="handicraft" />
     8284        <reference ref="name_operator_oh_wheelchair" />
     8285        <reference ref="link_contact_address" />
     8286    </item> <!-- Handicraft -->
     8287    <item name="Pottery" icon="styles/standard/craft/pottery.png" type="node,closedway,multipolygon" preset_name_label="true">
     8288        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=pottery" />
     8289        <space />
     8290        <key key="craft" value="pottery" />
     8291        <reference ref="name_operator_oh_wheelchair" />
     8292        <reference ref="link_contact_address" />
     8293    </item> <!-- Pottery -->
     8294    <item name="Key cutter" type="node,closedway,multipolygon" preset_name_label="true">
     8295        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=key_cutter" />
     8296        <space />
     8297        <key key="craft" value="key_cutter" />
     8298        <reference ref="name_operator_oh_wheelchair" />
     8299        <reference ref="link_contact_address" />
     8300    </item> <!-- Key cutter -->
     8301    <item name="Caterer" type="node,closedway,multipolygon" preset_name_label="true">
     8302        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=caterer" />
     8303        <space />
     8304        <key key="craft" value="caterer" />
     8305        <reference ref="name_operator_oh_wheelchair" />
     8306        <reference ref="link_contact_address" />
     8307    </item> <!-- Caterer -->
     8308    <item name="Roofer" type="node,closedway,multipolygon" preset_name_label="true">
     8309        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=roofer" />
     8310        <space />
     8311        <key key="craft" value="roofer" />
     8312        <reference ref="name_operator_oh_wheelchair" />
     8313        <reference ref="link_contact_address" />
     8314    </item> <!-- Roofer -->
     8315    <item name="Beekeeper" type="node,closedway,multipolygon" preset_name_label="true">
     8316        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=beekeeper" />
     8317        <space />
     8318        <key key="craft" value="beekeeper" />
     8319        <reference ref="name_operator_oh_wheelchair" />
     8320        <reference ref="link_contact_address" />
     8321    </item> <!-- Beekeeper -->
     8322    <item name="Blacksmith" type="node,closedway,multipolygon" preset_name_label="true">
     8323        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=blacksmith" />
     8324        <space />
     8325        <key key="craft" value="blacksmith" />
     8326        <reference ref="name_operator_oh_wheelchair" />
     8327        <reference ref="link_contact_address" />
     8328    </item> <!-- Blacksmith -->
     8329    <item name="Locksmith" type="node,closedway,multipolygon" preset_name_label="true">
     8330        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=locksmith" />
     8331        <space />
     8332        <key key="craft" value="locksmith" />
     8333        <reference ref="name_operator_oh_wheelchair" />
     8334        <reference ref="link_contact_address" />
     8335    </item> <!-- Locksmith -->
     8336    <item name="Window construction" icon="styles/standard/craft/window_construction.png" type="node,closedway,multipolygon" preset_name_label="true">
     8337        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=window_construction" />
     8338        <space />
     8339        <key key="craft" value="window_construction" />
     8340        <reference ref="name_operator_oh_wheelchair" />
     8341        <reference ref="link_contact_address" />
     8342    </item> <!-- Window construction -->
     8343    <item name="Upholsterer" type="node,closedway,multipolygon" preset_name_label="true">
     8344        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=upholsterer" />
     8345        <space />
     8346        <key key="craft" value="upholsterer" />
     8347        <reference ref="name_operator_oh_wheelchair" />
     8348        <reference ref="link_contact_address" />
     8349    </item> <!-- Upholsterer -->
     8350    <item name="Tiler" icon="styles/standard/craft/tiler.png" type="node,closedway,multipolygon" preset_name_label="true">
     8351        <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=tiler" />
     8352        <space />
     8353        <key key="craft" value="tiler" />
     8354        <reference ref="name_operator_oh_wheelchair" />
     8355        <reference ref="link_contact_address" />
     8356    </item> <!-- Tiler -->
     8357  </group> <!-- Craft -->
    81888358  <group name="Geography" icon="presets/peak.svg">
    81898359    <group name="Boundaries" icon="presets/boundaries.png">

  • trunk/data/validator/deprecated.mapcss

    r9593 r9681  
    379379*[amenity=yes],
    380380*[shop="*"],
     381*[craft=yes],
    381382*[place=yes] {
    382383  throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by a specific value.", "{0.key}", "{0.value}");

  • trunk/data/validator/ignoretags.cfg

    r9651 r9681  
    9999E:denotation
    100100E:seamark:type
     101E:traffic_sign
    101102;
    102103; Ignore valid and semi-valid keys that end with...

  • trunk/styles/standard/elemstyles.mapcss

    r9654 r9681  
    16261626/***************/
    16271627
    1628 node[office=accountant],
    1629 node[office=administrative],
    1630 node[office=advertising_agency],
    1631 node[office=architect],
    1632 node[office=association],
    1633 node[office=company],
    1634 node[office=educational_institution],
    1635 node[office=employment_agency],
    1636 node[office=estate_agent],
    1637 node[office=foundation],
    1638 node[office=government],
    1639 node[office=insurance],
    1640 node[office=it],
    1641 node[office=lawyer],
    1642 node[office=newspaper],
    1643 node[office=ngo],
    1644 node[office=notary],
    1645 node[office=political_party],
    1646 node[office=religion],
    1647 node[office=research],
    1648 node[office=tax_advisor],
    1649 node[office=telecommunication] {
     1628area[office=accountant],
     1629area[office=administrative],
     1630area[office=advertising_agency],
     1631area[office=architect],
     1632area[office=association],
     1633area[office=company],
     1634area[office=educational_institution],
     1635area[office=employment_agency],
     1636area[office=estate_agent],
     1637area[office=foundation],
     1638area[office=government],
     1639area[office=insurance],
     1640area[office=it],
     1641area[office=lawyer],
     1642area[office=newspaper],
     1643area[office=ngo],
     1644area[office=notary],
     1645area[office=political_party],
     1646area[office=religion],
     1647area[office=research],
     1648area[office=tax_advisor],
     1649area[office=telecommunication] {
    16501650    fill-color: office#de5696;
    16511651}
    … …  
    32073207/**************/
    32083208
     3209area[craft=carpenter],
     3210area[craft=shoemaker],
     3211area[craft=photographer],
     3212area[craft=metal_construction],
     3213area[craft=electrician],
     3214area[craft=brewery],
     3215area[craft=plumber],
     3216area[craft=sawmill],
     3217area[craft=gardener],
     3218area[craft=winery],
     3219area[craft=hvac],
    32093220area[craft=painter],
    3210 area[craft=plumber],
     3221area[craft=stonemason],
     3222area[craft=handicraft],
    32113223area[craft=pottery],
    3212 area[craft=stonemason],
    3213 area[craft=tiler],
    3214 area[craft=window_construction] {
     3224area[craft=key_cutter],
     3225area[craft=caterer],
     3226area[craft=roofer],
     3227area[craft=beekeeper],
     3228area[craft=blacksmith],
     3229area[craft=locksmith],
     3230area[craft=window_construction],
     3231area[craft=upholsterer],
     3232area[craft=tiler] {
    32153233    fill-color: craft#999900;
     3234}
     3235node[craft=carpenter] {
     3236    icon-image: "misc/no_icon.png";
     3237    set icon_z17;
     3238    text: auto;
     3239}
     3240node[craft=shoemaker] {
     3241    icon-image: "misc/no_icon.png";
     3242    set icon_z17;
     3243    text: auto;
     3244}
     3245node[craft=photographer] {
     3246    icon-image: "misc/no_icon.png";
     3247    set icon_z17;
     3248    text: auto;
     3249}
     3250node[craft=metal_construction] {
     3251    icon-image: "misc/no_icon.png";
     3252    set icon_z17;
     3253    text: auto;
     3254}node[craft=electrician] {
     3255    icon-image: "misc/no_icon.png";
     3256    set icon_z17;
     3257    text: auto;
     3258}
     3259node[craft=brewery] {
     3260    icon-image: "misc/no_icon.png";
     3261    set icon_z17;
     3262    text: auto;
     3263}
     3264node[craft=plumber] {
     3265    icon-image: "craft/plumber.png";
     3266    set icon_z17;
     3267    text: auto;
     3268}
     3269node[craft=sawmill] {
     3270    icon-image: "misc/no_icon.png";
     3271    set icon_z17;
     3272    text: auto;
     3273}
     3274node[craft=gardener] {
     3275    icon-image: "misc/no_icon.png";
     3276    set icon_z17;
     3277    text: auto;
     3278}
     3279node[craft=winery] {
     3280    icon-image: "misc/no_icon.png";
     3281    set icon_z17;
     3282    text: auto;
     3283}
     3284node[craft=hvac] {
     3285    icon-image: "misc/no_icon.png";
     3286    set icon_z17;
     3287    text: auto;
    32163288}
    32173289node[craft=painter] {
    … …  
    32203292    text: auto;
    32213293}
    3222 node[craft=plumber] {
    3223     icon-image: "craft/plumber.png";
     3294node[craft=stonemason] {
     3295    icon-image: "craft/stonemason.png";
     3296    set icon_z17;
     3297    text: auto;
     3298}
     3299node[craft=handicraft] {
     3300    icon-image: "misc/no_icon.png";
    32243301    set icon_z17;
    32253302    text: auto;
    … …  
    32303307    text: auto;
    32313308}
    3232 node[craft=stonemason] {
    3233     icon-image: "craft/stonemason.png";
     3309node[craft=key_cutter] {
     3310    icon-image: "misc/no_icon.png";
     3311    set icon_z17;
     3312    text: auto;
     3313}
     3314node[craft=caterer] {
     3315    icon-image: "misc/no_icon.png";
     3316    set icon_z17;
     3317    text: auto;
     3318}
     3319node[craft=roofer] {
     3320    icon-image: "misc/no_icon.png";
     3321    set icon_z17;
     3322    text: auto;
     3323}
     3324node[craft=beekeeper] {
     3325    icon-image: "misc/no_icon.png";
     3326    set icon_z17;
     3327    text: auto;
     3328}
     3329node[craft=blacksmith] {
     3330    icon-image: "misc/no_icon.png";
     3331    set icon_z17;
     3332    text: auto;
     3333}
     3334node[craft=locksmith] {
     3335    icon-image: "misc/no_icon.png";
     3336    set icon_z17;
     3337    text: auto;
     3338}
     3339node[craft=window_construction] {
     3340    icon-image: "craft/window_construction.png";
     3341    set icon_z17;
     3342    text: auto;
     3343}
     3344node[craft=upholsterer] {
     3345    icon-image: "misc/no_icon.png";
    32343346    set icon_z17;
    32353347    text: auto;
    … …  
    32373349node[craft=tiler] {
    32383350    icon-image: "craft/tiler.png";
    3239     set icon_z17;
    3240     text: auto;
    3241 }
    3242 node[craft=window_construction] {
    3243     icon-image: "craft/window_construction.png";
    32443351    set icon_z17;
    32453352    text: auto;
Note: See TracChangeset for help on using the changeset viewer.