Refurbished spring icon (fix #325 using @imagico first tests) #3189

Penegal · 2018-04-23T15:09:07Z

Fixes #325

Test rendering with links to the example places:

before
after

Thanks to @imagico for the starting point.

…sts)

kocio-pl · 2018-04-23T15:32:54Z

Is the ring shown on top of the stream? I think it should be placed under.

Penegal · 2018-04-24T06:22:03Z

And that is why @imagico created a layer for this; I'll correct that.

Penegal · 2018-04-24T06:30:55Z

And here you are:

kocio-pl · 2018-04-25T00:33:48Z

Example place:

z14
Before

After

z15
Before

After

z16
Before

After

kocio-pl · 2018-04-25T00:47:09Z

Spring in a city park:

z14

z15

z16

meased · 2018-04-25T16:56:07Z

The color of blue seems odd. I think it would look more consistent with @water or @water-text.

Penegal · 2018-04-25T17:40:20Z

@meased : I tried that first, but the icon with that shade of blue seemed more difficult to see with some backgrounds, as you may see in #325. Besides, @kocio-pl was in favor of this version despite the different shade, and I felt that the favor of an experienced collaborator was enough to PR, particularly if the problem lay for years without resolution.

Penegal · 2018-04-27T14:57:30Z

Is there something I should improve before merging?

kocio-pl · 2018-04-27T14:59:41Z

I don't see anything like that at the moment. I just need some time to make additional test just in case, but basically that's all.

kocio-pl · 2018-04-29T11:08:04Z

symbols/spring.svg

+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4333"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />


These are some Inkscape leftovers in this file, as seen above - please make sure to save the file as plain SVG.

Penegal · 2018-04-29T18:26:12Z

@kocio-pl: this way? I'm a newbie regarding SVG code, so there might still be some useless code.

kocio-pl · 2018-04-29T18:30:28Z

I haven't tested it, but probably yes. I guess that you've removed it by hand? Standard procedure is to just write the file in the Inkscape as a plain SVG instead of Inkscape SVG. Usually it leads to removing a lot of unnecessary stuff (probably helpful only for extensive editing). Could you try it?

Penegal · 2018-04-30T06:19:51Z

I tried that, but it merely added noise instead of removing it:

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   id="svg6"
   version="1.1">
  <metadata
     id="metadata12">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs10" />
  <g
     transform="translate(0,-1036.3622)"
     id="layer1">
    <path
       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path4333"
       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
       transform="matrix(1.1666667,0,0,1.1666667,0,1033.6955)" />
    <path
       style="display:inline;fill:none;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path4327-3"
       d="m 6.875,1048.8622 a 3.375,3.3750069 0 1 1 -6.75,0 3.375,3.3750069 0 1 1 6.75,0 z" />
    <path
       style="display:inline;fill:none;stroke:#7abcec;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="path4327"
       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
       transform="matrix(1.125,0,0,1.1250023,0.125,1034.2372)" />
  </g>
</svg>

kocio-pl · 2018-04-30T22:39:13Z

project.mml

+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+             St_Centroid(way) AS way, "natural"


I'm not sure, but I suspect that this code makes test rendering on z14+ very long. Instead of 2-3 s it takes like 10+ s every time and there's heavy I/O load, which means big database query most probably.

This is nasty performance bug. Could you look closer and fix it?

I think dropping St_Centroid should give a similar result?

Also this might result in the spring icon being displayed outside of the spring polygons in case of moon-shaped springs - do we want that? Dropping the St_Centroid should solve that too.

This is beyond my knowledge, but sounds reasonable. I don't know how should the code look like after dropping it, could you show the proper code that I could test?

Simply like this (like a few lines below):

way, "natural"

Make sure to test it on spring areas.

It works somehow wrong then -
Example place: https://www.openstreetmap.org/way/436133353#map=18/50.43224/20.50234

What looks wrong according to you? Note that the text in the second image is not the same as the text in the first image.

OK, it's just a mess with different interior algorithm again - when compared with my own master it looks OK, drinkable water name+icon is just moved with this area:

For all 6 such areas in Poland the icon is placed the same as before, so it looks like this is not even needed. I believe marker-placement: interior in MSS file does the job.

I'm not sure if we should wait for @Penegal with this or just update this line somehow and merge it?

BTW: I hope soon we will have exactly the same interior algorithm in Kosmtik and on the OMSF servers, we're really close:

Update node-mapnik to 3.7.2 kosmtik/kosmtik#283 (and then a new Kosmtik release with npm package update, so our Docker image could be updated too...)

Deploying new Mapnik version (3.0.19) openstreetmap/chef#155 (comment)

kocio-pl · 2018-04-30T23:44:08Z

Thanks! This is a good update for probably the oldest leftovers that I hated the most...

Penegal · 2018-05-01T08:23:06Z

@kocio-pl: you're welcome; I'll be happy to see this non-intuitive S disappear. For information, why this additional commit? What's the matter with St_Centroid?

kocio-pl · 2018-05-01T08:25:58Z

This was both not needed and resulted in serious performance loss. See: #3189 (comment)

Penegal · 2018-05-01T08:39:23Z

OK, I just saw the reviews; sorry for the noise.

polarbearing · 2018-05-16T22:16:25Z

How does this look within a body of water?

Penegal · 2018-05-17T18:12:52Z

@polarbearing: as this has been merged and is part of v4.11.0 published 6 days ago, I would say that you'll see on the tiles on OSM.org. BTW, @kocio-pl, I'm surprised to not see the change on OSM.org tiles. I saw other style versions applied more quickly; is there a specific problem with this one?

matthijsmelissen · 2018-05-17T18:26:36Z

A version upgrade requires a manual action from the (voluntary) website maintainers. They likely have been busy with other stuff.

polarbearing · 2018-05-17T20:43:22Z

Ok here is the case to watch, Big Spring Missouri mapped as a node in a body of water.
Before:

tile

kocio-pl · 2018-05-18T02:06:15Z

Some forks have included last release already:

https://tile.iosb.fraunhofer.de/#map=16/36.9517/-90.9932/3

I don't know why OSMF admins didn't push that change yet, you can ask them about it here: openstreetmap/chef#162.

polarbearing · 2018-05-18T08:12:05Z

Looking at the Fraunhofer server, the rendering on water is strange.
On z15 I see the upper half of the halo, z16 a white ring cut in the direction of the river line, in z17 a tiny remainder of the halo, in z18-19 it disappears completely.

It is a pity that this was not tested beforehand, I had already mentioned that here: 325 comment.

Should we reopen or make a new issue?

kocio-pl · 2018-05-18T09:44:36Z

First make sure that it's really style issue, not the server rendering issue. Cut ring suggests me the later (for example if you change the layer to OSMde you will see no halo at all), so it's always best to test in your own environment.

polarbearing · 2018-05-18T10:00:27Z

ok but in the .de style you do not see any icon. So 'invisible in water' remains.
The 'after' examples above suggest that the river is painted over the icon. This might be nice for a line-only river to suggest in which direction it flows out, but it consequently fails for the water body, being the river outline or the lake around the icon.

kocio-pl · 2018-05-18T10:32:10Z

I see. What fix would you propose for this?

kocio-pl · 2018-05-18T11:03:54Z

Maybe adding white dot on top of the water would be good?

polarbearing · 2018-05-18T22:12:52Z

The release has been merged by Tom now, maybe we wait and check the rendering there.

I'll do some analysis meanwhile:

The SVG is constructed atypically compared to other icons. It seems to have no artboard size, thus git shows the icon in a large transparent square, opening with Illustrator presents it on an A4 sheet, partially hanging over the border.
It has 3 grouped paths being concentric rings. One is the blue ring (# 7abcec), the others are white (# ffffff). One of the white rings sits behind the blue and is thicker, thus constructs the 'halo'. The function of the third ring is unclear since it is thinner and behind the blue.
The SVG contains some 'transform' operations which apparently just shift the rings onto each other and could be avoided if they were drawn in the right place already.

All new icons I have analysed so far use fill while the stroke is empty. This SVG is the opposite.

Typically we have the icon black and define the colour in carto.

The ring (# 7abcec) is darker than water (@water-color defined as # aad3df)

IIRC, the order of the 'id:' elements in the 'Layer:' section in the project.mml defines the painting order? If so, 'water-areas' are painted earlier than 'springs' which are earlier than 'water-lines'.

This explains why a river line is painted over the ring, but I don't understand why the white rings disappear over a water area?

Finally I'd have the style for the spring rather in the water.mss with the natural things, while water-features.mss mostly has the man-made barrieres etc.

polarbearing · 2018-05-18T22:30:13Z

Fresh tile is there, spring invisible:

Refurbished spring icon (fix gravitystorm#325 using @imagico first te…

f5a85df

…sts)

Use @imagico code to display springs below waterways

68ec487

nebulon42 approved these changes Apr 27, 2018

View reviewed changes

kocio-pl reviewed Apr 29, 2018

View reviewed changes

Removed useless SVG code

4609121

kocio-pl reviewed Apr 30, 2018

View reviewed changes

Remove St_Centroid(way) performance regression

a2e2fe5

kocio-pl merged commit 5e8292b into gravitystorm:master Apr 30, 2018

polarbearing mentioned this pull request May 29, 2018

Spring icon invisible under waterway=river #3253

Closed

kocio-pl mentioned this pull request Oct 19, 2018

Remake natural=spring as dot+icon #3461

Open

jeisenbe mentioned this pull request Apr 6, 2019

Reorder layers to render ocean and water areas above water lines and landcover #3738

Merged

imagico mentioned this pull request Jan 26, 2020

natural=spring blocks place node labels #4011

Closed

imagico mentioned this pull request Mar 12, 2020

Move natural=spring back to amenity-points layer #4069

Merged

Refurbished spring icon (fix #325 using @imagico first tests) #3189

Refurbished spring icon (fix #325 using @imagico first tests) #3189

Conversation

Penegal commented Apr 23, 2018

kocio-pl commented Apr 23, 2018

Penegal commented Apr 24, 2018

Penegal commented Apr 24, 2018

kocio-pl commented Apr 25, 2018

kocio-pl commented Apr 25, 2018

meased commented Apr 25, 2018 • edited Loading

Penegal commented Apr 25, 2018

Penegal commented Apr 27, 2018

kocio-pl commented Apr 27, 2018

kocio-pl Apr 29, 2018

Choose a reason for hiding this comment

Penegal commented Apr 29, 2018

kocio-pl commented Apr 29, 2018

Penegal commented Apr 30, 2018

kocio-pl Apr 30, 2018

Choose a reason for hiding this comment

matthijsmelissen Apr 30, 2018

Choose a reason for hiding this comment

kocio-pl Apr 30, 2018

Choose a reason for hiding this comment

matthijsmelissen Apr 30, 2018 • edited Loading

Choose a reason for hiding this comment

kocio-pl Apr 30, 2018

Choose a reason for hiding this comment

matthijsmelissen Apr 30, 2018 • edited Loading

Choose a reason for hiding this comment

kocio-pl Apr 30, 2018

Choose a reason for hiding this comment

kocio-pl Apr 30, 2018

Choose a reason for hiding this comment

kocio-pl Apr 30, 2018 • edited Loading

Choose a reason for hiding this comment

kocio-pl commented Apr 30, 2018

Penegal commented May 1, 2018

kocio-pl commented May 1, 2018

Penegal commented May 1, 2018

polarbearing commented May 16, 2018

Penegal commented May 17, 2018

matthijsmelissen commented May 17, 2018

polarbearing commented May 17, 2018 • edited Loading

kocio-pl commented May 18, 2018

polarbearing commented May 18, 2018 • edited Loading

kocio-pl commented May 18, 2018 • edited Loading

polarbearing commented May 18, 2018

kocio-pl commented May 18, 2018

kocio-pl commented May 18, 2018

polarbearing commented May 18, 2018

polarbearing commented May 18, 2018

meased commented Apr 25, 2018 •

edited

Loading

matthijsmelissen Apr 30, 2018 •

edited

Loading

matthijsmelissen Apr 30, 2018 •

edited

Loading

kocio-pl Apr 30, 2018 •

edited

Loading

polarbearing commented May 17, 2018 •

edited

Loading

polarbearing commented May 18, 2018 •

edited

Loading

kocio-pl commented May 18, 2018 •

edited

Loading