Skip to content

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

Refactor GlobePage and related hooks for improved data handling and performance

Bill Yangcf1c7835d577
diff --git a/client/src/app/[site]/globe/hooks/useCoordinatesLayer.ts b/client/src/app/[site]/globe/hooks/useCoordinatesLayer.ts
index e19905e65..2cd42b2fe 100644
--- a/client/src/app/[site]/globe/hooks/useCoordinatesLayer.ts
+++ b/client/src/app/[site]/globe/hooks/useCoordinatesLayer.ts
@@ -1,11 +1,11 @@
-import { useEffect, useRef } from "react";
-import mapboxgl from "mapbox-gl";
+import { FilterParameter } from "@rybbit/shared/dist/filters";
import { scaleSequentialSqrt } from "d3-scale";
import { interpolateYlOrRd } from "d3-scale-chromatic";
-import { LiveSessionLocation } from "../../../../api/analytics/useGetSessionLocations";
-import { addFilter, removeFilter, useStore } from "../../../../lib/store";
-import { FilterParameter } from "@rybbit/shared/dist/filters";
import { round } from "lodash";
+import mapboxgl from "mapbox-gl";
+import { useEffect, useRef } from "react";
+import { useGetSessionLocations } from "../../../../api/analytics/useGetSessionLocations";
+import { addFilter, removeFilter, useStore } from "../../../../lib/store";
const getSizeMultiplier = (total: number) => {
if (total <= 50) return 3; // Large dots
@@ -16,17 +16,17 @@ const getSizeMultiplier = (total: number) => {
export function useCoordinatesLayer({
map,
- liveSessionLocations,
mapLoaded,
minutes,
mapView,
}: {
map: React.RefObject<mapboxgl.Map | null>;
- liveSessionLocations: LiveSessionLocation[] | undefined;
mapLoaded: boolean;
minutes: number;
mapView: string;
}) {
+ const { data: liveSessionLocations } = useGetSessionLocations();
+
const popupRef = useRef<mapboxgl.Popup | null>(null);
const filters = useStore(state => state.filters);
diff --git a/client/src/app/[site]/globe/hooks/useCountriesLayer.ts b/client/src/app/[site]/globe/hooks/useCountriesLayer.ts
index 4c59c1a43..8ffcafeda 100644
--- a/client/src/app/[site]/globe/hooks/useCountriesLayer.ts
+++ b/client/src/app/[site]/globe/hooks/useCountriesLayer.ts
@@ -1,27 +1,24 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useMemo, useRef } from "react";
import mapboxgl from "mapbox-gl";
import { FilterParameter } from "@rybbit/shared";
import { addFilter } from "../../../../lib/store";
+import { useSingleCol } from "../../../../api/analytics/useSingleCol";
+import { useCountries } from "../../../../lib/geo";
+import { processCountryData } from "../utils/processData";
+import { createColorScale } from "../utils/colorScale";
interface UseCountriesLayerProps {
map: React.RefObject<mapboxgl.Map | null>;
- countriesGeoData: any;
- processedCountryData: any;
- colorScale: (value: number) => string;
- countryData: any;
mapLoaded: boolean;
mapView: string;
}
-export function useCountriesLayer({
- map,
- countriesGeoData,
- processedCountryData,
- colorScale,
- countryData,
- mapLoaded,
- mapView,
-}: UseCountriesLayerProps) {
+export function useCountriesLayer({ map, mapLoaded, mapView }: UseCountriesLayerProps) {
+ const { data: countryData } = useSingleCol({ parameter: "country" });
+ const { data: countriesGeoData } = useCountries();
+ const processedCountryData = useMemo(() => processCountryData(countryData), [countryData]);
+ const colorScale = useMemo(() => createColorScale(processedCountryData), [processedCountryData]);
+
const popupRef = useRef<mapboxgl.Popup | null>(null);
useEffect(() => {
diff --git a/client/src/app/[site]/globe/hooks/useSubdivisionsLayer.ts b/client/src/app/[site]/globe/hooks/useSubdivisionsLayer.ts
index 327723de2..a82bdff21 100644
--- a/client/src/app/[site]/globe/hooks/useSubdivisionsLayer.ts
+++ b/client/src/app/[site]/globe/hooks/useSubdivisionsLayer.ts
@@ -1,29 +1,26 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useMemo, useRef } from "react";
import mapboxgl from "mapbox-gl";
import { FilterParameter } from "@rybbit/shared";
import { addFilter } from "../../../../lib/store";
+import { useSingleCol } from "../../../../api/analytics/useSingleCol";
+import { useSubdivisions } from "../../../../lib/geo";
+import { processSubdivisionData } from "../utils/processData";
+import { createColorScale } from "../utils/colorScale";
interface UseSubdivisionsLayerProps {
map: React.RefObject<mapboxgl.Map | null>;
- subdivisionsGeoData: any;
- processedSubdivisionData: any;
- colorScale: (value: number) => string;
- subdivisionData: any;
mapLoaded: boolean;
mapView: string;
}
-export function useSubdivisionsLayer({
- map,
- subdivisionsGeoData,
- processedSubdivisionData,
- colorScale,
- subdivisionData,
- mapLoaded,
- mapView,
-}: UseSubdivisionsLayerProps) {
+export function useSubdivisionsLayer({ map, mapLoaded, mapView }: UseSubdivisionsLayerProps) {
const popupRef = useRef<mapboxgl.Popup | null>(null);
+ const { data: subdivisionData } = useSingleCol({ parameter: "region", limit: 10000 });
+ const { data: subdivisionsGeoData } = useSubdivisions();
+ const processedSubdivisionData = useMemo(() => processSubdivisionData(subdivisionData), [subdivisionData]);
+ const colorScale = useMemo(() => createColorScale(processedSubdivisionData), [processedSubdivisionData]);
+
useEffect(() => {
if (!map.current || !subdivisionsGeoData || !processedSubdivisionData || !mapLoaded) return;
diff --git a/client/src/app/[site]/globe/page.tsx b/client/src/app/[site]/globe/page.tsx
index af75f8d74..7e07a213a 100644
--- a/client/src/app/[site]/globe/page.tsx
+++ b/client/src/app/[site]/globe/page.tsx
@@ -1,26 +1,21 @@
"use client";
import "mapbox-gl/dist/mapbox-gl.css";
+import { useRef } from "react";
import "./globe.css";
-import { useMemo, useRef } from "react";
-import { useSingleCol } from "@/api/analytics/useSingleCol";
import { DisabledOverlay } from "../../../components/DisabledOverlay";
+import { NothingFound } from "../../../components/NothingFound";
import { useSetPageTitle } from "../../../hooks/useSetPageTitle";
-import { useCountries, useSubdivisions } from "../../../lib/geo";
import { SubHeader } from "../components/SubHeader/SubHeader";
+import { GlobeSessions } from "./components/GlobeSessions";
import MapViewSelector from "./components/ModeSelector";
-import { useMapbox } from "./hooks/useMapbox";
+import { useGlobeStore } from "./globeStore";
+import { useCoordinatesLayer } from "./hooks/useCoordinatesLayer";
import { useCountriesLayer } from "./hooks/useCountriesLayer";
-import { useSubdivisionsLayer } from "./hooks/useSubdivisionsLayer";
import { useLayerVisibility } from "./hooks/useLayerVisibility";
-import { useCoordinatesLayer } from "./hooks/useCoordinatesLayer";
-import { createColorScale } from "./utils/colorScale";
-import { processCountryData, processSubdivisionData } from "./utils/processData";
-import { useGetSessionLocations } from "../../../api/analytics/useGetSessionLocations";
-import { GlobeSessions } from "./components/GlobeSessions";
-import { useGlobeStore } from "./globeStore";
-import { NothingFound } from "../../../components/NothingFound";
+import { useMapbox } from "./hooks/useMapbox";
+import { useSubdivisionsLayer } from "./hooks/useSubdivisionsLayer";
export default function GlobePage() {
useSetPageTitle("Rybbit · Globe");
@@ -28,46 +23,22 @@ export default function GlobePage() {
const mapView = useGlobeStore(state => state.mapView);
- const { data: countryData } = useSingleCol({ parameter: "country" });
- const { data: subdivisionData } = useSingleCol({ parameter: "region", limit: 10000 });
- const { data: liveSessionLocations } = useGetSessionLocations();
-
- const { data: countriesGeoData } = useCountries();
- const { data: subdivisionsGeoData } = useSubdivisions();
-
- const processedCountryData = useMemo(() => processCountryData(countryData), [countryData]);
- const processedSubdivisionData = useMemo(() => processSubdivisionData(subdivisionData), [subdivisionData]);
-
- const colorScale = useMemo(() => {
- const dataToUse = mapView === "countries" ? processedCountryData : processedSubdivisionData;
- return createColorScale(dataToUse);
- }, [processedCountryData, processedSubdivisionData, mapView]);
-
const { map, mapLoaded } = useMapbox(mapContainer);
useCountriesLayer({
map,
- countriesGeoData,
- processedCountryData,
- colorScale,
- countryData,
mapLoaded,
mapView,
});
useSubdivisionsLayer({
map,
- subdivisionsGeoData,
- processedSubdivisionData,
- colorScale,
- subdivisionData,
mapLoaded,
mapView,
});
useCoordinatesLayer({
map,
- liveSessionLocations,
mapLoaded,
minutes: 30,
mapView,