Elevation / height no longer rendered for peaks, alpine huts, waterfalls etc.

[jeisenbe]

Expected behavior

• Peaks, volcanoes, saddles, alpine huts, and guideposts were previously displayed with their name and their elevation in meters when this was tagged as ele=*
• The height of a waterfall was added to the name as well

Actual behavior

• Currently the elevation and height are no longer rendered, due to changes in project.mml in PR Use ST_PointOnSurface for amenity points #3712

Test renderings illustrating the problem

Current rendering of Mt Everest with master branch

Rendering with commit 712afb8 (immediately before PR 3712) and same data

Test area current

Before

[matkoniecz]

Thanks for catching this!

[jeisenbe]

I've tried to fix this, but I can't figure out how to reformat the SQL correctly.

Previously this was in the main SQL select for the text-point layer:

            CONCAT(
                name,
                CASE WHEN name IS NOT NULL AND (elevation IS NOT NULL OR height IS NOT NULL) THEN E'\n' ELSE NULL END,
                CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\2212'), U&'\00A0', 'm') ELSE NULL END,
                CASE WHEN height IS NOT NULL THEN CONCAT(ROUND(height)::TEXT, U&'\00A0', 'm') ELSE NULL END
            ) AS name,
            CASE
              WHEN "natural" IN ('peak', 'volcano', 'saddle') THEN elevation
              WHEN "waterway" IN ('waterfall') THEN height
              ELSE NULL
            END AS score,

And this was in the subselect:

                CASE
                  WHEN "natural" IN ('peak', 'volcano', 'saddle')
                    OR tourism = 'alpine_hut' OR (tourism = 'information' AND tags->'information' = 'guidepost')
                    OR amenity = 'shelter' THEN
                    CASE
                      WHEN tags->'ele' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'ele')::NUMERIC
                      ELSE NULL
                    END
                  ELSE NULL
                END AS elevation,
                CASE
                  WHEN "waterway" IN ('waterfall') THEN
                    CASE
                      WHEN tags->'height' ~ '^\d{1,3}(\.\d+)?( m)?$' THEN (SUBSTRING(tags->'height', '^(\d{1,3}(\.\d+)?)( m)?$'))::NUMERIC
                      ELSE NULL
                    END
                  ELSE NULL
                END AS height,

Note that we would need to change the "height" column for waterfalls into "elevation" or something like "int_height" since man_made=tower is also selected with "height" in the amenity-points layer.

I've tried to insert these lines back into the new id: amenity-points layer, but I get errors.

Perhaps @pnorman has time to look into this one?