short_name -> name

layers/transportation/mapping.yaml

@@ -102,10 +102,6 @@ name_de_field: &name_de
   name: name_de
   key: name:de
   type: string
-short_name_field: &short_name
-  key: short_name
-  name: short_name
-  type: string
 tunnel_field: &tunnel
   key: tunnel
   name: is_tunnel
@@ -236,7 +232,6 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
-    - *short_name
     - *tunnel
     - *bridge
     - *ramp
@@ -316,7 +311,6 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
-    - *short_name
     - *tunnel
     - *bridge
     - *ramp
@@ -354,7 +348,6 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
-    - *short_name
     - *tunnel
     - *bridge
     - *ramp
@@ -393,7 +386,6 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
-    - *short_name
     - *tunnel
     - *bridge
     - *ramp
@@ -485,9 +477,6 @@ tables:
     - *ref
     - *network
     - *name
-    - name: short_name
-      key: short_name
-      type: string
     - name: osmc_symbol
       key: osmc:symbol
       type: string

layers/transportation/update_route_member.sql

@@ -83,7 +83,6 @@ CREATE TABLE IF NOT EXISTS transportation_route_member_coalesced
     role              varchar,
     type              smallint,
     name              varchar,
-    short_name        varchar,
     osmc_symbol       varchar,
     colour            varchar,
     network_type      route_network_type,
@@ -159,7 +158,6 @@ BEGIN
             role,
             type,
             name,
-            short_name,
             osmc_symbol,
             colour
         FROM osm_route_member
@@ -170,7 +168,7 @@ BEGIN
         )
     ) osm_route_member_filtered
     ON CONFLICT (member, network, ref) DO UPDATE SET osm_id = EXCLUDED.osm_id, role = EXCLUDED.role,
-                                                     type = EXCLUDED.type, name = EXCLUDED.name, short_name = EXCLUDED.short_name,
+                                                     type = EXCLUDED.type, name = EXCLUDED.name,
                                                      osmc_symbol = EXCLUDED.osmc_symbol, colour = EXCLUDED.colour,
                                                      concurrency_index = EXCLUDED.concurrency_index,
                                                      rank = EXCLUDED.rank;

layers/transportation/update_transportation_merge.sql

@@ -84,12 +84,12 @@ FROM (
         CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer,
         CASE WHEN highway IN ('footway', 'steps') THEN level END AS level,
         CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor,
-        NULLIF(rm1.network, '') || '=' || COALESCE(NULLIF(rm1.ref, ''), rm1.short_name) AS route_1,
-        NULLIF(rm2.network, '') || '=' || COALESCE(NULLIF(rm2.ref, ''), rm2.short_name) AS route_2,
-        NULLIF(rm3.network, '') || '=' || COALESCE(NULLIF(rm3.ref, ''), rm3.short_name) AS route_3,
-        NULLIF(rm4.network, '') || '=' || COALESCE(NULLIF(rm4.ref, ''), rm4.short_name) AS route_4,
-        NULLIF(rm5.network, '') || '=' || COALESCE(NULLIF(rm5.ref, ''), rm5.short_name) AS route_5,
-        NULLIF(rm6.network, '') || '=' || COALESCE(NULLIF(rm6.ref, ''), rm6.short_name) AS route_6,
+        NULLIF(rm1.network, '') || '=' || COALESCE(NULLIF(rm1.ref, ''), rm1.name) AS route_1,
+        NULLIF(rm2.network, '') || '=' || COALESCE(NULLIF(rm2.ref, ''), rm2.name) AS route_2,
+        NULLIF(rm3.network, '') || '=' || COALESCE(NULLIF(rm3.ref, ''), rm3.name) AS route_3,
+        NULLIF(rm4.network, '') || '=' || COALESCE(NULLIF(rm4.ref, ''), rm4.name) AS route_4,
+        NULLIF(rm5.network, '') || '=' || COALESCE(NULLIF(rm5.ref, ''), rm5.name) AS route_5,
+        NULLIF(rm6.network, '') || '=' || COALESCE(NULLIF(rm6.ref, ''), rm6.name) AS route_6,
         hl.z_order,
         LEAST(rm1.rank, rm2.rank, rm3.rank, rm4.rank, rm5.rank, rm6.rank) AS route_rank
     FROM osm_highway_linestring hl

layers/transportation_name/update_transportation_name.sql

@@ -752,12 +752,12 @@ BEGIN
             CASE WHEN highway IN ('footway', 'steps') THEN layer END AS layer,
             CASE WHEN highway IN ('footway', 'steps') THEN level END AS level,
             CASE WHEN highway IN ('footway', 'steps') THEN indoor END AS indoor,
-            NULLIF(rm1.network, '') || '=' || COALESCE(NULLIF(rm1.ref, ''), rm1.short_name) AS route_1,
-            NULLIF(rm2.network, '') || '=' || COALESCE(NULLIF(rm2.ref, ''), rm2.short_name) AS route_2,
-            NULLIF(rm3.network, '') || '=' || COALESCE(NULLIF(rm3.ref, ''), rm3.short_name) AS route_3,
-            NULLIF(rm4.network, '') || '=' || COALESCE(NULLIF(rm4.ref, ''), rm4.short_name) AS route_4,
-            NULLIF(rm5.network, '') || '=' || COALESCE(NULLIF(rm5.ref, ''), rm5.short_name) AS route_5,
-            NULLIF(rm6.network, '') || '=' || COALESCE(NULLIF(rm6.ref, ''), rm6.short_name) AS route_6,
+            NULLIF(rm1.network, '') || '=' || COALESCE(NULLIF(rm1.ref, ''), rm1.name) AS route_1,
+            NULLIF(rm2.network, '') || '=' || COALESCE(NULLIF(rm2.ref, ''), rm2.name) AS route_2,
+            NULLIF(rm3.network, '') || '=' || COALESCE(NULLIF(rm3.ref, ''), rm3.name) AS route_3,
+            NULLIF(rm4.network, '') || '=' || COALESCE(NULLIF(rm4.ref, ''), rm4.name) AS route_4,
+            NULLIF(rm5.network, '') || '=' || COALESCE(NULLIF(rm5.ref, ''), rm5.name) AS route_5,
+            NULLIF(rm6.network, '') || '=' || COALESCE(NULLIF(rm6.ref, ''), rm6.name) AS route_6,
             hl.z_order,
             LEAST(rm1.rank, rm2.rank, rm3.rank, rm4.rank, rm5.rank, rm6.rank) AS route_rank
         FROM osm_highway_linestring hl