-
{region.properties.name || "Unnamed region"}
+
{region.properties.name || t(`MapPage.regionInfo.unnamedRegion`)}
@@ -17,7 +19,7 @@ export default function RegionInfo({ region, mapInfoPortal, onClose }) {
- Number of events
+ {t(`MapPage.regionInfo.eventNumber`)}
{region.properties.overtaking_event_count ?? 0}
diff --git a/frontend/src/pages/MapPage/RoadInfo.tsx b/frontend/src/pages/MapPage/RoadInfo.tsx
index 186ebe7..a4c988a 100644
--- a/frontend/src/pages/MapPage/RoadInfo.tsx
+++ b/frontend/src/pages/MapPage/RoadInfo.tsx
@@ -1,15 +1,26 @@
-import React, {useState, useCallback} from 'react'
-import _ from 'lodash'
-import {Segment, Menu, Header, Label, Icon, Table} from 'semantic-ui-react'
-import {Layer, Source} from 'react-map-gl'
-import {of, from, concat} from 'rxjs'
-import {useObservable} from 'rxjs-hooks'
-import {switchMap, distinctUntilChanged} from 'rxjs/operators'
-import {Chart} from 'components'
-import {pairwise} from 'utils'
+import React, { useState, useCallback } from "react";
+import _ from "lodash";
+import {
+ Segment,
+ Menu,
+ Header,
+ Label,
+ Icon,
+ Table,
+ Message,
+ Button,
+} from "semantic-ui-react";
+import { Layer, Source } from "react-map-gl";
+import { of, from, concat } from "rxjs";
+import { useObservable } from "rxjs-hooks";
+import { switchMap, distinctUntilChanged } from "rxjs/operators";
+import { Chart } from "components";
+import { pairwise } from "utils";
+import { useTranslation } from "react-i18next";
-import api from 'api'
-import {colorByDistance, borderByZone} from 'mapstyles'
+import type { Location } from "types";
+import api from "api";
+import { colorByDistance, borderByZone } from "mapstyles";
import styles from "./styles.module.less";
@@ -127,7 +138,15 @@ function HistogramChart({ bins, counts, zone }) {
);
}
-export default function RoadInfo({ clickLocation }) {
+export default function RoadInfo({
+ clickLocation,
+ hasFilters,
+ onClose,
+}: {
+ clickLocation: Location | null;
+ hasFilters: boolean;
+ onClose: () => void;
+}) {
const { t } = useTranslation();
const [direction, setDirection] = useState("forwards");
@@ -196,42 +215,51 @@ export default function RoadInfo({ clickLocation }) {
/>
+ {hasFilters && (
+
+
+
+ {t("MapPage.roadInfo.hintFiltersNotApplied")}
+
+
+ )}
+
{info?.road.zone && (
)}
- {info.road.oneway && (
+ {info?.road.oneway && (
)}
- {info.road.oneway ? null : (
-
@@ -338,6 +310,7 @@ function MapPage({ login }) {
)}
diff --git a/frontend/src/pages/TracksPage.tsx b/frontend/src/pages/TracksPage.tsx
index 3942329..68e3a80 100644
--- a/frontend/src/pages/TracksPage.tsx
+++ b/frontend/src/pages/TracksPage.tsx
@@ -1,11 +1,20 @@
-import React, {useCallback} from 'react'
-import {connect} from 'react-redux'
-import {Button, Message, Item, Header, Loader, Pagination, Icon} from 'semantic-ui-react'
-import {useObservable} from 'rxjs-hooks'
-import {Link} from 'react-router-dom'
-import {of, from, concat} from 'rxjs'
-import {map, switchMap, distinctUntilChanged} from 'rxjs/operators'
-import _ from 'lodash'
+import React, { useCallback } from "react";
+import { connect } from "react-redux";
+import {
+ Button,
+ Message,
+ Item,
+ Header,
+ Loader,
+ Pagination,
+ Icon,
+} from "semantic-ui-react";
+import { useObservable } from "rxjs-hooks";
+import { Link } from "react-router-dom";
+import { of, from, concat } from "rxjs";
+import { map, switchMap, distinctUntilChanged } from "rxjs/operators";
+import _ from "lodash";
+import { useTranslation, Trans as Translate } from "react-i18next";
import type { Track } from "types";
import {
@@ -82,7 +91,7 @@ export function NoPublicTracksMessage() {
);
}
-function maxLength(t: string|null, max: number): string|null {
+function maxLength(t: string | null, max: number): string | null {
if (t && t.length > max) {
return t.substring(0, max) + " ...";
} else {
diff --git a/frontend/src/translations/de.yaml b/frontend/src/translations/de.yaml
index db25376..c9df3a5 100644
--- a/frontend/src/translations/de.yaml
+++ b/frontend/src/translations/de.yaml
@@ -62,6 +62,9 @@ Stats:
thisMonth: Dieser Monat
thisYear: Dieses Jahr
allTime: Immer
+ topRegions: Regionen mit den meisten Messwerten
+ eventCount: Überholevents
+ regionName: Region
TracksPage:
titlePublic: Öffentliche Fahrten
@@ -201,6 +204,9 @@ MapPage:
southWest: südwestwärts
west: westwärts
northWest: nordwestwärts
+ regionInfo:
+ unnamedRegion: Unbenannte Region
+ eventNumber: Anzahl Überholevents
SettingsPage:
title: Einstellungen
diff --git a/frontend/src/translations/en.yaml b/frontend/src/translations/en.yaml
index 1246052..831d999 100644
--- a/frontend/src/translations/en.yaml
+++ b/frontend/src/translations/en.yaml
@@ -67,6 +67,9 @@ Stats:
thisMonth: This month
thisYear: This year
allTime: All time
+ topRegions: Region Leaderboard
+ eventCount: Overtaking events
+ regionName: Region
TracksPage:
titlePublic: Public tracks
@@ -206,6 +209,10 @@ MapPage:
southWest: south-west bound
west: west bound
northWest: north-west bound
+ regionInfo:
+ unnamedRegion: "unnamed region"
+ eventNumber: Number of Overtaking events
+
SettingsPage:
title: Settings
diff --git a/tile-generator/layers/obs_events/layer.sql b/tile-generator/layers/obs_events/layer.sql
index ec6c9af..4ba0f12 100644
--- a/tile-generator/layers/obs_events/layer.sql
+++ b/tile-generator/layers/obs_events/layer.sql
@@ -12,11 +12,10 @@ RETURNS TABLE(event_id bigint, geometry geometry, distance_overtaker float, dist
CASE WHEN road.zone IS NULL THEN 'urban' else road.zone END as zone,
overtaking_event.way_id::bigint as way_id
FROM overtaking_event
- FULL OUTER JOIN road ON (road.way_id = overtaking_event.way_id)
+ FULL OUTER JOIN road ON road.way_id = overtaking_event.way_id
JOIN track on track.id = overtaking_event.track_id
- WHERE
- zoom_level >= 10 AND
- ST_Transform(overtaking_event.geometry, 3857) && bbox;
+ WHERE ST_Transform(overtaking_event.geometry, 3857) && bbox
+ AND zoom_level >= 12
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_roads/layer.sql b/tile-generator/layers/obs_roads/layer.sql
index 391bfee..cd12a95 100644
--- a/tile-generator/layers/obs_roads/layer.sql
+++ b/tile-generator/layers/obs_roads/layer.sql
@@ -67,7 +67,7 @@ RETURNS TABLE(
) e on (e.way_id = road.way_id and (road.directionality != 0 or e.direction_reversed = r.rev))
WHERE
- zoom_level >= 10 AND
+ zoom_level >= 11 AND
road.geometry && bbox
GROUP BY
road.name,