hiddewie
diff --git a/‎api/test/api.hurl‎
Lines changed: 1 addition & 1 deletion b/‎api/test/api.hurl‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎import/docker-startup.sh‎
Lines changed: 9 additions & 0 deletions b/‎import/docker-startup.sh‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎import/openrailwaymap.lua‎
Lines changed: 14 additions & 1 deletion b/‎import/openrailwaymap.lua‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎import/sql/get_station_importance.sql‎
Lines changed: 12 additions & 159 deletions b/‎import/sql/get_station_importance.sql‎
Lines changed: 12 additions & 159 deletions
@@ -201,7 +201,7 @@ jsonpath "$" count == 3
 jsonpath "$[0].name" == "Landsberger Allee/Petersburger Straße"
 jsonpath "$[0].feature" == "tram_stop"
 jsonpath "$[0].state" == "present"
-jsonpath "$[0].rank" == 32
+jsonpath "$[0].rank" == 34
 jsonpath "$[0].osm_ids" count == 4
 jsonpath "$[0].osm_ids[0]" == 244129991
 jsonpath "$[0].osm_ids[1]" == 271777826
 
@@ -84,6 +84,11 @@ function create_update_functions_views() {
   $PSQL -f sql/api_milestone_functions.sql
   $PSQL -f sql/signal_features.sql
   $PSQL -f sql/get_station_importance.sql
+  $PSQL -f sql/update_station_importance.sql
+  osm2pgsql-gen \
+    --database gis \
+    --style openrailwaymap.lua
+  $PSQL -f sql/stations_clustered.sql
   $PSQL -f sql/tile_views.sql
   $PSQL -f sql/api_facility_views.sql
 }
@@ -92,6 +97,10 @@ function refresh_materialized_views() {
   echo "Updating materialized views"
   $PSQL -f sql/update_signal_features.sql
   $PSQL -f sql/update_station_importance.sql
+  osm2pgsql-gen \
+    --database gis \
+    --style openrailwaymap.lua
+  $PSQL -f sql/update_stations_clustered.sql
   $PSQL -f sql/update_api_views.sql
 }
 
 
@@ -1254,7 +1254,7 @@ function osm2pgsql.process_way(object)
   if station_feature then
     for station, _ in pairs(station_type(tags)) do
       stations:insert({
-        way = object:as_polygon(),
+        way = object.is_closed and object:as_polygon() or object:as_linestring(),
         feature = station_feature,
         state = station_state,
         name = tags.name or tags.short_name,
@@ -1478,3 +1478,16 @@ function osm2pgsql.process_relation(object)
     end
   end
 end
+
+function osm2pgsql.process_gen()
+  -- Discrete isolation to assign a "local" importance to each station
+  osm2pgsql.run_gen('discrete-isolation', {
+    name = 'station_importance',
+    debug = true,
+    src_table = 'stations_with_importance',
+    dest_table = 'stations_with_importance',
+    geom_column = 'way',
+    id_column = 'id',
+    importance_column = 'importance',
+  })
+end
@@ -103,69 +103,10 @@ CREATE OR REPLACE VIEW station_nodes_platforms_rel_count AS
   ) sr
   GROUP BY id;
 
--- Clustered stations without importance
-CREATE MATERIALIZED VIEW IF NOT EXISTS stations_clustered AS
-  SELECT
-    row_number() over (order by name, station, railway_ref, uic_ref, feature) as id,
-    name,
-    station,
-    railway_ref,
-    uic_ref,
-    feature,
-    state,
-    array_agg(facilities.id) as station_ids,
-    ST_Centroid(ST_ConvexHull(ST_RemoveRepeatedPoints(ST_Collect(way)))) as center,
-    ST_Buffer(ST_ConvexHull(ST_RemoveRepeatedPoints(ST_Collect(way))), 50) as buffered,
-    ST_NumGeometries(ST_RemoveRepeatedPoints(ST_Collect(way))) as count
-  FROM (
-    SELECT
-      *,
-      ST_ClusterDBSCAN(way, 400, 1) OVER (PARTITION BY name, station, railway_ref, uic_ref, feature, state) AS cluster_id
-    FROM (
-      SELECT
-        st_collect(any_value(s.way), st_collect(distinct q.way)) as way,
-        name,
-        station,
-        railway_ref,
-        uic_ref,
-        feature,
-        state,
-        id
-      FROM stations s
-      left join stop_areas sa
-        ON (ARRAY[s.osm_id] <@ sa.node_ref_ids AND s.osm_type = 'N')
-          OR (ARRAY[s.osm_id] <@ sa.way_ref_ids AND s.osm_type = 'W')
-          OR (ARRAY[s.osm_id] <@ sa.stop_ref_ids AND s.osm_type = 'N')
-      left join (
-        select
-          sa.osm_id as stop_area_id,
-          se.way
-        from stop_areas sa
-        join station_entrances se
-          on array[se.osm_id] <@ sa.node_ref_ids
-
-        union all
-
-        select
-          sa.osm_id as stop_area_id,
-          pl.way
-        from stop_areas sa
-        join platforms pl
-          on array[pl.osm_id] <@ sa.platform_ref_ids
-      ) q on q.stop_area_id = sa.osm_id
-      group by name, station, railway_ref, uic_ref, feature, state, id
-    ) stations_with_entrances
-  ) AS facilities
-  GROUP BY cluster_id, name, station, railway_ref, uic_ref, feature, state;
-
-CREATE INDEX IF NOT EXISTS stations_clustered_station_ids
-  ON stations_clustered
-    USING gin(station_ids);
-
-CREATE MATERIALIZED VIEW IF NOT EXISTS stations_with_importance AS
+CREATE OR REPLACE VIEW stations_with_importance_view AS
   SELECT
     id,
-    max(importance) as importance
+    1 + max(importance) as importance
   FROM (
     SELECT
       id,
@@ -191,7 +132,7 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS stations_with_importance AS
     SELECT
       s.id,
       -- The square root and factor are made to align the importance factors of yards
-      --   with stations. A 320 km yard is equivalent to a station with 140 platforms/routes.
+      --   with stations. A 320 km yard is equivalent to a station with 140 routes.
       SQRT(
         SUM(ST_Length(ST_Intersection(ST_Buffer(s.way, 50), l.way)))
       ) / 4 AS importance
@@ -210,100 +151,12 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS stations_with_importance AS
   ) all_stations_with_importance
   GROUP BY id;
 
-CREATE INDEX IF NOT EXISTS stations_with_importance_idx
-  ON stations_with_importance
-    USING btree(id);
-
--- Final table with station nodes and the number of route relations
--- needs about 3 to 4 minutes for whole Germany
--- or about 20 to 30 minutes for the whole planet
-CREATE MATERIALIZED VIEW IF NOT EXISTS grouped_stations_with_importance AS
-  SELECT
-    -- Aggregated station columns
-    array_agg(DISTINCT station_id ORDER BY station_id) as station_ids,
-    hstore(string_agg(nullif(name_tags::text, ''), ',')) as name_tags,
-    array_agg(osm_id ORDER BY osm_id) as osm_ids,
-    array_agg(osm_type ORDER BY osm_id) as osm_types,
-    array_remove(array_agg(DISTINCT s.operator ORDER BY s.operator), null) as operator,
-    array_remove(array_agg(DISTINCT s.network ORDER BY s.network), null) as network,
-    array_remove(string_to_array(array_to_string(array_agg(DISTINCT array_to_string(s.position, U&'\\001E')), U&'\\001E'), U&'\\001E'), null) as position,
-    array_remove(array_agg(DISTINCT s.wikidata ORDER BY s.wikidata), null) as wikidata,
-    array_remove(array_agg(DISTINCT s.wikimedia_commons ORDER BY s.wikimedia_commons), null) as wikimedia_commons,
-    array_remove(array_agg(DISTINCT s.wikimedia_commons_file ORDER BY s.wikimedia_commons_file), null) as wikimedia_commons_file,
-    array_remove(array_agg(DISTINCT s.wikipedia ORDER BY s.wikipedia), null) as wikipedia,
-    array_remove(array_agg(DISTINCT s.image ORDER BY s.image), null) as image,
-    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 importance
-    max(sr.importance) as importance,
-    -- Re-grouped clustered stations columns
-    clustered.id as id,
-    any_value(clustered.center) as center,
-    any_value(clustered.buffered) as buffered,
-    any_value(clustered.name) as name,
-    any_value(clustered.station) as station,
-    any_value(clustered.railway_ref) as railway_ref,
-    any_value(clustered.uic_ref) as uic_ref,
-    any_value(clustered.feature) as feature,
-    any_value(clustered.state) as state,
-    any_value(clustered.count) as count
-  FROM (
-    SELECT
-      id,
-      UNNEST(sc.station_ids) as station_id,
-      name, station, railway_ref, uic_ref, feature, state, station_ids, center, buffered, count
-    FROM stations_clustered sc
-  ) clustered
-  JOIN stations s
-    ON clustered.station_id = s.id
-  JOIN stations_with_importance sr
-    ON clustered.station_id = sr.id
-  GROUP BY clustered.id;
-
-CREATE INDEX IF NOT EXISTS grouped_stations_with_importance_center_index
-  ON grouped_stations_with_importance
-    USING GIST(center);
-
-CREATE INDEX IF NOT EXISTS grouped_stations_with_importance_buffered_index
-  ON grouped_stations_with_importance
-    USING GIST(buffered);
-
-CREATE INDEX IF NOT EXISTS grouped_stations_with_importance_osm_ids_index
-  ON grouped_stations_with_importance
-    USING GIN(osm_ids);
-
-CLUSTER grouped_stations_with_importance
-  USING grouped_stations_with_importance_center_index;
-
-CREATE MATERIALIZED VIEW IF NOT EXISTS stop_area_groups_buffered AS
-  SELECT
-    sag.osm_id,
-    ST_Buffer(ST_ConvexHull(ST_RemoveRepeatedPoints(ST_Collect(gs.buffered))), 20) as way
-  FROM stop_area_groups sag
-  JOIN stop_areas sa
-    ON ARRAY[sa.osm_id] <@ sag.stop_area_ref_ids
-  JOIN stations s
-    ON (ARRAY[s.osm_id] <@ sa.node_ref_ids AND s.osm_type = 'N')
-      OR (ARRAY[s.osm_id] <@ sa.way_ref_ids AND s.osm_type = 'W')
-      OR (ARRAY[s.osm_id] <@ sa.stop_ref_ids AND s.osm_type = 'N')
-  JOIN (
-    SELECT
-      unnest(osm_ids) AS osm_id,
-      unnest(osm_types) AS osm_type,
-      buffered
-    FROM grouped_stations_with_importance
-  ) gs
-    ON s.osm_id = gs.osm_id and s.osm_type = gs.osm_type
-  GROUP BY sag.osm_id
-  -- Only use station area groups that have more than one station area
-  HAVING COUNT(distinct sa.osm_id) > 1;
-
-CREATE INDEX IF NOT EXISTS stop_area_groups_buffered_index
-  ON stop_area_groups_buffered
-    USING GIST(way);
-
-CLUSTER stop_area_groups_buffered
-  USING stop_area_groups_buffered_index;
+-- Not a materialized view because the Osm2Pgsql scripts update the discrete isolation values
+CREATE TABLE IF NOT EXISTS stations_with_importance (
+  id BIGINT NOT NULL PRIMARY KEY,
+  way GEOMETRY NOT NULL,
+  importance NUMERIC NOT NULL DEFAULT 0,
+  discr_iso REAL NOT NULL DEFAULT 0.0, -- Column name is fixed
+  irank BIGINT NOT NULL DEFAULT 0, -- Column name is fixed
+  dirank BIGINT NOT NULL DEFAULT 0 -- Column name is fixed
+);