Skip to content

Commit a2fc61b

Browse files
committed
remove yard size
1 parent 40b2a1f commit a2fc61b

File tree

5 files changed

+1
-16
lines changed

5 files changed

+1
-16
lines changed

import/openrailwaymap.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ local stations = osm2pgsql.define_table({
253253
{ column = 'operator', type = 'text' },
254254
{ column = 'network', type = 'text' },
255255
{ column = 'position', sql_type = 'text[]' },
256-
{ column = 'yard_size', type = 'text' },
257256
{ column = 'yard_purpose', sql_type = 'text[]' },
258257
{ column = 'yard_hump', type = 'boolean' },
259258
{ column = 'wikidata', type = 'text' },
@@ -988,7 +987,6 @@ function osm2pgsql.process_node(object)
988987
operator = tags.operator,
989988
network = tags.network,
990989
position = to_sql_array(map(parse_railway_positions(position, position_exact, line_positions), format_railway_position)),
991-
yard_size = tags['railway:yard:size'],
992990
yard_purpose = split_semicolon_to_sql_array(tags['railway:yard:purpose']),
993991
yard_hump = tags['railway:yard:hump'] == 'yes' or nil,
994992
wikidata = tags.wikidata,
@@ -1267,7 +1265,6 @@ function osm2pgsql.process_way(object)
12671265
name_tags = name_tags(tags),
12681266
operator = tags.operator,
12691267
network = tags.network,
1270-
yard_size = tags['railway:yard:size'],
12711268
yard_purpose = split_semicolon_to_sql_array(tags['railway:yard:purpose']),
12721269
yard_hump = tags['railway:yard:hump'] == 'yes' or nil,
12731270
wikidata = tags.wikidata,

import/sql/get_station_importance.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS grouped_stations_with_route_count AS
219219
array_remove(array_agg(DISTINCT s.mapillary ORDER BY s.mapillary), null) as mapillary,
220220
array_remove(array_agg(DISTINCT s.note ORDER BY s.note), null) as note,
221221
array_remove(array_agg(DISTINCT s.description ORDER BY s.description), null) as description,
222-
array_remove(array_agg(DISTINCT s.yard_size ORDER BY s.yard_size), null) as yard_size,
223222
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,
224223
bool_or(s.yard_hump) as yard_hump,
225224
-- Aggregated route count columns

import/sql/tile_views.sql

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ CREATE OR REPLACE VIEW railway_text_stations AS
392392
nullif(array_to_string(wikipedia, U&'\001E'), '') as wikipedia,
393393
nullif(array_to_string(note, U&'\001E'), '') as note,
394394
nullif(array_to_string(description, U&'\001E'), '') as description,
395-
nullif(array_to_string(yard_size, U&'\001E'), '') as yard_size,
396395
nullif(array_to_string(yard_purpose, U&'\001E'), '') as yard_purpose,
397396
yard_hump
398397
FROM grouped_stations_with_route_count
@@ -433,7 +432,6 @@ RETURN (
433432
wikipedia,
434433
note,
435434
description,
436-
yard_size,
437435
yard_purpose,
438436
yard_hump
439437
FROM railway_text_stations
@@ -478,7 +476,6 @@ DO $do$ BEGIN
478476
"note": "string",
479477
"description": "string",
480478
"yard_purpose": "string",
481-
"yard_size": "string",
482479
"yard_hump": "boolean"
483480
}
484481
}
@@ -520,7 +517,6 @@ RETURN (
520517
wikipedia,
521518
note,
522519
description,
523-
yard_size,
524520
yard_purpose,
525521
yard_hump
526522
FROM railway_text_stations
@@ -563,7 +559,6 @@ DO $do$ BEGIN
563559
"note": "string",
564560
"description": "string",
565561
"yard_purpose": "string",
566-
"yard_size": "string",
567562
"yard_hump": "boolean"
568563
}
569564
}
@@ -707,7 +702,6 @@ RETURN (
707702
wikipedia,
708703
note,
709704
description,
710-
yard_size,
711705
yard_purpose,
712706
yard_hump
713707
FROM railway_text_stations
@@ -748,7 +742,6 @@ DO $do$ BEGIN
748742
"note": "string",
749743
"description": "string",
750744
"yard_purpose": "string",
751-
"yard_size": "string",
752745
"yard_hump": "boolean"
753746
}
754747
}

import/test/test_import_station.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,14 @@ assert.eq(osm2pgsql.get_and_clear_imported_data(), {
8686
osm2pgsql.process_node({
8787
tags = {
8888
['railway'] = 'yard',
89-
['railway:yard:size'] = 'large',
9089
['railway:yard:purpose'] = 'transloading;manifest',
9190
['railway:yard:hump'] = 'yes',
9291
},
9392
as_point = function () end,
9493
})
9594
assert.eq(osm2pgsql.get_and_clear_imported_data(), {
9695
stations = {
97-
{ feature = 'yard', state = 'present', station = 'train', name_tags = {}, yard_size = 'large', yard_hump = true, yard_purpose = '{"transloading","manifest"}' },
96+
{ feature = 'yard', state = 'present', station = 'train', name_tags = {}, yard_hump = true, yard_purpose = '{"transloading","manifest"}' },
9897
},
9998
})
10099

proxy/js/features.mjs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,6 @@ const stationFeatures = {
311311
position: {
312312
name: 'Position',
313313
},
314-
yard_size: {
315-
name: 'Yard size',
316-
},
317314
yard_purpose: {
318315
name: 'Yard purpose',
319316
},

0 commit comments

Comments
 (0)