Merge branch 'marker-performance-56'

Trustroots · Feb 12, 2025 · 3993036 · 3993036
2 parents f9f393c + 2705d8e
commit 3993036
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/nr-app/src/common/utils.ts b/nr-app/src/common/utils.ts
@@ -4,7 +4,7 @@ import { isHexKey } from "@trustroots/nr-common";
 
 // TODO - Move these into `nr-common` (they depend on nostr-tools)
 
-export function trustrootsMapFilter(): Filter {
+export function getTrustrootsMapFilter(): Filter {
   const filter = {
     kinds: [30398],
     authors: [NOSTROOTS_VALIDATION_PUBKEY],
@@ -36,7 +36,7 @@ export function addOpenLocationCodePrefixToFilter(
 export function trustrootsMapFilterForPlusCodePrefixes(
   plusCodePrefixes: string[],
 ): Filter {
-  const baseFilter = trustrootsMapFilter();
+  const baseFilter = getTrustrootsMapFilter();
   const filter = addOpenLocationCodePrefixToFilter(
     baseFilter,
     plusCodePrefixes,

diff --git a/nr-app/src/components/MapMarkers.tsx b/nr-app/src/components/MapMarkers.tsx
@@ -1,4 +1,7 @@
-import { filterForMapLayerConfig, trustrootsMapFilter } from "@/common/utils";
+import {
+  filterForMapLayerConfig,
+  getTrustrootsMapFilter,
+} from "@/common/utils";
 import { setVisiblePlusCodes } from "@/redux/actions/map.actions";
 import { useAppDispatch, useAppSelector } from "@/redux/hooks";
 import {
@@ -27,7 +30,7 @@ const selectEventsForLayers = createSelector(
   [eventsSelectors.selectAll, mapSelectors.selectEnabledLayerKeys],
   (allEvents, activeLayers) => {
     const trustrootsEvents = allEvents.filter((event) =>
-      matchFilter(trustrootsMapFilter(), event.event),
+      matchFilter(getTrustrootsMapFilter(), event.event),
     );
     const layerEvents = activeLayers.map(
       (layerKey): [MAP_LAYER_KEY, EventWithMetadata[]] => {

diff --git a/nr-app/src/redux/slices/map.slice.ts b/nr-app/src/redux/slices/map.slice.ts
@@ -42,9 +42,16 @@ export const mapSlice = createSlice({
       state.enabledLayers[action.payload] = true;
     },
     disableLayer: (state, action: PayloadAction<MAP_LAYER_KEY>) => {
+      // Disable uncommenting layers for now
+      return state;
+      // eslint-disable-next-line no-unreachable
       state.enabledLayers[action.payload] = false;
     },
     toggleLayer: (state, action: PayloadAction<MAP_LAYER_KEY>) => {
+      // Disable uncommenting layers for now
+      if (state.enabledLayers[action.payload]) {
+        return state;
+      }
       state.enabledLayers[action.payload] =
         !state.enabledLayers[action.payload];
     },
@@ -59,14 +66,15 @@ export const mapSlice = createSlice({
     },
   },
   extraReducers: (builder) => {
-    builder.addCase(setVisiblePlusCodes, (state, action) => {
-      state.visiblePlusCodes = action.payload;
-    });
-    builder.addCase(setSubscriptionHasSeenEOSE, (state, action) => {
-      if (action.payload.id === MAP_SUBSCRIPTION_ID) {
-        state.mapSubscriptionIsUpdating = false;
-      }
-    });
+    builder
+      .addCase(setVisiblePlusCodes, (state, action) => {
+        state.visiblePlusCodes = action.payload;
+      })
+      .addCase(setSubscriptionHasSeenEOSE, (state, action) => {
+        if (action.payload.id === MAP_SUBSCRIPTION_ID) {
+          state.mapSubscriptionIsUpdating = false;
+        }
+      });
   },
   selectors: {
     selectVisiblePlusCodes: (state) => state.visiblePlusCodes,