Import additional yard fields (#675)

Fixes #662

Tested on http://localhost:8000/#view=14.97/31.1833/-82.38589 at
Waycross.
<img width="1420" height="929" alt="image"
src="https://github.com/user-attachments/assets/2b371d62-8054-47b6-a3fa-2e39eae2c934"
/>

Author: hiddewie

import/openrailwaymap.lua

@@ -253,6 +253,8 @@ local stations = osm2pgsql.define_table({
     { column = 'operator', type = 'text' },
     { column = 'network', type = 'text' },
     { column = 'position', sql_type = 'text[]' },
+    { column = 'yard_purpose', sql_type = 'text[]' },
+    { column = 'yard_hump', type = 'boolean' },
     { column = 'wikidata', type = 'text' },
     { column = 'wikimedia_commons', type = 'text' },
     { column = 'wikimedia_commons_file', type = 'text' },
@@ -985,6 +987,8 @@ function osm2pgsql.process_node(object)
         operator = tags.operator,
         network = tags.network,
         position = to_sql_array(map(parse_railway_positions(position, position_exact, line_positions), format_railway_position)),
+        yard_purpose = split_semicolon_to_sql_array(tags['railway:yard:purpose']),
+        yard_hump = tags['railway:yard:hump'] == 'yes' or nil,
         wikidata = tags.wikidata,
         wikimedia_commons = wikimedia_commons,
         wikimedia_commons_file = wikimedia_commons_file,
@@ -1261,6 +1265,8 @@ function osm2pgsql.process_way(object)
         name_tags = name_tags(tags),
         operator = tags.operator,
         network = tags.network,
+        yard_purpose = split_semicolon_to_sql_array(tags['railway:yard:purpose']),
+        yard_hump = tags['railway:yard:hump'] == 'yes' or nil,
         wikidata = tags.wikidata,
         wikimedia_commons = wikimedia_commons,
         wikimedia_commons_file = wikimedia_commons_file,

import/sql/get_station_importance.sql

@@ -219,6 +219,8 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS grouped_stations_with_route_count AS
     array_remove(array_agg(DISTINCT s.mapillary ORDER BY s.mapillary), null) as mapillary,
     array_remove(array_agg(DISTINCT s.note ORDER BY s.note), null) as note,
     array_remove(array_agg(DISTINCT s.description ORDER BY s.description), null) as description,
+    array_remove(string_to_array(array_to_string(array_agg(DISTINCT array_to_string(s.yard_purpose, U&'\\001E')), U&'\\001E'), U&'\\001E'), null) as yard_purpose,
+    bool_or(s.yard_hump) as yard_hump,
     -- Aggregated route count columns
     max(sr.route_count) as route_count,
     -- Re-grouped clustered stations columns

import/sql/tile_views.sql

@@ -391,7 +391,9 @@ CREATE OR REPLACE VIEW railway_text_stations AS
     nullif(array_to_string(mapillary, U&'\001E'), '') as mapillary,
     nullif(array_to_string(wikipedia, U&'\001E'), '') as wikipedia,
     nullif(array_to_string(note, U&'\001E'), '') as note,
-    nullif(array_to_string(description, U&'\001E'), '') as description
+    nullif(array_to_string(description, U&'\001E'), '') as description,
+    nullif(array_to_string(yard_purpose, U&'\001E'), '') as yard_purpose,
+    yard_hump
   FROM grouped_stations_with_route_count
   ORDER BY
     rank DESC NULLS LAST,
@@ -429,7 +431,9 @@ RETURN (
       mapillary,
       wikipedia,
       note,
-      description
+      description,
+      yard_purpose,
+      yard_hump
     FROM railway_text_stations
     WHERE way && ST_TileEnvelope(z, x, y)
       AND feature = 'station'
@@ -470,7 +474,9 @@ DO $do$ BEGIN
           "mapillary": "string",
           "wikipedia": "string",
           "note": "string",
-          "description": "string"
+          "description": "string",
+          "yard_purpose": "string",
+          "yard_hump": "boolean"
         }
       }
     ]
@@ -510,7 +516,9 @@ RETURN (
       mapillary,
       wikipedia,
       note,
-      description
+      description,
+      yard_purpose,
+      yard_hump
     FROM railway_text_stations
     WHERE way && ST_TileEnvelope(z, x, y)
       AND feature = 'station'
@@ -549,7 +557,9 @@ DO $do$ BEGIN
           "mapillary": "string",
           "wikipedia": "string",
           "note": "string",
-          "description": "string"
+          "description": "string",
+          "yard_purpose": "string",
+          "yard_hump": "boolean"
         }
       }
     ]
@@ -691,7 +701,9 @@ RETURN (
       mapillary,
       wikipedia,
       note,
-      description
+      description,
+      yard_purpose,
+      yard_hump
     FROM railway_text_stations
     WHERE way && ST_TileEnvelope(z, x, y)
       AND name IS NOT NULL
@@ -728,7 +740,9 @@ DO $do$ BEGIN
           "mapillary": "string",
           "wikipedia": "string",
           "note": "string",
-          "description": "string"
+          "description": "string",
+          "yard_purpose": "string",
+          "yard_hump": "boolean"
         }
       }
     ]

import/test/test_import_station.lua

@@ -83,6 +83,20 @@ assert.eq(osm2pgsql.get_and_clear_imported_data(), {
   },
 })
 
+osm2pgsql.process_node({
+  tags = {
+    ['railway'] = 'yard',
+    ['railway:yard:purpose'] = 'transloading;manifest',
+    ['railway:yard:hump'] = 'yes',
+  },
+  as_point = function () end,
+})
+assert.eq(osm2pgsql.get_and_clear_imported_data(), {
+  stations = {
+    { feature = 'yard', state = 'present', station = 'train', name_tags = {}, yard_hump = true, yard_purpose = '{"transloading","manifest"}' },
+  },
+})
+
 osm2pgsql.process_node({
   tags = {
     ['abandoned:railway'] = 'junction',

proxy/js/features.mjs

@@ -311,6 +311,12 @@ const stationFeatures = {
     position: {
       name: 'Position',
     },
+    yard_purpose: {
+      name: 'Yard purpose',
+    },
+    yard_hump: {
+      name: 'Yard hump',
+    },
     wikidata: {
       name: 'Wikidata',
       link: links.wikidata,