Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

add lat lon

Bill Yang12f8d06f7400
diff --git a/client/src/components/Sessions/SessionsList.tsx b/client/src/components/Sessions/SessionsList.tsx
index be07cfcf3..faab2168d 100644
--- a/client/src/components/Sessions/SessionsList.tsx
+++ b/client/src/components/Sessions/SessionsList.tsx
@@ -13,8 +13,6 @@ export default function SessionsList({ userId }: { userId?: string }) {
isFetchingNextPage,
} = useGetSessionsInfinite(userId);
- console.info(userId);
-
// Combine all pages of data
const flattenedData = useMemo(() => {
if (!data) return [];
diff --git a/server/src/db/clickhouse/clickhouse.ts b/server/src/db/clickhouse/clickhouse.ts
index 5ef2d01ef..cc8cfac47 100644
--- a/server/src/db/clickhouse/clickhouse.ts
+++ b/server/src/db/clickhouse/clickhouse.ts
@@ -28,6 +28,8 @@ export const initializeClickhouse = async () => {
language LowCardinality(String),
country LowCardinality(FixedString(2)),
iso_3166_2 LowCardinality(String),
+ latitude Float64,
+ longitude Float64,
screen_width UInt16,
screen_height UInt16,
device_type LowCardinality(String),
diff --git a/server/src/tracker/pageviewQueue.ts b/server/src/tracker/pageviewQueue.ts
index 9ad4e7b02..ab0a9cef5 100644
--- a/server/src/tracker/pageviewQueue.ts
+++ b/server/src/tracker/pageviewQueue.ts
@@ -58,9 +58,12 @@ class PageviewQueue {
// Process each pageview with its geo data
const processedPageviews = batch.map((pv) => {
- const countryCode = geoData?.[pv.ipAddress]?.data?.countryIso || "";
- const regionCode =
- geoData?.[pv.ipAddress]?.data?.subdivisions?.[0]?.isoCode || "";
+ const dataForIp = geoData?.[pv.ipAddress];
+
+ const countryCode = dataForIp?.data?.countryIso || "";
+ const regionCode = dataForIp?.data?.subdivisions?.[0]?.isoCode || "";
+ const latitude = dataForIp?.data?.latitude || 0;
+ const longitude = dataForIp?.data?.longitude || 0;
return {
site_id: pv.site_id,
@@ -85,6 +88,8 @@ class PageviewQueue {
country: countryCode,
iso_3166_2:
countryCode && regionCode ? countryCode + "-" + regionCode : "",
+ latitude: latitude || 0,
+ longitude: longitude || 0,
type: pv.type || "pageview",
event_name: pv.event_name || "",
properties: pv.properties,