@@ -77,6 +78,28 @@ function LayerSidebar({
/>
+
+ setMapConfigFlag('obsRegions.show', !showRegions)}
+ />
+
+
+ {showRegions && (
+ <>
+
Color regions based on event count
+
+
+
+
+ )}
+
produce(untaggedRoadsLayer, (draft) => {
draft.id = "obs_roads_normal";
draft.filter = isValidAttribute(colorAttribute);
+ draft.minzoom = 10
draft.paint["line-width"][6] = 6; // scale bigger on zoom
draft.paint["line-color"] = colorAttribute.startsWith("distance_")
? colorByDistance(colorAttribute)
@@ -66,8 +61,8 @@ const getRoadsLayer = (colorAttribute, maxCount) =>
: colorAttribute.endsWith("zone")
? borderByZone()
: "#DDD";
- draft.paint["line-opacity"][3] = 12;
- draft.paint["line-opacity"][5] = 13;
+ // draft.paint["line-opacity"][3] = 12;
+ // draft.paint["line-opacity"][5] = 13;
});
const getEventsLayer = () => ({
@@ -162,6 +157,9 @@ function MapPage({ login }) {
layers.push(roadsLayer);
}
+ const regionLayers = useMemo(() => getRegionLayers(), [])
+ layers.push(...regionLayers)
+
const eventsLayer = useMemo(() => getEventsLayer(), []);
const eventsTextLayer = useMemo(() => getEventsTextLayer(), []);
if (mapConfig.obsEvents.show) {
diff --git a/frontend/src/reducers/mapConfig.ts b/frontend/src/reducers/mapConfig.ts
index 2ec5398..a597fbb 100644
--- a/frontend/src/reducers/mapConfig.ts
+++ b/frontend/src/reducers/mapConfig.ts
@@ -27,6 +27,9 @@ export type MapConfig = {
obsEvents: {
show: boolean;
};
+ obsRegions: {
+ show: boolean;
+ };
filters: {
currentUser: boolean;
dateMode: "none" | "range" | "threshold";
@@ -49,6 +52,9 @@ export const initialState: MapConfig = {
obsEvents: {
show: false,
},
+ obsRegions: {
+ show: true,
+ },
filters: {
currentUser: false,
dateMode: "none",
diff --git a/roads_import.lua b/roads_import.lua
index 2c1c45b..adeb663 100644
--- a/roads_import.lua
+++ b/roads_import.lua
@@ -50,6 +50,9 @@ local MOTORWAY_TYPES = {
"motorway_link",
}
+local ADMIN_LEVEL_MIN = 2
+local ADMIN_LEVEL_MAX = 8
+
local ONEWAY_YES = {"yes", "true", "1"}
local ONEWAY_REVERSE = {"reverse", "-1"}
@@ -61,6 +64,13 @@ local roads = osm2pgsql.define_way_table('road', {
{ column = 'oneway', type = 'bool' },
})
+local regions = osm2pgsql.define_relation_table('region', {
+ { column = 'name', type = 'text' },
+ { column = 'geometry', type = 'geometry' },
+ { column = 'admin_level', type = 'int' },
+ { column = 'tags', type = 'hstore' },
+})
+
local minspeed_rural = 60
function osm2pgsql.process_way(object)
@@ -131,3 +141,21 @@ function osm2pgsql.process_way(object)
})
end
end
+
+function osm2pgsql.process_relation(object)
+ local admin_level = tonumber(object.tags.admin_level)
+ if object.tags.boundary == "administrative" and admin_level and admin_level >= ADMIN_LEVEL_MIN and admin_level <= ADMIN_LEVEL_MAX then
+ regions:add_row({
+ geometry = { create = 'area' },
+ name = object.tags.name,
+ admin_level = admin_level,
+ tags = object.tags,
+ })
+ end
+end
+
+function osm2pgsql.select_relation_members(relation)
+ if relation.tags.type == 'route' then
+ return { ways = osm2pgsql.way_member_ids(relation) }
+ end
+end
diff --git a/tile-generator/layers/obs_events/layer.sql b/tile-generator/layers/obs_events/layer.sql
index 574d67c..6c4c5cd 100644
--- a/tile-generator/layers/obs_events/layer.sql
+++ b/tile-generator/layers/obs_events/layer.sql
@@ -14,7 +14,9 @@ RETURNS TABLE(event_id bigint, geometry geometry, distance_overtaker float, dist
FROM overtaking_event
FULL OUTER JOIN road ON road.way_id = overtaking_event.way_id
JOIN track on track.id = overtaking_event.track_id
- WHERE ST_Transform(overtaking_event.geometry, 3857) && bbox
+ WHERE
+ zoom_level >= 10 AND
+ ST_Transform(overtaking_event.geometry, 3857) && bbox
AND (user_id is NULL OR user_id = track.author_id)
AND time BETWEEN COALESCE(min_time, '1900-01-01'::timestamp) AND COALESCE(max_time, '2100-01-01'::timestamp);
diff --git a/tile-generator/layers/obs_regions/layer.sql b/tile-generator/layers/obs_regions/layer.sql
new file mode 100644
index 0000000..fda2a44
--- /dev/null
+++ b/tile-generator/layers/obs_regions/layer.sql
@@ -0,0 +1,26 @@
+DROP FUNCTION IF EXISTS layer_obs_regions(geometry, int);
+
+CREATE OR REPLACE FUNCTION layer_obs_regions(bbox geometry, zoom_level int)
+RETURNS TABLE(
+ region_id bigint,
+ geometry geometry,
+ name text,
+ admin_level int,
+ overtaking_event_count int
+) AS $$
+
+ SELECT
+ region.relation_id::bigint as region_id,
+ ST_SimplifyPreserveTopology(region.geometry, ZRes(zoom_level + 2)) as geometry,
+ region.name as name,
+ region.admin_level as admin_level,
+ count(overtaking_event.id)::int as overtaking_event_count
+ FROM region
+ LEFT JOIN overtaking_event on ST_Within(ST_Transform(overtaking_event.geometry, 3857), region.geometry)
+ WHERE
+ zoom_level >= 4 AND
+ zoom_level <= 12 AND
+ ST_Transform(region.geometry, 3857) && bbox
+ GROUP BY region.relation_id, region.name, region.geometry, region.admin_level
+
+$$ LANGUAGE SQL IMMUTABLE;
diff --git a/tile-generator/layers/obs_regions/obs_regions.yaml b/tile-generator/layers/obs_regions/obs_regions.yaml
new file mode 100644
index 0000000..477bf45
--- /dev/null
+++ b/tile-generator/layers/obs_regions/obs_regions.yaml
@@ -0,0 +1,23 @@
+layer:
+ id: "obs_regions"
+ description: |
+ Statistics on administrative boundary areas ("regions")
+ buffer_size: 4
+ fields:
+ overtaking_event_count: |
+ Number of overtaking events.
+ name: |
+ Name of the region
+ admin_level: |
+ Administrative level of the boundary, as tagged in OpenStreetMap
+ defaults:
+ srs: EPSG:3785
+ datasource:
+ srid: 3857
+ geometry_field: geometry
+ key_field: region_id
+ key_field_as_attribute: no
+ query: (SELECT region_id, geometry, name, admin_level, overtaking_event_count FROM layer_obs_regions(!bbox!, z(!scale_denominator!))) AS t
+
+schema:
+ - ./layer.sql
diff --git a/tile-generator/layers/obs_roads/layer.sql b/tile-generator/layers/obs_roads/layer.sql
index 2073150..391bfee 100644
--- a/tile-generator/layers/obs_roads/layer.sql
+++ b/tile-generator/layers/obs_roads/layer.sql
@@ -66,7 +66,9 @@ RETURNS TABLE(
GROUP BY overtaking_event.way_id, overtaking_event.direction_reversed
) e on (e.way_id = road.way_id and (road.directionality != 0 or e.direction_reversed = r.rev))
- WHERE road.geometry && bbox
+ WHERE
+ zoom_level >= 10 AND
+ road.geometry && bbox
GROUP BY
road.name,
road.way_id,
diff --git a/tile-generator/openbikesensor.yaml b/tile-generator/openbikesensor.yaml
index d3a7a65..3aedd7e 100644
--- a/tile-generator/openbikesensor.yaml
+++ b/tile-generator/openbikesensor.yaml
@@ -3,6 +3,7 @@ tileset:
layers:
- layers/obs_events/obs_events.yaml
- layers/obs_roads/obs_roads.yaml
+ - layers/obs_regions/obs_regions.yaml
version: 0.7.0
id: openbikesensor
description: >