Modify

Opened 5 months ago

Last modified 4 weeks ago

#15774 new enhancement

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

Reported by: elgolfo Owned by: team
Priority: normal Milestone: 18.06
Component: Internal preset Version:
Keywords: template_report fire hydrant Cc: Klumbumbus

Description

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.

Attachments (3)

defaultpresets.xml (830.0 KB) - added by elgolfo 5 months ago.
fire_hydrant.diff (5.4 KB) - added by elgolfo 5 months ago.
fire_hydrant.2.diff (6.1 KB) - added by bus-mt@… 2 months ago.

Download all attachments as: .zip

Change History (12)

Changed 5 months ago by elgolfo

Attachment: defaultpresets.xml added

comment:1 Changed 5 months ago by Don-vip

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

comment:2 Changed 5 months ago by Don-vip

Owner: changed from team to elgolfo
Status: newneedinfo

Changed 5 months ago by elgolfo

Attachment: fire_hydrant.diff added

comment:3 Changed 5 months ago by elgolfo

Could have thought of it by myself.

comment:4 Changed 5 months ago by 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

     
    55535553                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hydrant" />
    55545554            <space />
    55555555            <key key="emergency" value="fire_hydrant" />
    5556             <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
    5557             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
    5558             <space />
    5559             <reference ref="name_ref" />
    5560             <text key="operator" text="Operator" />
    5561             <space />
    5562             <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
    5563             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
    5564             <text key="fire_hydrant:count" text="Count" />
     5556            <combo key="fire_hydrant:type" text="Shape" values_searchable="true">
     5557                <list_entry value="pipe" short_description="A simple capped pipe, without the usual hydrant shape." />
     5558                <list_entry value="pillar" short_description="A pillar type hydrant." />
     5559                <list_entry value="wall" short_description="A wall-mounted fire hydrant." />
     5560                <list_entry value="underground" short_description="A fire hydrant simple outlet located underground." />
     5561            </combo>
     5562            <combo key="fire_hydrant:pressure" text="Pressure in bar or suction" values_searchable="true">
     5563                <list_entry value="#" short_description="Pressure in bar." />
     5564                <list_entry value="yes" short_description="Pressure but value unknown." />
     5565                <list_entry value="suction" short_description="Hydrant is connected to a pond/stream/tank/pool, pump is needed." />
     5566            </combo>
     5567            <optional>
     5568                <combo key="water_source" text="Water source" default="main">
     5569                    <list_entry value="main" short_description="Hydrant is fed by the local distribution network." />
     5570                    <list_entry value="groundwater" short_description="A water well." />
     5571                    <list_entry value="stream" />
     5572                    <list_entry value="river" />
     5573                    <list_entry value="canal" />
     5574                    <list_entry value="drain" />
     5575                    <list_entry value="ditch" />
     5576                    <list_entry value="pond" />
     5577                    <list_entry value="lake" />
     5578                    <list_entry value="water_tank" />
     5579                    <list_entry value="swimming_pool" />
     5580                </combo>
     5581                <text key="survey:date" text="Date of last site survey" />
     5582                <combo key="fire_hydrant:position" text="Hydrant Position" values_context="hydrant position" >
     5583                    <list_entry value="lane" short_description="on the side of a road lane" />
     5584                    <list_entry value="parking_lot" short_description="in a parking_lot" />
     5585                    <list_entry value="sidewalk" short_description="on a sidewalk" />
     5586                    <list_entry value="green" short_description="in a grassy area" />
     5587                </combo>
     5588                <text key="water_volume" text="Volume of the water reserve." />
     5589                <text key="fire_hydrant:diameter" text="Nominal diameter (in mm, inches or letters)" />
     5590                <text key="flow_rate" text="Nominal flow rate with unit of measure" />
     5591                <combo key="fire_hydrant:awwa_class" text="Classification per American Waterworks Association (US only)">
     5592                    <list_entry value="AA" />
     5593                    <list_entry value="A" />
     5594                    <list_entry value="B" />
     5595                    <list_entry value="C" />
     5596                </combo>
     5597                <text key="couplings" text="Number of couplings" />
     5598                <combo key="couplings:type" text="Coupling standard">
     5599                    <list_entry value="Bayonet" />
     5600                    <list_entry value="Barcelona" />
     5601                    <list_entry value="Guillemin" />
     5602                    <list_entry value="Klaue" />
     5603                    <list_entry value="Sprawny" />
     5604                    <list_entry value="Storz" />
     5605                    <list_entry value="UNI" />
     5606                </combo>
     5607                <text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
     5608                <combo key="pillar:type" text="Description of pillar hydrants, in addition to fire_hydrant=pillar">
     5609                    <list_entry value="dry_barrel" short_description="A style of pillar hydrant where the water shutoff valve is below ground." />
     5610                    <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." />
     5611                </combo>
     5612                <combo key="colour" text="Colour" default="red">
     5613                    <list_entry value="blue" />
     5614                    <list_entry value="green" />
     5615                    <list_entry value="red" />
     5616                    <list_entry value="yellow" />
     5617                </combo>
     5618                <combo key="bonnet:colour" text="Colour of the top section (bonnet)" default="red">
     5619                    <list_entry value="blue" />
     5620                    <list_entry value="green" />
     5621                    <list_entry value="red" />
     5622                    <list_entry value="yellow" />
     5623                </combo>
     5624                <combo key="cap:colour" text="Colour of the caps" default="red">
     5625                    <list_entry value="blue" />
     5626                    <list_entry value="green" />
     5627                    <list_entry value="red" />
     5628                    <list_entry value="yellow" />
     5629                </combo>
     5630                <text key="reflective:colour" text="Colour of reflective material" />
     5631                <text key="manufacturer" text="Manufacturer" />
     5632                <text key="model" text="Model" />
     5633                <text key="fire_hydrant:count" text="Number of hydrants, if more than one." />
     5634                <text key="fire_hydrant:style" text="For special designs." />
     5635                <text key="ref" text="Reference number" />
     5636                <text key="name" text="Name" />
     5637                <text key="source" text="Source" />
     5638            </optional>
    55655639        </item> <!-- Fire Hydrant -->
    55665640        <item name="Water Tank" icon="presets/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
    55675641            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=water_tank"

comment:5 Changed 5 months ago by Don-vip

Cc: Klumbumbus added
Keywords: fire hydrant added
Owner: changed from elgolfo to team
Status: needinfonew

comment:6 Changed 5 months ago by Don-vip

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

comment:7 Changed 2 months ago by 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.

Changed 2 months ago by bus-mt@…

Attachment: fire_hydrant.2.diff added

comment:8 Changed 2 months ago by Klumbumbus

Milestone: 18.05

comment:9 Changed 4 weeks ago by Klumbumbus

Milestone: 18.0518.06

Modify Ticket

Change Properties
Set your email in Preferences
Action
as new The owner will remain team.
as The resolution will be set.
to The owner will be changed from team to the specified user.
The owner will change to elgolfo
as duplicate The resolution will be set to duplicate.The specified ticket will be cross-referenced with this ticket
The owner will be changed from team to anonymous.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.