Postgres 17 (#122)

See https://www.postgresql.org/about/news/postgresql-17-released-2936/

See
https://hub.docker.com/layers/postgis/postgis/17-3.4-alpine/images/sha256-5a1dbedac34e0e6663f8b7190d393339571f1cb3ecb2ab2f724524b4f3c7956e?context=explore

The redefinition of a column with a function call no longer works in
Postgres 17.

The function call to determine the largest speed has been moved to Lua
code.

Author: hiddewie

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgis/postgis:16-3.4-alpine as import
+FROM postgis/postgis:17-3.4-alpine as import
 
 COPY api.sql /sql/import.sql
 COPY facility_functions.sql /sql/facility_functions.sql
@@ -12,7 +12,7 @@ ENV PGDATA /var/lib/postgresql/postgres-data
 
 HEALTHCHECK CMD ["pg_isready", "--host", "localhost", "--user", "postgres", "--dbname", "gis", "--port", "5432"]
 
-FROM postgis/postgis:16-3.4-alpine as runtime
+FROM postgis/postgis:17-3.4-alpine as runtime
 
 RUN apk add --no-cache \
         curl \

db/Dockerfile

@@ -1,3 +1,3 @@
-FROM postgis/postgis:16-3.4-alpine
+FROM postgis/postgis:17-3.4-alpine
 
 COPY tune-postgis.sh /docker-entrypoint-initdb.d/tune-postgis.sh

import/openrailwaymap.lua

@@ -27,6 +27,40 @@ function strip_prefix(value, prefix)
   end
 end
 
+-- Convert a speed number from text to integer but not convert units
+function speed_int_noconvert(value)
+  local _, _, match = value:find('^(%d+%.?%d*)$')
+  if match then
+    return tonumber(match)
+  end
+
+  local _, _, match = value:find('^(%d+%.?%d*) ?mph$')
+  if match then
+    return tonumber(match)
+  end
+
+  return nil
+end
+
+-- Get the largest speed from a list of speed values (common at light speed signals)
+function largest_speed_noconvert(value)
+  if not value then
+    return nil
+  end
+
+  local largest_speed = nil
+  for elem in string.gmatch(value, '[^;]+') do
+    if elem then
+      local speed = speed_int_noconvert(elem)
+      if speed ~= nil and (largest_speed == nil or largest_speed < speed) then
+        largest_speed = speed
+      end
+    end
+  end
+
+  return largest_speed
+end
+
 local railway_line = osm2pgsql.define_table({
   name = 'railway_line',
   ids = { type = 'way', id_column = 'osm_id' },
@@ -414,8 +448,17 @@ function osm2pgsql.process_node(object)
       ["{% tag %}"] = tags['{% tag %}'],
 {% end %}
       {% for tag in speed_railway_signals.tags %}
+      {% unless tag | matches("railway:signal:speed_limit:speed") %}
+      {% unless tag | matches("railway:signal:speed_limit_distant:speed") %}
       ["{% tag %}"] = tags['{% tag %}'],
 {% end %}
+{% end %}
+{% end %}
+      -- We cast the highest speed to text to make it possible to only select those speeds
+      -- we have an icon for. Otherwise we might render an icon for 40 kph if
+      -- 42 is tagged (but invalid tagging).
+      ["railway:signal:speed_limit:speed"] = tags['railway:signal:speed_limit'] and largest_speed_noconvert(tags['railway:signal:speed_limit:speed']) or tags['railway:signal:speed_limit:speed'],
+      ["railway:signal:speed_limit_distant:speed"] = tags['railway:signal:speed_limit_distant'] and largest_speed_noconvert(tags['railway:signal:speed_limit_distant:speed']) or tags['railway:signal:speed_limit_distant:speed'],
       {% for tag in electrification_signals.tags %}
       ["{% tag %}"] = tags['{% tag %}'],
 {% end %}

import/sql/functions.sql

@@ -132,51 +132,6 @@ $$ LANGUAGE plpgsql
     LEAKPROOF
     PARALLEL SAFE;
 
--- Convert a speed number from text to integer but not convert units
-CREATE OR REPLACE FUNCTION railway_speed_int_noconvert(value TEXT) RETURNS INTEGER AS $$
-BEGIN
-  IF value ~ '^[0-9]+(\.[0-9]+)?$' THEN
-    RETURN value::DOUBLE PRECISION;
-  END IF;
-  IF value ~ '^[0-9]+(\.[0-9]+)? ?mph$' THEN
-    RETURN substring(value FROM '^([0-9]+(\.[0-9]+)?)')::DOUBLE PRECISION;
-  END IF;
-  RETURN NULL;
-END;
-$$ LANGUAGE plpgsql
-    IMMUTABLE
-    LEAKPROOF
-    PARALLEL SAFE;
-
--- Get the largest speed from a list of speed values (common at light speed signals)
-CREATE OR REPLACE FUNCTION railway_largest_speed_noconvert(value TEXT) RETURNS INTEGER AS $$
-DECLARE
-  parts TEXT[];
-  elem TEXT;
-  largest_value INTEGER := NULL;
-  this_value INTEGER;
-BEGIN
-  IF value IS NULL OR value = '' THEN
-    RETURN NULL;
-  END IF;
-  parts := regexp_split_to_array(value, ';');
-  FOREACH elem IN ARRAY parts
-  LOOP
-    IF elem = '' THEN
-      CONTINUE;
-    END IF;
-    this_value := railway_speed_int_noconvert(elem);
-    IF largest_value IS NULL OR largest_value < this_value THEN
-      largest_value := this_value;
-    END IF;
-  END LOOP;
-  RETURN largest_value;
-END;
-$$ LANGUAGE plpgsql
-    IMMUTABLE
-    LEAKPROOF
-    PARALLEL SAFE;
-
 -- Get dominant speed for coloring
 CREATE OR REPLACE FUNCTION railway_dominant_speed(preferred_direction TEXT, speed TEXT, forward_speed TEXT, backward_speed TEXT) RETURNS INTEGER AS $$
 BEGIN

import/sql/signals_with_azimuth.sql

@@ -3,10 +3,10 @@
 CREATE OR REPLACE VIEW signals_with_azimuth_view AS
   -- TODO investigate signals with null features
   SELECT
-    fs.*,
+    s.*,
     degrees(ST_Azimuth(
-      st_lineinterpolatepoint(sl.way, greatest(0, st_linelocatepoint(sl.way, ST_ClosestPoint(sl.way, fs.way)) - 0.01)),
-      st_lineinterpolatepoint(sl.way, least(1, st_linelocatepoint(sl.way, ST_ClosestPoint(sl.way, fs.way)) + 0.01))
+      st_lineinterpolatepoint(sl.way, greatest(0, st_linelocatepoint(sl.way, ST_ClosestPoint(sl.way, s.way)) - 0.01)),
+      st_lineinterpolatepoint(sl.way, least(1, st_linelocatepoint(sl.way, ST_ClosestPoint(sl.way, s.way)) + 0.01))
     )) + (CASE WHEN signal_direction = 'backward' THEN 180.0 ELSE 0.0 END) as azimuth,
     CASE
 
@@ -72,41 +72,12 @@ CREATE OR REPLACE VIEW signals_with_azimuth_view AS
 
 {% end %}
     END as electrification_feature
-  FROM (
-    SELECT
-      id,
-      way,
-      railway,
-      rank,
-      ref,
-      ref_multiline,
-      signal_direction,
-      deactivated,
-      {% for tag in signals_railway_signals.tags %}
-      "{% tag %}",
-{% end %}
-      {% for tag in speed_railway_signals.tags %}
-      {% unless tag | matches("railway:signal:speed_limit:speed") %}
-      {% unless tag | matches("railway:signal:speed_limit_distant:speed") %}
-      "{% tag %}",
-{% end %}
-{% end %}
-{% end %}
-      {% for tag in electrification_signals.tags %}
-      "{% tag %}",
-{% end %}
-      -- We cast the highest speed to text to make it possible to only select those speeds
-      -- we have an icon for. Otherwise we might render an icon for 40 kph if
-      -- 42 is tagged (but invalid tagging).
-      CASE WHEN "railway:signal:speed_limit" IS NOT NULL THEN railway_largest_speed_noconvert("railway:signal:speed_limit:speed")::text ELSE "railway:signal:speed_limit:speed" END AS "railway:signal:speed_limit:speed",
-      CASE WHEN "railway:signal:speed_limit_distant" IS NOT NULL THEN railway_largest_speed_noconvert("railway:signal:speed_limit_distant:speed")::text ELSE "railway:signal:speed_limit_distant:speed" END AS "railway:signal:speed_limit_distant:speed"
-    FROM signals s
-  ) AS fs
+  FROM signals s
   LEFT JOIN LATERAL (
     SELECT line.way as way
     FROM railway_line line
-    WHERE st_dwithin(fs.way, line.way, 10) AND line.railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'construction', 'preserved', 'monorail', 'miniature') -- TODO use feature
-    ORDER BY fs.way <-> line.way
+    WHERE st_dwithin(s.way, line.way, 10) AND line.railway IN ('rail', 'tram', 'light_rail', 'subway', 'narrow_gauge', 'construction', 'preserved', 'monorail', 'miniature') -- TODO use feature
+    ORDER BY s.way <-> line.way
     LIMIT 1
   ) as sl ON true
   WHERE