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

layered projects working; with some bugs

Browse Source
This commit is contained in:
Lachlan Kermode
2020-03-26 16:58:01 +01:00
parent 678d63f78b
commit 85476ee6fb
6 changed files with 96 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
import React from 'react'
import DatetimeDot from './DatetimeDot'
import DatetimeBar from './DatetimeBar'
import Project from './Project'
import { getEventOpacity } from '../../../common/utilities'
import { sizes } from '../../../common/global'
@@ -85,7 +86,7 @@ const TimelineEvents = ({
onSelect={() => onSelect(unlocatedEvents)}
category={dot.category}
events={unlocatedEvents}
x={getDatetimeX(datetime)}
x={getDatetimeX(datetime.timestamp)}
y={dims.marginTop}
width={sizes.eventDotR}
height={dims.trackHeight}
@@ -98,7 +99,7 @@ const TimelineEvents = ({
onSelect={() => onSelect(unlocatedEvents)}
category={dot.category}
events={[ev]}
x={getDatetimeX(datetime)}
x={getDatetimeX(datetime.timestamp)}
y={ev.projectOffset >= 0 ? dims.trackHeight - ev.projectOffset : dims.marginTop}
width={sizes.eventDotR}
height={ev.projectOffset >= 0 ? sizes.eventDotR * 2 : 20}
@@ -112,7 +113,7 @@ const TimelineEvents = ({
onSelect={() => onSelect(locatedEvents)}
category={dot.category}
events={locatedEvents}
x={getDatetimeX(datetime)}
x={getDatetimeX(datetime.timestamp)}
y={getCategoryY(dot.category)}
r={sizes.eventDotR}
styleProps={locatedProps}
@@ -125,10 +126,32 @@ const TimelineEvents = ({
})
}
// const projOffsets = {}
// const pEvents = datetimes.filter(dt => dt.events.some(ev => ev.project !== null))
// pEvents.forEach(({ events }) => {
// events.forEach(ev => {
// if (!projOffsets.hasOwnProperty(ev.project)) {
// projOffsets[ev.project] = ev.projectOffset
// }
// })
// })
let projects
if (process.env.features.ASSOCIATIVE_EVENTS_BY_TAG) {
projects = datetimes[1]
datetimes = datetimes[0]
}
return (
<g
clipPath={'url(#clip)'}
>
{projects.map(project => (<Project
{...project}
getX={getDatetimeX}
dims={dims}
colour={getCategoryColor(project.category)}
/>))}
{datetimes.map(datetime => renderDatetime(datetime))}
</g>
)