[PATCH] Change emergency=fire_hydrants in defaultpresets.xml according to approved proposal

[elgolfo]

What steps will reproduce the problem?

I changed the emergency=fire_hydrant section according to the changes in the wiki after successful proposal.

See ​https://wiki.openstreetmap.org/wiki/Tag:emergency%3Dfire_hydrant

Full defaultpresets.xml (based on 13286) is attached.

Please provide any additional information below. Attach a screenshot if possible.

URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2017-12-31 03:09:43 +0100 (Sun, 31 Dec 2017)
Build-Date:2017-12-31 02:33:46
Revision:13265
Relative:URL: ^/trunk

Identification: JOSM/1.5 (13265 en) Linux Manjaro Linux
Memory Usage: 899 MB / 2649 MB (234 MB allocated, but free)
Java version: 1.8.0_144-b01, Oracle Corporation, OpenJDK 64-Bit Server VM
Screen: :0.0 1366x768
Maximum Screen Size: 1366x768
VM arguments: [-Dawt.useSystemAAFontSettings=gasp]
Dataset consistency test: No problems found

Plugins:
+ AddrInterpolation (33692)
+ DirectUpload (33882)
+ ElevationProfile (33815)
+ FastDraw (33731)
+ ImageWayPoint (33561)
+ InfoMode (33722)
+ Mapillary (v1.5.9)
+ OSMRecPlugin (33800)
+ OpeningHoursEditor (33876)
+ PicLayer (33822)
+ RoadSigns (33798)
+ apache-commons (33668)
+ apache-http (32699)
+ buildings_tools (33735)
+ continuosDownload (68)
+ editgpx (33782)
+ ejml (32680)
+ geotools (33958)
+ gpxfilter (33885)
+ graphview (33938)
+ jts (32699)
+ lakewalker (33912)
+ log4j (32699)
+ measurement (33760)
+ namemanager (33872)
+ openvisible (33567)
+ photo_geotagging (33967)
+ photoadjust (33746)
+ print (33826)
+ public_transport (33817)
+ rasterfilters (33893)
+ reltoolbox (33708)
+ reverter (33865)
+ routing (33891)
+ tageditor (33806)
+ undelete (33835)
+ utilsplugin2 (33742)
+ waypoint_search (33874)

Tagging presets:
+ https://josm.openstreetmap.de/josmfile?page=Presets/BicycleJunction&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/BuildingPreset&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Leaftype&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/MobilePhoneBaseStations&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Mountainbike&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Towers&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Communication_Towers&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/MountainbikeTrails&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/NewTags&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/OneClick&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/MobilePhoneBaseStations&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Playground_Equipment&zip=1
+ https://raw.githubusercontent.com/yopaseopor/traffic_signs_preset_JOSM/master/DE.zip
+ ${HOME}/josm/adfc_preset.xml
+ /tmp/defaultpresets.xml

Map paint styles:
- http://josm.openstreetmap.de/josmfile?page=Styles/Maxspeed&style
- https://josm.openstreetmap.de/josmfile?page=Styles/Modified&style
- https://josm.openstreetmap.de/josmfile?page=Styles/NumberedCycleNodeNetworks&style
- https://josm.openstreetmap.de/josmfile?page=Styles/Osmc&style
- https://josm.openstreetmap.de/josmfile?page=Styles/Surface&style
- https://josm.openstreetmap.de/josmfile?page=Styles/Cycleways&style
- https://josm.openstreetmap.de/josmfile?page=Styles/MTB&style
- https://www.dropbox.com/s/qo3ai47fpv241jf/Styles_Fixme_and_Notes.zip?raw=1
- https://josm.openstreetmap.de/josmfile?page=Styles/Fixme&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/Lane_and_Road_Attributes&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/MaxspeedIcons&zip=1

Validator rules:
+ https://josm.openstreetmap.de/josmfile?page=Rules/GermanySpecific&zip=1

Last errors/warnings:
- W:  Radweg: Could not get presets icon presets/cycleway.png
- E: Failed to locate image 'presets/footway.png'
- W:  Fußweg: Could not get presets icon presets/footway.png
- W: No configuration settings found.  Using hardcoded default values for all pools.
- E: java.lang.NullPointerException: Failed to retrieve atom name.
- E: java.lang.NullPointerException: Failed to retrieve atom name.
- E: java.lang.NullPointerException: Failed to retrieve atom name.
- E: java.lang.NullPointerException: Failed to retrieve atom name.
- E: java.lang.NullPointerException: Failed to retrieve atom name.
- E: java.lang.NullPointerException: Failed to retrieve atom name.

[Don-vip]

Can you please attach a diff instead? It's easier for us to review.

[elgolfo]

Could have thought of it by myself.

[Don-vip]

Ah sorry, I was speaking about a SVN diff as explained in DevelopersGuide/PatchGuide. This allows to have color highlight.
Be also carful to use spaces instead of tabs, otherwise it makes the diff very hard to read.
This is what it looks like once the tabs have been replaced by spaces:

data/defaultpresets.xml

@@ -5553 +5553 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hydrant" />
             <space />
             <key key="emergency" value="fire_hydrant" />
-            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
-            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
-            <space />
-            <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
-            <space />
-            <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
-            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
-            <text key="fire_hydrant:count" text="Count" />
+            <combo key="fire_hydrant:type" text="Shape" values_searchable="true">
+                <list_entry value="pipe" short_description="A simple capped pipe, without the usual hydrant shape." />
+                <list_entry value="pillar" short_description="A pillar type hydrant." />
+                <list_entry value="wall" short_description="A wall-mounted fire hydrant." />
+                <list_entry value="underground" short_description="A fire hydrant simple outlet located underground." />
+            </combo>
+            <combo key="fire_hydrant:pressure" text="Pressure in bar or suction" values_searchable="true">
+                <list_entry value="#" short_description="Pressure in bar." />
+                <list_entry value="yes" short_description="Pressure but value unknown." />
+                <list_entry value="suction" short_description="Hydrant is connected to a pond/stream/tank/pool, pump is needed." />
+            </combo>
+            <optional>
+                <combo key="water_source" text="Water source" default="main">
+                    <list_entry value="main" short_description="Hydrant is fed by the local distribution network." />
+                    <list_entry value="groundwater" short_description="A water well." />
+                    <list_entry value="stream" />
+                    <list_entry value="river" />
+                    <list_entry value="canal" />
+                    <list_entry value="drain" />
+                    <list_entry value="ditch" />
+                    <list_entry value="pond" />
+                    <list_entry value="lake" />
+                    <list_entry value="water_tank" />
+                    <list_entry value="swimming_pool" />
+                </combo>
+                <text key="survey:date" text="Date of last site survey" />
+                <combo key="fire_hydrant:position" text="Hydrant Position" values_context="hydrant position" >
+                    <list_entry value="lane" short_description="on the side of a road lane" />
+                    <list_entry value="parking_lot" short_description="in a parking_lot" />
+                    <list_entry value="sidewalk" short_description="on a sidewalk" />
+                    <list_entry value="green" short_description="in a grassy area" />
+                </combo>
+                <text key="water_volume" text="Volume of the water reserve." />
+                <text key="fire_hydrant:diameter" text="Nominal diameter (in mm, inches or letters)" />
+                <text key="flow_rate" text="Nominal flow rate with unit of measure" />
+                <combo key="fire_hydrant:awwa_class" text="Classification per American Waterworks Association (US only)">
+                    <list_entry value="AA" />
+                    <list_entry value="A" />
+                    <list_entry value="B" />
+                    <list_entry value="C" />
+                </combo>
+                <text key="couplings" text="Number of couplings" />
+                <combo key="couplings:type" text="Coupling standard">
+                    <list_entry value="Bayonet" />
+                    <list_entry value="Barcelona" />
+                    <list_entry value="Guillemin" />
+                    <list_entry value="Klaue" />
+                    <list_entry value="Sprawny" />
+                    <list_entry value="Storz" />
+                    <list_entry value="UNI" />
+                </combo>
+                <text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
+                <combo key="pillar:type" text="Description of pillar hydrants, in addition to fire_hydrant=pillar">
+                    <list_entry value="dry_barrel" short_description="A style of pillar hydrant where the water shutoff valve is below ground." />
+                    <list_entry value="wet_barrel" short_description="A style of pillar hydrant where the barrel is pressurized at all times, with individual valves for each outlet." />
+                </combo>
+                <combo key="colour" text="Colour" default="red">
+                    <list_entry value="blue" />
+                    <list_entry value="green" />
+                    <list_entry value="red" />
+                    <list_entry value="yellow" />
+                </combo>
+                <combo key="bonnet:colour" text="Colour of the top section (bonnet)" default="red">
+                    <list_entry value="blue" />
+                    <list_entry value="green" />
+                    <list_entry value="red" />
+                    <list_entry value="yellow" />
+                </combo>
+                <combo key="cap:colour" text="Colour of the caps" default="red">
+                    <list_entry value="blue" />
+                    <list_entry value="green" />
+                    <list_entry value="red" />
+                    <list_entry value="yellow" />
+                </combo>
+                <text key="reflective:colour" text="Colour of reflective material" />
+                <text key="manufacturer" text="Manufacturer" />
+                <text key="model" text="Model" />
+                <text key="fire_hydrant:count" text="Number of hydrants, if more than one." />
+                <text key="fire_hydrant:style" text="For special designs." />
+                <text key="ref" text="Reference number" />
+                <text key="name" text="Name" />
+                <text key="source" text="Source" />
+            </optional>
         </item> <!-- Fire Hydrant -->
         <item name="Water Tank" icon="presets/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=water_tank"

[bus-mt@…]

I would change two things:

• for hydrants located underground, fire_hydrant:diameter is an essential information, not optional. At least in Germany this is written on the sign pointing to the hydrant, so the information can be found "on the ground".
• shorten some of the lists, where no description of the items is needed (mainly the colors).

Patch follows.

[Don-vip]

@Klumbumbus: is the patch ok?

[Klumbumbus]

In 14593/josm:

fix #15774 - Update emergency=fire_hydrant preset (based on patch by elgolfo and bus-mt), add a bunch of validator checks

[GerdP]

Please review. I see this in the log and a similar popup at JOSM start:
2018-12-23 07:51:05.297 SEVERE: Error initializing test TagChecker:

java.lang.IllegalArgumentException: 'fire_hydrant:pressure' does not contain '='

[GerdP]

In 14594/josm:

see #15774: Add robustness for typos in ignoretags.cfg

Before a simple typo in ignoretags.cfg stopped the initializePresets() method and thus TagChecker did not do much

[GerdP]

In 14595/josm:

see #15774: fix typo reg. E:fire_hydrant:pressure and remove K:water_source=main as water_source=main is now in the presets

[GerdP]

I've fixed some of the problems but I don't know what to do with the failed unit test OpeningHourTestTest.testPresetValues
https://josm.openstreetmap.de/jenkins/job/JOSM/4886/jdk=JDK8/testReport/junit/org.openstreetmap.josm.data.validation.tests/OpeningHourTestTest/testPresetValues/

Wrong value in presets is
"24/7,sunset-sunrise open; sunrise-sunset closed,Mar-Jun: closed; Jul-Feb: open,Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00"
Why use such a complex rule in the presets?

[Klumbumbus]

Replying to GerdP:

I've fixed some of the problems

Thanks.

the failed unit test

Thats from #16525.

[Klumbumbus]

In 14608/josm:

fix #17149, see #15774 - remove couplings:type from hydrant preset due to suspect values

[Klumbumbus]

In 14829/josm:

see #17414, see #15774 - set correct values_context for colour tags in hydrant preset