[Patch] Add man_made pump preset

[francois.lacombe]

Dear maintainers,

Earlier this year, pumping proposal has been reviewed and approved on osm wiki.
​https://wiki.openstreetmap.org/wiki/Proposed_features/Pumping_proposal

It reinforces tagging associated to man_made=pump and some presets could be useful to encourage mappers to use it accordingly.

Is this possible to add a preset "Pump" for man_made_pump please?
​https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dpump

Some combinations could be done with man_made=pump and could also be added to man_made=windpump, man_made=water_well or man_made=petroleum_well.

• pump_mechanism=* see values ​https://wiki.openstreetmap.org/wiki/Key:pump_mechanism
• mechanical_driver=* see values ​https://wiki.openstreetmap.org/wiki/Key:mechanical_driver
• mechanical_coupling=* see values ​https://wiki.openstreetmap.org/wiki/Key:mechanical_coupling
• handle=wheel,cross,lever,crank,button,no ​https://wiki.openstreetmap.org/wiki/Key:handle
• pressure=*
• flow_rate=*
• operator=*
• manufacturer=*

handle is already in use with pipeline=valve

Very simple validation rules apply

• when mechanical_driver=manual used, handle=* is expected.
• pump_mechanism=* requires man_made=pump, man_made=windpump, man_made=water_well or man_made=petroleum_well

Thanks in advance

[skyper]

Do you have some nice icons (.svg) ?

[francois.lacombe]

Pump icon for man_made=pump preset

[francois.lacombe]

Hi Skyper

Here is a pump icon that could be associated to man_made=pump
It is provided with a blue background that could be changed accordingly with substance=* value, just like street cabinets with street_cabinet=*

All the best

[francois.lacombe]

Keep in mind #20531 is linked to this ticket and can be processed in the same time.

Best regards

[Don-vip]

We need a pump icon and I can't find a suitable one.

​https://www.flaticon.com/free-icon/water-pump_940748 and ​https://www.flaticon.com/free-icon/water-pump_523818 are really good but I'm not sure about the license.

Any volunteer to draw a new one? :D

[Klumbumbus]

In r17028 I made one for man_made=pumping_station. As this was not so long ago we could change it and use it for man_made=pump instead. But that would require to find a new icon for man_made=pumping_station...

[francois.lacombe]

Don-Vip, Klmbumbus, didn't you guys see the beautiful one I've provided upside? :)

https://josm.openstreetmap.de/attachment/ticket/20530/eau_pompe.svg

Well, mine is a centrifugal one while Don-Vip proposed a piston (fountain) shape one, both are suitable but I'd use the fountain for man_made=water_well.
We can discuss this here.

[Klumbumbus]

Replying to francois.lacombe:

Don-Vip, Klmbumbus, didn't you guys see the beautiful one I've provided upside? :)

https://josm.openstreetmap.de/attachment/ticket/20530/eau_pompe.svg

True, thats nice. Did you create it yourself or what's the source?

[francois.lacombe]

It's mine, CC BY-SA licence :)

[Don-vip]

Ah, didn't see it at all, sorry :D It's nice, thank you!

[Don-vip]

@François if you find/make an icon for ​windpump I'm ok to add it too.

[Don-vip]

@François same for ​petroleum_well. It has been ignored in r9050 because it was unclear at the time but it's time we include it now.

[francois.lacombe]

Sorry guys, I won't have enough time to work on this shortly

I agree this would be great but will require further improvement

[francois.lacombe]

Icon for man_made=windpump

[francois.lacombe]

Icon for man_made=petroleum_well

[francois.lacombe]

Dear all

Find attached 2 missing icons, for windpump and petroluem_well.

Hope this will do the job, all the best

[skyper]

@Don-vip:
Do you take care of this or would you like to get support by a patch? Ticket is assign to yourself.

[Don-vip]

I already started to work on this, I'll do it soon.

[skyper]

Fine, I can wait and take care of other tickets then.

[francois.lacombe]

Thank you

Let me know, I'll do translation in French for next release.

[Don-vip]

I can't find enough time to finish this :( If anyone wants to do it, go. If not, I'll take it back after my holidays, in September.

[skyper]

Mmh, I did not fully understand which additional tags are suited for water_well, petroleum_well and windpump.
mechanical_drive does not work with windpump, I guess, and handle is only useful with mechanical_drive=manual (validator warning). Anything else to consider?

For the background color of pump and pumping_station I would use the same colors used for generator:source=* with power=generator.

[francois.lacombe]

Hi Skyper, thank you for the followup

Indeed only windpump has restriction on mechanical_driver.
Wells can got all pump tagging.

As handles may be installed in case of failing driver, windpumps particularly can have handles despite the driver isn't manual.
See ​https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwindpump
I've corrected the ticket because it wasn't correct to validate handle with manual driver only. It's more handle is expected when mechanical_driver=manual is used (already the case with pipeline=valve + actuator=manual)

I understand you propose to adapt icons background, according to what tag exactly?

[skyper]

Mmh, to me this sounds more like mechanical_driver=wind;manual for windpump.

Replying to francois.lacombe:

Here is a pump icon that could be associated to man_made=pump
It is provided with a blue background that could be changed accordingly with substance=* value, just like street cabinets with street_cabinet=*

You suggested substance=* for background color or did your opinion change over the time?

We already have gas and oil in generator:source=*, waste and sewage plus geothermal and heat are pretty similar.

[skyper]

pump preset screenshot

[skyper]

icons casing black bg

[skyper]

icons casing light bg

[skyper]

water_well preset screenshot

[skyper]

I have started to play around with casing or solid background colors but I fear, as Klumbumbus told me, CC BY-SA does not work together with GPL.

Replying to francois.lacombe:

It's mine, CC BY-SA licence :)

Either, you re-license your icons or I need to create similar, new ones.

---

Icons with casing:

Preview of presets:

[skyper]

windpump preset screenshot

[skyper]

petroleum_well preset screenshot

[skyper]

While I am adding some validator rules is a warning about missing substance=* for pump, pumping_station, windpump and petroleum_well appreciated? Are there more primary tags which should be included?

[francois.lacombe]

Hi Skyper

Mmh, to me this sounds more like mechanical_driver=wind;manual for windpump.

I didn't consider it this way for backup driver, particularly if it implies to use a ; list.

I fear, as Klumbumbus told me, CC BY-SA does not work together with GPL.

Isn't this enough? It's ok for me to use CC4 BY-SA.
​https://creativecommons.org/2015/10/08/cc-by-sa-4-0-now-one-way-compatible-with-gplv3/

You suggested substance=* for background color or did your opinion change over the time?

It's true, I didn't remember this past suggestion, despite substance is only optional.
It's ok for pump and petroleum_well, but not for pumping_station (which is a facility hosting actual pumps, then shouldn't get substance on it).

While I am adding some validator rules is a warning about missing substance=* appreciated?

The wiki stands for optional for substance, I'm not sure it's a good point to validate it as such.
​https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dpump

I think pump_mechanism and mechanical_driver are more important tag than substance in the proposed presets.
It's really good to see by the way, really cool

All the best

[skyper]

Replying to francois.lacombe:

I fear, as Klumbumbus told me, CC BY-SA does not work together with GPL.

Isn't this enough? It's ok for me to use CC4 BY-SA.
​https://creativecommons.org/2015/10/08/cc-by-sa-4-0-now-one-way-compatible-with-gplv3/

Sounds good to me as far as I understand LICENSE​ and Developers Guide. I could leave the license for the icons as CC-BY-SA-4.0, I guess, but I am not an expert.

@Don-vip, @stoecker:
Will this work with GPL3?

Mmh, to me this sounds more like mechanical_driver=wind;manual for windpump.

I didn't consider it this way for backup driver, particularly if it implies to use a ; list.

Will leave this for the future but try to make the validator rule working with multiple values.

You suggested substance=* for background color or did your opinion change over the time?

It's true, I didn't remember this past suggestion, despite substance is only optional.
It's ok for pump and petroleum_well, but not for pumping_station (which is a facility hosting actual pumps, then shouldn't get substance on it).

Ok.

While I am adding some validator rules is a warning about missing substance=* appreciated?

The wiki stands for optional for substance, I'm not sure it's a good point to validate it as such.
​https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dpump

I think pump_mechanism and mechanical_driver are more important tag than substance in the proposed presets.

I see, so no validation on substance.

It's really good to see by the way, really cool

Thanks, for me this was an easier part. Think I am done with everything besides the icons.

[skyper]

new icons to be added under presets/landmarks/

[skyper]

new icons on dark background

[skyper]

new icons light background

[skyper]

patch including presets, validator rules, ignorefile and image updates; new icons not included

[skyper]

Please, find and test my patch​. Includes everything except of the new icons​

[skyper]

Oh, I change the color of power source water a bit, scaled power source sun to default size and all power source icons to 96 dpi.

[gaben]

A quick look at the patch:

• heat is not a substance, shouldn't be included this way in the presets
• the new blue pump colour is a bit flashy, the previous one is much more neutral (in my opinion)
• the well icon is odd, reminds me of a ​flare, not a well

If a well is powered by a pump, it could have that hammer looking thing in the icon as well, isn't it?

[skyper]

• heat as value of substance is already present, I simply copied this combobox.
  • I understand your concerns but what are the alternatives, hot_water, hot_drinking_water, water_steam`?
• I tried to use find a compromise between and
• yes, so we need at least less or no flame
  • Finding appropriate icons is the most time consuming part, so I am happy about suggestions.
  • I do not know how I can tell JOSM to use specified colors for an svg object, so I have to create an own icone for each background, atm.

We could use a lot more icons, e.g. for mechanical_driver=* to add them in the combobox list and to have different icons in mappaint.

[francois.lacombe]

Hi all

+1 on heat.
See the introduction on this page about heating: ​https://wiki.openstreetmap.org/wiki/Key:utility
Heating could mean substance=hot_water,steam mainly.

The icons looks good thank you
One little detail: with no substance, we may use a grey outline as to get rid of this white casing

Note that the "hammer" looking of a pump powered petroleum well corresponds to mechanical_coupling=nodding_donkey, not mechanical_driver.

Petroleum well icon can be drawn without fire on top of it. It was intended to remind a derrick and It's been hard to draw a nodding donkey instead of the derrick in a 16x16 square.

[gaben]

• Yeah I know you copied, just wanted to raise awareness of the substance tag (further planned) misuse.

If we want to stick to the substance tag, the only valid key, in this case, is water (or maybe steam). The water properties should be in different tags. A good example would be ​Tag:natural=hot_spring where they tried to decouple the water tags from the main tag. See water_characteristic, temperature, spring:type.

Intuition could be: imagine you go sightseeing in the area and the pipe is leaking its content. What do you say what's leaking? I think no one ever would say heat is spilt on the ground ;)

(If you ask me, I would first add the state of the flowing material; liquid, gas or mixed. Then the common name, usage (eg. heat transfer), in case of water: potable, industrial or sewage and finally the other tags. But this is completely off topic.)

• They are good, just a bit flashy, but alright. You worked on this ticket enough.

• For wells I created two icons:
  • base for wells
  • "nodding donkey"

[gaben]

draft

[gaben]

draft

[skyper]

Reg. substance=*, I do not want to dig that deep as it better suites an own ticket, updating the values in the presets and adding some validator rules.
Is it fine to replace heat with steam and hot_water for now?

Reg. background color, especially blue, what do you suggest? Little softer colors? Little darker colors? Only blue (water) a little darker? They should work with power:source=*, too, and with dark background. Probably one reason I tend to use lighter and flashy colors.

I can take another look at the base icon for petroleum_wells or is ok? Thanks, by the way.

Regarding icons per coupling or driver this might get to deep as I guess we need different icons for both and still changing background but I can test with mechanical_coupling=nodding_donkey.

[gaben]

Steam and hot_water is okay until we settle the subject.

I didn't test, but a slightly darker colour is may be better. Also worth differentiating between and because one is passive the other is active element in the system (generator vs pump).

Sure, it's just a draft :)

[skyper]

I thought the difference between active and passive is expressed by background/halo vs. part of the icon itself. I can simply leave out all the color changes of source:generator and use the blue from the water icon , for now.

[francois.lacombe]

Hi all

I'm impressed by details of @gaben's icons. Shouldn't we add them a casing as it won't be easy to see them on black background?
The two icons are really nice and may we use them both?
The base icon for wells without mechanical_coupling=nodding_donkey and the nodding donkey for the others, as nodding donkeys are often visible and representative.
If it's not possible, the base icon will suit all petroleum wells.

Regarding active/passive, both pumps and generator are active devices (they need power to run). I wasn't aware of such a distinction with icons shape.
It's ok to change hydro generator color for the nautical blue instead of cyan.

[skyper]

new icons version 2

[skyper]

I tried to address everything in patch version 2​.

• replace value of substance=heat with hot_water and steam
• use nautical blue for water background/casing
• little centering of object in new icons
• add casing to both new well icons
  • is tricky with complex icons but a completly filled background looks worser.
• use donkey icon if appropriate

New icons are in josm_20530_new_pump_icons_v2.tar.xz​.

[skyper]

patch version 2: replace substance heat with hot_water,steam; nautical blue; use donkey icon for specific coupling

[francois.lacombe]

Thank you for this hard work Skyper

One minor comment, in the icon archive josm_20530_new_pump_icons_v2, should we rename icons oil_well and gas_well to well_oil and well_gas for sake of consistency with pump and windpump?

Apart this point it's completely ok for me.

[gaben]

There is a typo in pump_mechanism values: centrifugal.axial_flow.

[gaben]

Hmm, the well rendering somehow is broken in JOSM.

To reproduce:

1. apply skyper's patches
2. activate the icon tester mappaint style
3. tag a node with man_made=petroleum_well
4. specify a width eg. width=500 to see the problem better

[skyper]

• Reg. icon names: Consistent would be petroleum_well_gas.svg but I was not sure if water_well could also be a donkey, so naming will not be 100% consistent, anyway
• Reg icons rendering: I spend quite some time on the casing respectively background but I never closely look at the original icons. I fear JOSM does not handle them properly, as Gabe's original ones do not render properly either. Damn.
  • Thanks for the hint with width=*
• Fixed the typo, locally so far, thanks.

[gaben]

Replying to skyper:

Gabe's original ones do not render properly either. Damn.

Left is the original, right is the modified:

I don't know what's wrong with it, outside JOSM looks as it should be.

[skyper]

broken rendering of originals

[skyper]

This is how the two original icons, and , look like at my screen in JOSM. I just re-downloaded the attachments and did restart JOSM.

[gaben]

global CSS attributes converted to line attributes

[gaben]

Alright, fixed the style attributes now they work as needed. It seems SVGSalamander does not support global CSS styles.

@francois.lacombe, @skyper thank you for your work. I still see potential in icon improvement, but they are final versions from me.

[skyper]

new icons version 3: no CSS; bigger radius of curves at background edges; proper background blue for windpump

[skyper]

patch version 3: fix typo in preset values; shorter regex in validator

[skyper]

Thanks, icons are a never ending story. Lots of contrast and tiny black strokes around the svg objects is helpful but I have only little experience with inkscape. I tried with full background instead of casing but that does not look prettier. Anyway, renaming or updating icons, afterwards, should not be a problem.

I have updated the patch​ and the the new icons​:

• fix typo in pump_mechanism values
• shorten regex in validator test

• correct blue for background of windpump
• new icons without global CSS
• bigger radius at background edges

Hope this works now and can be commited.

[francois.lacombe]

We're almost done here, really good input regarding css in svg, I wouldn't have notice this myself.

Replying to skyper:

• Reg. icon names: Consistent would be petroleum_well_gas.svg but I was not sure if water_well could also be a donkey, so naming will not be 100% consistent, anyway

To be fair, yes we could find donkeys on water wells
​https://www.youtube.com/watch?v=2lkoCCCQytc
Opportunity to add details on wiki: ​https://wiki.openstreetmap.org/wiki/Tag:mechanical_coupling%3Dnodding_donkey

I think man_made=water_well and man_made=petroleum_well should get the same pump details preset if possible
They could share the donkey icon and keep their own icon for other couplings.

Otherwise it's still ok for me

[skyper]

Ok, all four preset have the same tags regarding mechanism/mechanics except windpump which is missing mechanical_driver, see my screenshots in comment 33. Is this correct?
I already thought about changing icons for water_well and I can do it. So we need on more icon, water_well_donkey.svg and and four more lines in the style file.
I forgot to add presets_links between the four different presets which I will add.

Anything else?

[francois.lacombe]

That will be perfect with those remaining points Skyper, nothing more on my side, thank you !

[skyper]

new icons v4: add water_well_donky.svg

[skyper]

v4: add preset_links and water_well_donky; deprecate man_made=pumping_rig, pump:type=* and substance=heat

[skyper]

I had totally forgotten about deprecating man_made=pumping_rig and pump:type=* which lead to deprecating substance=heat, too.

If I did not mess up, I hope I am finally done, now, as this big patch continues to grow.
Please, find version 4 (patch​​ plus new icons​​):

• adds preset_links between the four presets
• adds new icon water_well_donky.svg
• deprecate man_made=pumping_rig, pump:type=*, and substance=heat

[francois.lacombe]

It's fine Skyper, mind closing #20531 as well once merged :)

[skyper]

Replying to francois.lacombe:

It's fine Skyper, mind closing #20531 as well once merged :)

Cool. Did not know about #20531 but yeah, this fixes both tickets and both should me mentioned and fixed with the commit.

[Don-vip]

In 18230/josm:

fix #20530 - fix #20531 - Add man_made pump preset, deprecate man_made=pumping_rig, pump:type=* and substance=heat (patch and icons by skyper, François Lacombe and gaben)

[skyper]

francois.lacombe should get also credit for the icons.

[gaben]

Replying to Don-vip:

In 18230/josm:

fix #20530 - fix #20531 - Add man_made pump preset, deprecate man_made=pumping_rig, pump:type=* and substance=heat (patch and icons by skyper, François Lacombe and gaben)

I didn't do all the icons, it was teamwork from me, @skyper and @francois.lacombe.

[Don-vip]

I've changed the commit message.

[skyper]

With I think the background for sewage needs to be changed, see #21388.

[skyper]

Replying to Don-vip:

I've changed the commit message.

Thanks.

[gaben]

I created a new ticket for reusing the original well icon as a flare, see #21409.

[Don-vip]

Milestone renamed