publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-08-12 00:04:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove GU and VI (#1028)

Browse source 
- comment out GU and VI code
- remove search from feature flag
- keep comment on search production bug when wrapping div
- add note on territories
- add territories copy to constants
This commit is contained in:
Vim 2021-12-14 11:02:05 -05:00 • committed by GitHub
commit c9caa97ce3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/components/J40Map.tsx
View file

@ -157,7 +157,10 @@ const J40Map = ({location}: IJ40Interface) => {
<Grid col={12} desktop={{col: 9}}>
{/*
The MapSearch component is wrapped in a div in order for MapSearch to render correctly in a production build.
The MapSearch component is no longer wrapped in a div in order to allow this feature
to be behind a feature flag. This was causing a bug for MapSearch to render
correctly in a production build. Leaving this comment here in case future flags are
needed in this component
When the MapSearch component is placed behind a feature flag without a div wrapping
MapSearch, the production build will inject CSS due to the null in the false conditional
@ -168,9 +171,7 @@ const J40Map = ({location}: IJ40Interface) => {
to ensure the production build works and that MapSearch and the map (ReactMapGL) render correctly.
*/}
<div>
{'sr' in flags ? <MapSearch goToPlace={goToPlace}/> : null}
</div>
<MapSearch goToPlace={goToPlace}/>
<ReactMapGL
{...viewport}

8
client/src/components/MapWrapper/index.tsx
View file

@ -24,6 +24,14 @@ const MapWrapper = ({location}: IMapWrapperProps) => {
</div>
</Grid>
</Grid>
<Grid row>
<Grid col={7}>
<h2>{EXPLORE_COPY.NOTE_ON_TERRITORIES.INTRO}</h2>
<p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_1}</p>
<p>{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_2}</p>
</Grid>
</Grid>
</>
);
};

20
client/src/components/territoryFocusControl.tsx
View file

@ -66,10 +66,10 @@ const TerritoryFocusControl = ({goToPlace}: ITerritoryFocusControl) => {
short: intl.formatMessage(EXPLORE_COPY.MAP.PR_SHORT),
long: intl.formatMessage(EXPLORE_COPY.MAP.PR_LONG),
},
{
short: intl.formatMessage(EXPLORE_COPY.MAP.GU_SHORT),
long: intl.formatMessage(EXPLORE_COPY.MAP.GU_LONG),
},
// {
// short: intl.formatMessage(EXPLORE_COPY.MAP.GU_SHORT),
// long: intl.formatMessage(EXPLORE_COPY.MAP.GU_LONG),
// },
{
short: intl.formatMessage(EXPLORE_COPY.MAP.AS_SHORT),
long: intl.formatMessage(EXPLORE_COPY.MAP.AS_LONG),
@ -78,10 +78,10 @@ const TerritoryFocusControl = ({goToPlace}: ITerritoryFocusControl) => {
short: intl.formatMessage(EXPLORE_COPY.MAP.MP_SHORT),
long: intl.formatMessage(EXPLORE_COPY.MAP.MP_LONG),
},
{
short: intl.formatMessage(EXPLORE_COPY.MAP.VI_SHORT),
long: intl.formatMessage(EXPLORE_COPY.MAP.VI_LONG),
},
// {
// short: intl.formatMessage(EXPLORE_COPY.MAP.VI_SHORT),
// long: intl.formatMessage(EXPLORE_COPY.MAP.VI_LONG),
// },
];
// the offset for this array should map the territories variable
const territoriesIconClassName = [
@ -89,10 +89,10 @@ const TerritoryFocusControl = ({goToPlace}: ITerritoryFocusControl) => {
'mapboxgl-ctrl-zoom-to-ak',
'mapboxgl-ctrl-zoom-to-hi',
'mapboxgl-ctrl-zoom-to-pr',
'mapboxgl-ctrl-zoom-to-gu',
// 'mapboxgl-ctrl-zoom-to-gu',
'mapboxgl-ctrl-zoom-to-as',
'mapboxgl-ctrl-zoom-to-mp',
'mapboxgl-ctrl-zoom-to-vi',
// 'mapboxgl-ctrl-zoom-to-vi',
];
return (