bellingcat/ukraine-timemap
1
0
Fork 0
mirror of https://github.com/bellingcat/ukraine-timemap.git synced 2026-06-12 05:18:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

proper fix of GRAPH_NONLOCATED

Browse Source
This commit is contained in:
Lachlan Kermode
2020-05-31 16:30:32 +02:00
parent 08bbe9c85e
commit 681447c15b
6 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/presentational/Timeline/Events.js
View File

@@ -92,7 +92,7 @@ const TimelineEvents = ({
}
}
let eventY = getCategoryY(event.category)
let eventY = getCategoryY ? getCategoryY(event.category) : 0
const isNonlocated = !event.latitude && !event.longitude
if (features.GRAPH_NONLOCATED && isNonlocated) {
const { project } = event

5
src/components/presentational/Timeline/Markers.js
View File

@@ -51,7 +51,8 @@ const TimelineMarkers = ({
}}
/>
}
const isDot = (!features.GRAPH_NONLOCATED && !!event.latitude && !!event.longitude) || (features.GRAPH_NONLOCATED && (event.projectOffset !== -1 || (!!event.latitude && !!event.longitude)))
const isNonlocated = !event.latitude && !event.longitude
const isBar = (!features.GRAPH_NONLOCATED && isNonlocated) || (features.GRAPH_NONLOCATED && features.GRAPH_NONLOCATED.categories.includes(event.category))
switch (event.shape) {
case 'circle':
return renderCircle()
@@ -62,7 +63,7 @@ const TimelineMarkers = ({
case 'star':
return renderCircle()
default:
return isDot ? renderCircle() : renderBar()
return isBar ? renderBar() : renderCircle()
}
}