Changeset 16831 in josm

Timestamp:

2020-08-03T18:47:15+02:00 (4 years ago)

Author:

Klumbumbus

Message:

• Add irrigation=pivot to farmland preset (usage > 10k) and make crop optional (can change every year)
• Fix checks with value_on=*

File:

• trunk/resources/data/defaultpresets.xml (modified) (6 diffs)

trunk/resources/data/defaultpresets.xml

@@ -1825 +1825 @@
             <space />
             <key key="covered" value="arcade" />
-            <check key="arcade:left" value_on="open" text="Open on left side" />
-            <check key="arcade:right" value_on="open" text="Open on right side" />
+            <check key="arcade:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="arcade:right" value_on="open" text="Open on right side" disable_off="true" />
             <optional>
                 <reference ref="name_layer" />
@@ -1836 +1836 @@
             <space />
             <key key="covered" value="colonnade" />
-            <check key="colonnade:left" value_on="open" text="Open on left side" />
-            <check key="colonnade:right" value_on="open" text="Open on right side" />
+            <check key="colonnade:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="colonnade:right" value_on="open" text="Open on right side" disable_off="true" />
             <optional>
                 <reference ref="name_layer" />
@@ -1847 +1847 @@
             <space />
             <key key="tunnel" value="avalanche_protector" />
-            <check key="avalanche_protector:left" value_on="open" text="Open on left side" />
-            <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
+            <check key="avalanche_protector:left" value_on="open" text="Open on left side" disable_off="true" />
+            <check key="avalanche_protector:right" value_on="open" text="Open on right side" disable_off="true" />
             <optional>
                 <reference ref="name_layer" />
@@ -6213 +6213 @@
                 <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" values_sort="false" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
+                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
             </optional>
         </item> <!-- Power Line -->
@@ -6226 +6226 @@
                 <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
+                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
             </optional>
         </item> <!-- Power Cable -->
@@ -8040 +8040 @@
             <space />
             <key key="landuse" value="farmland" />
-            <combo key="crop" text="Crop" values="barley,cereal,corn,grass,hop,rape,rice,soy,sugarcane,tea,wheat" values_context="crop" />
-            <reference ref="optional_name" />
+            <optional>
+                <combo key="crop" text="Crop" values="barley,cereal,corn,grass,hop,rape,rice,soy,sugarcane,tea,wheat" values_context="crop" />
+                <text key="name" text="Name" />
+                <check key="irrigation" text="Center pivot irrigation" value_on="pivot" disable_off="true" />
+            </optional>
         </item> <!-- Farmland -->
         <item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">