1
1
import React , { useMemo , useState , useEffect } from 'react' ;
2
2
import styled from 'styled-components' ;
3
- // @NOTE : This should be replaced by types/veda once the changes are consolidated
4
- // import { ProjectionOptions } from 'veda';
5
- import { ProjectionOptions } from '$types/veda' ;
6
3
import { MapboxOptions } from 'mapbox-gl' ;
7
4
import {
8
5
convertProjectionToMapbox ,
@@ -36,13 +33,9 @@ import {
36
33
DatasetStatus
37
34
} from '$components/exploration/types.d.ts' ;
38
35
39
- // import { reconcileDatasets } from '$components/exploration/data-utils';
40
- // import { datasetLayers } from '$components/exploration/data-utils';
41
36
import { reconcileDatasets , getDatasetLayers } from '$components/exploration/data-utils-no-faux-module' ;
42
37
import { useReconcileWithStacMetadata } from '$components/exploration/hooks/use-stac-metadata-datasets' ;
43
-
44
- import { ReactQueryProvider } from '$context/react-query' ;
45
- import { VedaDatum , DatasetData } from '$types/veda' ;
38
+ import { ProjectionOptions , VedaDatum , DatasetData } from '$types/veda' ;
46
39
47
40
export const mapHeight = '32rem' ;
48
41
const Carto = styled . div `
@@ -132,10 +125,8 @@ interface MapBlockProps {
132
125
}
133
126
134
127
const getDataLayer = ( layerIndex : number , layers : VizDataset [ ] | undefined ) : ( VizDatasetSuccess | null ) => {
135
- console . log ( `getDataLayer_layers: ` , layers )
136
128
if ( ! layers || layers . length <= layerIndex ) return null ;
137
129
const layer = layers [ layerIndex ] ;
138
- console . log ( `getDataLayer_layer: ` , layer )
139
130
// @NOTE : What to do when data returns ERROR
140
131
if ( layer . status !== DatasetStatus . SUCCESS ) return null ;
141
132
return {
@@ -169,9 +160,9 @@ function MapBlock(props: MapBlockProps) {
169
160
if ( errors . length ) {
170
161
throw new HintedError ( 'Malformed Map Block' , errors ) ;
171
162
}
172
- // console.log(`datasets_in_blockmap: `, datasets)
163
+
173
164
const datasetLayers = getDatasetLayers ( datasets ) ;
174
- console . log ( `datasetLayers: ` , datasetLayers )
165
+
175
166
const layersToFetch = useMemo ( ( ) => {
176
167
const [ baseMapStaticData ] = reconcileDatasets ( [ layerId ] , datasetLayers , [ ] ) ;
177
168
let totalLayers = [ baseMapStaticData ] ;
@@ -187,7 +178,7 @@ function MapBlock(props: MapBlockProps) {
187
178
}
188
179
return totalLayers ;
189
180
} , [ layerId ] ) ;
190
- console . log ( `layersToFetch: ` , layersToFetch )
181
+
191
182
const [ layers , setLayers ] = useState < VizDataset [ ] > ( layersToFetch ) ;
192
183
193
184
useReconcileWithStacMetadata ( layers , setLayers ) ;
@@ -218,7 +209,7 @@ function MapBlock(props: MapBlockProps) {
218
209
} , [ projectionId , projectionCenter , projectionParallels ] ) ;
219
210
220
211
const [ , setProjection ] = useState ( projectionStart ) ;
221
- console . log ( `layers_before_getDataLayer: ` , layers )
212
+
222
213
const baseDataLayer : ( VizDatasetSuccess | null ) = useMemo ( ( ) => getDataLayer ( 0 , layers ) , [ layers ] ) ;
223
214
const compareDataLayer : ( VizDatasetSuccess | null ) = useMemo ( ( ) => getDataLayer ( 1 , layers ) , [ layers ] ) ;
224
215
@@ -272,18 +263,16 @@ function MapBlock(props: MapBlockProps) {
272
263
const providedLabel = compareDataLayer . data . mapLabel as string ;
273
264
return providedLabel ;
274
265
}
275
- // console.log(`selectedDatetime; `, selectedDatetime, `compareToDate: `, compareToDate, `baseTimeDensity: `, baseTimeDensity, 'compareTimeDensity: ', compareTimeDensity)
276
- // // Default to date comparison.
277
- // return selectedDatetime && compareToDate
278
- // ? formatCompareDate(
279
- // selectedDatetime,
280
- // compareToDate,
281
- // baseTimeDensity,
282
- // compareTimeDensity
283
- // )
284
- // : null;
285
- return null ; // @NOTE -SANDRA: failing with $3Zh6r$format is not defined
286
- // selectedDatetime; Thu Mar 01 2018 00:00:00 GMT-0500 (Eastern Standard Time) compareToDate: Wed Mar 01 2017 00:00:00 GMT-0500 (Eastern Standard Time) baseTimeDensity: undefined compareTimeDensity: undefined
266
+
267
+ // Default to date comparison.
268
+ return selectedDatetime && compareToDate
269
+ ? formatCompareDate (
270
+ selectedDatetime ,
271
+ compareToDate ,
272
+ baseTimeDensity ,
273
+ compareTimeDensity
274
+ )
275
+ : null ;
287
276
} , [
288
277
compareLabel ,
289
278
compareDataLayer ,
@@ -292,7 +281,6 @@ function MapBlock(props: MapBlockProps) {
292
281
baseTimeDensity ,
293
282
compareTimeDensity
294
283
] ) ;
295
- console . log ( `baseDataLayer: ` , baseDataLayer )
296
284
const initialPosition = useMemo (
297
285
( ) => ( center ? { lng : center [ 0 ] , lat : center [ 1 ] , zoom } : undefined ) ,
298
286
[ center , zoom ]
@@ -337,7 +325,7 @@ function MapBlock(props: MapBlockProps) {
337
325
) }
338
326
</ LayerLegendContainer >
339
327
) }
340
- { /* <MapControls>
328
+ < MapControls >
341
329
{ selectedDatetime && selectedCompareDatetime ? (
342
330
< MapMessage
343
331
id = 'compare-message'
@@ -373,18 +361,10 @@ function MapBlock(props: MapBlockProps) {
373
361
/>
374
362
) }
375
363
</ Compare >
376
- )} */ }
364
+ ) }
377
365
</ Map >
378
366
</ Carto >
379
367
) ;
380
368
}
381
369
382
- export function MapBlockWithProvider ( props : MapBlockProps ) {
383
- return (
384
- < ReactQueryProvider >
385
- < MapBlock { ...props } />
386
- </ ReactQueryProvider >
387
- ) ;
388
- } ;
389
-
390
370
export default MapBlock ;
0 commit comments