Skip to content

Commit

Permalink
Frontend: Migrate territories to D3 (#3965)
Browse files Browse the repository at this point in the history
  • Loading branch information
benhammondmusic authored Feb 18, 2025
1 parent 3be1bf6 commit 34d45f0
Show file tree
Hide file tree
Showing 19 changed files with 241 additions and 1,055 deletions.
2 changes: 1 addition & 1 deletion frontend/playwright-tests/navigation.ci.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ test('Clicking a state on national map loads state report; back button returns t
)

// click state of Mass.
await page.locator('path:nth-child(48)').click()
await page.locator('path:nth-child(46)').click()

// Confirm correct madlib setting includes FIPS for state of Mass.
await expect(page).toHaveURL(/.*mls=1.hiv-3.25/)
Expand Down
22 changes: 0 additions & 22 deletions frontend/src/cards/MapCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ import GeoContext, {
import MissingDataAlert from './ui/MissingDataAlert'
import MultiMapDialog from './ui/MultiMapDialog'
import { findVerboseRating } from './ui/SviAlert'
import TerritoryCircles from './ui/TerritoryCircles'

const SIZE_OF_HIGHEST_LOWEST_GEOS_RATES_LIST = 5
const HASH_ID: ScrollableHashId = 'rate-map'
Expand Down Expand Up @@ -557,27 +556,6 @@ function MapCardWithKey(props: MapCardProps) {
scaleConfig={scale}
/>
</div>

{props.fips.isUsa() && (
<div className='w-full'>
<TerritoryCircles
demographicType={demographicType}
activeDemographicGroup={activeDemographicGroup}
countColsMap={countColsMap}
data={displayData}
fullData={mapQueryResponse.data}
geoData={geoData}
extremesMode={extremesMode}
highestLowestGroupsByFips={highestLowestGroupsByFips}
mapIsWide={mapIsWide}
metricConfig={metricConfig}
dataTypeConfig={props.dataTypeConfig}
signalListeners={signalListeners}
scaleConfig={scale}
isPhrmaAdherence={isPhrmaAdherence}
/>
</div>
)}
</div>

<div className={mapIsWide ? 'sm:w-4/12 md:w-3/12' : 'w-full'}>
Expand Down
16 changes: 0 additions & 16 deletions frontend/src/cards/UnknownsMapCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import type { ScrollableHashId } from '../utils/hooks/useStepObserver'
import CardWrapper from './CardWrapper'
import ChartTitle from './ChartTitle'
import MissingDataAlert from './ui/MissingDataAlert'
import TerritoryCircles from './ui/TerritoryCircles'
import UnknownsAlert from './ui/UnknownsAlert'

interface UnknownsMapCardProps {
Expand Down Expand Up @@ -236,21 +235,6 @@ function UnknownsMapCardWithKey(props: UnknownsMapCardProps) {
showCounties={!props.fips.isUsa()}
signalListeners={signalListeners}
/>
{props.fips.isUsa() && unknowns.length > 0 && (
<TerritoryCircles
demographicType={demographicType}
activeDemographicGroup={UNKNOWN}
countColsMap={{}}
mapIsWide={mapIsWide}
data={unknowns}
metricConfig={metricConfig}
dataTypeConfig={props.dataTypeConfig}
signalListeners={signalListeners}
geoData={geoData}
isUnknownsMap={true}
extremesMode={false}
/>
)}
</div>
)}
{/* PERCENT REPORTING UNKNOWN ALERT - contains its own logic and divider/styling */}
Expand Down
21 changes: 0 additions & 21 deletions frontend/src/cards/ui/MultiMapDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import HetTerm from '../../styles/HetComponents/HetTerm'
import type { ScrollableHashId } from '../../utils/hooks/useStepObserver'
import CardOptionsMenu from './CardOptionsMenu'
import { Sources } from './Sources'
import TerritoryCircles from './TerritoryCircles'

interface MultiMapDialogProps {
dataTypeConfig: DataTypeConfig
Expand Down Expand Up @@ -189,26 +188,6 @@ export default function MultiMapDialog(props: MultiMapDialogProps) {
/>
)}
</div>

{/* TERRITORIES (IF NATIONAL VIEW) */}
{props.metricConfig &&
props.fips.isUsa() &&
dataForValue.length && (
<TerritoryCircles
demographicType={props.demographicType}
countColsMap={props.countColsMap}
data={dataForValue}
geoData={props.geoData}
mapIsWide={false}
metricConfig={props.metricConfig}
dataTypeConfig={props.dataTypeConfig}
signalListeners={multimapSignalListeners}
scaleConfig={scale}
isMulti={true}
activeDemographicGroup={demographicGroup}
extremesMode={false}
/>
)}
</li>
)
})}
Expand Down
79 changes: 0 additions & 79 deletions frontend/src/cards/ui/TerritoryCircles.tsx

This file was deleted.

Loading

0 comments on commit 34d45f0

Please sign in to comment.