Skip to content

Weekly PR from Staging to Main #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeWritingCow merged 7 commits into from
Jan 14, 2025
Merged

Weekly PR from Staging to Main #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20ca743
filters only by main property zones
DonovanAndrews300 Jan 10, 2025
5cfde35
adds RSA to subzoning and sorts subzoning
DonovanAndrews300 Jan 11, 2025
16e1f97
[977] Expand hover styles on buttons to fill mobile menu
millmason Jan 11, 2025
51c5936
adds RSA-6 to subzones
DonovanAndrews300 Jan 11, 2025
5bf55f0
removes CAX from subzones
DonovanAndrews300 Jan 11, 2025
01c2722
Merge pull request #1075 from DonovanAndrews300/donovan/main-zone-fil…
CodeWritingCow Jan 11, 2025
c92d061
Merge pull request #1076 from millmason/main
bacitracin Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 23 additions & 33 deletions src/components/Filters/filterOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,39 +414,29 @@ export const rcos: string[] = [
];

export const zoning: string[] = [
'CA-1',
'CA-2',
'CMX-1',
'CMX-2',
'CMX-2.5',
'CMX-3',
'CMX-4',
'CMX-5',
'I-1',
'I-2',
'I-3',
'I-P',
'CA',
'CMX',
'I',
'ICMX',
'IRMX',
'RM-1',
'RM-2',
'RM-3',
'RM-4',
'RMX-1',
'RMX-2',
'RMX-3',
'RSA-1',
'RSA-2',
'RSA-3',
'RSA-4',
'RSA-5',
'RSA-6',
'RSD-1',
'RSD-2',
'RSD-3',
'RTA-1',
'SP-AIR',
'SP-INS',
'SP-PO-A',
'SP-STA',
'RM',
'RMX',
'RSA',
'RSD',
'RTA',
'SP',
];

export const subZoning: Record<string, string[]> = {
CA: ['CA-1', 'CA-2'],
CMX: ['CMX-1', 'CMX-2', 'CMX-2.5', 'CMX-3', 'CMX-4', 'CMX-5'],
I: ['I-1', 'I-2', 'I-3', 'I-P'],
ICMX: ['ICMX'],
IRMX: ['IRMX'],
RM: ['RM-1', 'RM-2', 'RM-3', 'RM-4'],
RMX: ['RMX-1', 'RMX-2', 'RMX-3'],
RSA: ['RSA-1', 'RSA-2', 'RSA-3', 'RSA-4', 'RSA-5', 'RSA-6'],
RSD: ['RSD-1', 'RSD-2', 'RSD-3'],
RTA: ['RTA-1'],
SP: ['SP-AIR', 'SP-INS', 'SP-PO-A', 'SP-STA'],
};
4 changes: 2 additions & 2 deletions src/components/IconLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function IconLink({ icon, text, href }: IconLinkProps) {
startContent={<div className="linkIcon">{icon}</div>}
className={
pathname === href
? 'active-state-nav gap-0'
: 'iconLink bg-color-none gap-0'
? 'active-state-nav gap-0 w-full justify-start'
: 'iconLink bg-color-none gap-0 w-full justify-start'
}
// className="flex text-gray-900 items-center active:bg-[#E9FFE5] active:text-green-700 focus:text-green-700 focus:bg-[#E9FFE5] hover:gray-100 bg-color-none hover:bg-gray-10"
>
Expand Down
14 changes: 14 additions & 0 deletions src/components/PropertyMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
useStagingTiles,
googleCloudBucketName,
} from '../config/config';
import { subZoning } from './Filters/filterOptions';
import { useFilter } from '@/context/FilterContext';
import Map, {
Source,
Expand Down Expand Up @@ -357,6 +358,19 @@ const PropertyMap: FC<PropertyMapProps> = ({
} else {
thisFilterGroup.push(['in', ['get', property], item]);
}
if (Object.keys(subZoning).includes(item)) {
subZoning[item].forEach((subZone: string) => {
if (filterItem) {
thisFilterGroup.push([
'>=',
['index-of', subZone, ['get', property]],
0,
]);
} else {
thisFilterGroup.push(['in', ['get', property], subZone]);
}
});
}
});

acc.push(thisFilterGroup);
Expand Down
Loading