Merge branch 'main' into paint-by-county-improvements

districtr · Nov 21, 2024 · ef6c1d4 · ef6c1d4
2 parents df97c39 + 1d825a3
commit ef6c1d4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/app/src/app/components/sidebar/ColorPicker.tsx b/app/src/app/components/sidebar/ColorPicker.tsx
@@ -40,6 +40,9 @@ export const ColorPicker = <T extends boolean>({
             const indices = values.map(f => colorArray.indexOf(f));
             onValueChange(indices, values);
           }}
+          style={{
+            justifyContent: "flex-start"
+          }}
         >
           {!!mapDocument && colorArray.slice(0, mapDocument.num_districts ?? 0).map((color, i) => (
             <CheckboxGroupItem

diff --git a/app/src/app/components/sidebar/Layers.tsx b/app/src/app/components/sidebar/Layers.tsx
@@ -23,7 +23,6 @@ export default function Layers() {
   const visibleLayerIds = useMapStore(state => state.visibleLayerIds);
   const updateVisibleLayerIds = useMapStore(state => state.updateVisibleLayerIds);
   const toggleHighlightBrokenDistricts = useMapStore(state => state.toggleHighlightBrokenDistricts);
-  const toggleLockAllAreas = useMapStore(state => state.toggleLockAllAreas);
   const parentsAreBroken = useMapStore(state => state.shatterIds.parents.size);
   const mapOptions = useMapStore(state => state.mapOptions);
   const setMapOptions = useMapStore(state => state.setMapOptions);
@@ -78,9 +77,6 @@ export default function Layers() {
         })}>
           Highlight unassigned units
         </CheckboxGroup.Item>
-        <CheckboxGroup.Item value="4" onClick={() => toggleLockAllAreas()}>
-          Lock All Painted Areas
-        </CheckboxGroup.Item>
       </CheckboxGroup.Root>
       <Heading as="h3" weight="bold" size="3">
         Boundaries

diff --git a/app/src/app/components/sidebar/ZoneLockPicker.tsx b/app/src/app/components/sidebar/ZoneLockPicker.tsx
@@ -6,9 +6,13 @@ import * as RadioGroup from '@radix-ui/react-radio-group';
 import {blackA} from '@radix-ui/colors';
 import {useMapStore} from '../../store/mapStore';
 import {ColorPicker} from './ColorPicker';
+import { LockClosedIcon, LockOpen2Icon } from '@radix-ui/react-icons';
 
 export function ZoneLockPicker() {
   const lockedZones = useMapStore(state => state.mapOptions.lockPaintedAreas);
+  const mapDocument = useMapStore(state => state.mapDocument)
+  const numDistricts = mapDocument?.num_districts || 40
+  const allDistrictsNumbers = new Array(numDistricts-1).fill(null).map((_,i) => i+1)
   const pickerValue = Array.isArray(lockedZones)
     ? lockedZones.map(f => (null === f ? 0 : f - 1))
     : lockedZones === true
@@ -21,6 +25,8 @@ export function ZoneLockPicker() {
     const zoneValues = indices.map(v => v + 1);
     setLockedZones(zoneValues);
   };
+  const lockAll = () => setLockedZones(allDistrictsNumbers)
+  const unlockAll = () => setLockedZones([])
 
   return (
     <div>
@@ -31,6 +37,14 @@ export function ZoneLockPicker() {
         value={pickerValue}
         multiple
       />
+      <Button onClick={lockAll} mr="2" mt="2" variant="outline">
+        <LockClosedIcon/>
+        Lock all
+      </Button>
+      <Button onClick={unlockAll} mt="2" variant="outline">
+      <LockOpen2Icon/>
+        Unlock all
+      </Button>
     </div>
   );
 }
diff --git a/app/src/app/store/mapStore.ts b/app/src/app/store/mapStore.ts
@@ -460,7 +460,7 @@ export const useMapStore = create(
 
           const geoids = features.map(f => f.id?.toString()).filter(Boolean) as string[];
 
-          const shatterMappings = get().shatterMappings;
+          const {shatterIds, shatterMappings, lockedFeatures} = get();
           const isAlreadyShattered = geoids.some(id => shatterMappings.hasOwnProperty(id));
           const shatterResult: ShatterResult = isAlreadyShattered
             ? ({
@@ -475,6 +475,7 @@ export const useMapStore = create(
                 document_id,
                 geoids,
               });
+
           if (!shatterResult.children.length){
             const mapDocument = get().mapDocument
             set({
@@ -488,13 +489,12 @@ export const useMapStore = create(
           }
           // TODO Need to return child edges even if the parent is already shattered
           // currently returns nothing
-          const shatterIds = get().shatterIds;
-
+          const newLockedFeatures = new Set(lockedFeatures)
           let existingParents = new Set(shatterIds.parents);
           let existingChildren = new Set(shatterIds.children);
           const newParent = shatterResult.parents.geoids;
           const newChildren = new Set(shatterResult.children.map(child => child.geo_id));
-
+          newChildren.forEach(child => newLockedFeatures.delete(child))
           const zoneAssignments = new Map(get().zoneAssignments);
           const multipleShattered = shatterResult.parents.geoids.length > 1;
           const featureBbox = features[0].geometry && bbox(features[0].geometry);
@@ -521,6 +521,7 @@ export const useMapStore = create(
             },
             mapLock: false,
             captiveIds: newChildren,
+            lockedFeatures: newLockedFeatures,
             focusFeatures: [
               {
                 id: features[0].id,