Changeset 10537 in josm


Ignore:
Timestamp:
2016-07-16T21:16:39+02:00 (8 years ago)
Author:
Klumbumbus
Message:

fix #13144 - Include female, male and unisex in hairdresser/barber preset and add related validation

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10522 r10537  
    78747874            <key key="shop" value="hairdresser" />
    78757875            <reference ref="name_oh_wheelchair" />
     7876            <checkgroup columns="3">
     7877                <check key="female" text="Female" />
     7878                <check key="male" text="Male" />
     7879                <check key="unisex" text="Unisex" />
     7880            </checkgroup>
    78767881            <reference ref="link_contact_address_payment" />
    78777882        </item> <!-- Hairdresser/Barber -->
  • trunk/data/validator/combinations.mapcss

    r10535 r10537  
    374374  throwOther: tr("Short waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}");
    375375}
     376
     377/* #13144 */
     378*[unisex=yes][female=yes][male!=yes],
     379*[unisex=yes][male=yes][female!=yes] {
     380  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     381}
     382*[unisex=yes][female=yes][male=yes] {
     383  throwWarning: tr("{0} together with {1} and {2}. Remove {1} and {2}", "{0.tag}", "{1.tag}", "{2.tag}");
     384  fixRemove: "female";
     385  fixRemove: "male";
     386}
     387*[female=yes][male=yes][!unisex][shop=hairdresser] { /* for toilets male=yes female=yes unisex=no combination is valid */
     388  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     389  suggestAlternative: "unisex=yes";
     390  fixRemove: "female";
     391  fixRemove: "male";
     392  fixAdd: "unisex=yes";
     393}
Note: See TracChangeset for help on using the changeset viewer.