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

reconfigures initial settings with a 30 year setting, more sensible defaults for zooms

Browse Source
This commit is contained in:
Lachlan Kermode
2020-02-09 18:27:35 +13:00
parent 6ad9b12370
commit 77bedb36b9
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/presentational/Card/Timestamp.js
View File

@@ -8,7 +8,6 @@ const CardTimestamp = ({ timelabel, language, precision }) => {
// const estimatedLang = copy[language].cardstack.estimated
const unknownLang = copy[language].cardstack.unknown_time
console.log(precision)
if (isNotNullNorUndefined(timelabel)) {
return (
<div className='card-cell timestamp'>

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

@@ -78,6 +78,10 @@ const TimelineEvents = ({
})
}
// console.log(datetimes
// .filter(d => d.events.some(e => e.category !== 'Legislation'))
// )
return (
<g
clipPath={'url(#clip)'}

7
src/components/presentational/Timeline/ZoomControls.js
View File

@@ -1,7 +1,7 @@
import React from 'react'
function zoomIsActive (duration, extent) {
if (duration > 1570000 && extent > 1570000) {
function zoomIsActive (duration, extent, max) {
if (duration >= max && extent >= max) {
return true
}
return duration === extent
@@ -9,7 +9,8 @@ function zoomIsActive (duration, extent) {
const TimelineZoomControls = ({ extent, zoomLevels, dims, onApplyZoom }) => {
function renderZoom (zoom, idx) {
const isActive = zoomIsActive(zoom.duration, extent)
const max = zoomLevels.reduce((acc, vl) => acc.duration < vl.duration ? vl : acc)
const isActive = zoomIsActive(zoom.duration, extent, max.duration)
return (
<text
className={`zoom-level-button ${isActive ? 'active' : ''}`}

2
src/selectors/index.js
View File

@@ -38,7 +38,7 @@ export const selectEvents = createSelector(
[getEvents, getActiveTags, getActiveCategories, getTimeRange],
(events, activeTags, activeCategories, timeRange) => {
return events.reduce((acc, event) => {
const isMatchingTag = event.tags && event.tags.map(tag => activeTags.includes(tag)).some(s => s)
const isMatchingTag = (event.tags && event.tags.map(tag => activeTags.includes(tag)).some(s => s)) || activeTags.length === 0
const isActiveTag = isMatchingTag || activeTags.length === 0
const isActiveCategory = activeCategories.includes(event.category) || activeCategories.length === 0
const isActiveTime = isTimeRangedIn(event, timeRange)

6
src/store/initial.js
View File

@@ -69,10 +69,12 @@ const initial = {
trackHeight: 80
},
range: [
new Date(2013, 2, 23, 12),
new Date(2016, 2, 23, 12)
new Date(1993, 2, 23, 12),
new Date(2023, 2, 23, 12)
],
zoomLevels: [
{ label: '30 years', duration: 15768000 },
{ label: '3 years', duration: 1576800 },
{ label: '3 months', duration: 129600 },
{ label: '3 days', duration: 4320 },
{ label: '12 hours', duration: 720 }