Changeset 10537 in josm for trunk

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:

• defaultpresets.xml (modified) (1 diff)
• validator/combinations.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -7874 +7874 @@
             <key key="shop" value="hairdresser" />
             <reference ref="name_oh_wheelchair" />
+            <checkgroup columns="3">
+                <check key="female" text="Female" />
+                <check key="male" text="Male" />
+                <check key="unisex" text="Unisex" />
+            </checkgroup>
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->

trunk/data/validator/combinations.mapcss

@@ -374 +374 @@
   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}");
 }
+
+/* #13144 */
+*[unisex=yes][female=yes][male!=yes],
+*[unisex=yes][male=yes][female!=yes] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+}
+*[unisex=yes][female=yes][male=yes] {
+  throwWarning: tr("{0} together with {1} and {2}. Remove {1} and {2}", "{0.tag}", "{1.tag}", "{2.tag}");
+  fixRemove: "female";
+  fixRemove: "male";
+}
+*[female=yes][male=yes][!unisex][shop=hairdresser] { /* for toilets male=yes female=yes unisex=no combination is valid */
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "unisex=yes";
+  fixRemove: "female";
+  fixRemove: "male";
+  fixAdd: "unisex=yes";
+}