Add min_match, and auto apply attribute where necessary

simonpoole · Jan 17, 2020 · 8f97f0b · 8f97f0b
1 parent 1768988
commit 8f97f0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 /*
  */
 
-version = '1.7.0'
+version = '1.8.0'
 
 //for Ant filter
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -31,13 +31,13 @@ ext {
     josm_preset_file = 'josm_preset.xml'
     vespucci_preset_file = 'vespucci_preset.xml'
     vespucci_preset_build_file = 'vespucci_preset_build.xml'
-    vespucci_preset_version = '1.8'
+    vespucci_preset_version = '1.9'
     generated = 'build/gen/'
     github_token = System.getenv('GITHUB_TOKEN')
 }
 
 dependencies {
-    runtime 'ch.poole:preset-utils:0.12.0'
+    runtime 'ch.poole:preset-utils:0.13.0'
 }
 
 task copyCss(type: Copy) {

diff --git a/master_preset.xml b/master_preset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<presets version="1.7.0" xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" 
+<presets version="1.8.0" xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" 
     description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version" 
     object_keys="attraction,public_transport,traffic_calming,traffic_sign,traffic_sign:forward,traffic_sign:backward,playground,advertising,ford,club,traffic_calming,cemetery,indoor,police,disused:amenity,disused:leisure,disused:shop,disused:man_made">
 <!--
@@ -5110,15 +5110,15 @@
         </item> <!-- Music School -->
     </group> <!-- Education -->
     <group name="Health" icon="${ICONPATH}health_pharmacy.${ICONTYPE}">
-        <item name="Hospital" icon="${ICONPATH}health_hospital.${ICONTYPE}" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hospital" icon="${ICONPATH}health_hospital.${ICONTYPE}" type="node,closedway,multipolygon" autoapply="false" min_match="1" preset_name_label="true">
             <link wiki="Tag:amenity=hospital"/>
             <space/>
             <key key="amenity" value="hospital" match="keyvalue"/>
             <key key="healthcare" value="hospital" match="keyvalue"/>
             <reference ref="name_operator"/>
             <reference ref="link_contact_address_payment"/>
         </item> <!-- Hospital -->
-        <item name="Clinic" icon="${ICONPATH}health_hospital.${ICONTYPE}" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Clinic" icon="${ICONPATH}health_hospital.${ICONTYPE}" type="node,closedway,multipolygon" autoapply="false" min_match="1" preset_name_label="true">
             <link wiki="Tag:amenity=clinic"/>
             <space/>
             <key key="amenity" value="clinic" match="keyvalue"/>
@@ -5127,7 +5127,7 @@
             <reference ref="name_operator_level"/>
             <reference ref="link_contact_address_payment"/>
         </item> <!-- Clinic -->
-        <item name="Doctor's Office" icon="${ICONPATH}health_doctors.${ICONTYPE}" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Doctor's Office" icon="${ICONPATH}health_doctors.${ICONTYPE}" type="node,closedway,multipolygon" autoapply="false" min_match="1" preset_name_label="true">
             <link wiki="Tag:amenity=doctors"/>
             <space/>
             <key key="amenity" value="doctors" match="keyvalue"/>
@@ -5136,7 +5136,7 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address_payment"/>
         </item> <!-- Doctor's Office -->
-        <item name="Dentist" icon="${ICONPATH}health_dentist.${ICONTYPE}" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dentist" icon="${ICONPATH}health_dentist.${ICONTYPE}" type="node,closedway,multipolygon" autoapply="false" min_match="1" preset_name_label="true">
             <link wiki="Tag:amenity=dentist"/>
             <space/>
             <key key="amenity" value="dentist" match="keyvalue"/>