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

wip: categoryGroups -> categories

Browse Source
This commit is contained in:
Lachie Kermode
2018-11-30 18:46:17 +00:00
parent e9bd136082
commit 5b83a82c35
6 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/map/map.js
View File

@@ -195,7 +195,7 @@ Stop and start the development process in terminal after you have added your tok
unmarkPoint();
app.selected.forEach(eventPoint => {
if (isNotNullNorUndefined(eventPoint) && isNotNullNorUndefined(eventPoint.location)) {
if (eventPoint.latitude && eventPoint.longitude) {
if (eventPoint.latitude && eventPoint.latitude !== "" && eventPoint.longitude && eventPoint.longitude !== "") {
const location = new L.LatLng(eventPoint.latitude, eventPoint.longitude);
eventCircleMarkers[eventPoint.id] = L.circleMarker(location, {
radius: 32,

11
src/js/timeline/timeline.js
View File

@@ -597,20 +597,21 @@ export default function(app, ui) {
* @param {Object} app: Redux state app subtree
*/
function updateAxis(domain) {
categoryGroups = domain.categoryGroups
const groupStep = (106 - 30) / categoryGroups.length;
let groupYs = Array.apply(null, Array(categoryGroups.length));
console.log(domain)
const categories = domain.categories
const groupStep = (106 - 30) / categories.length;
let groupYs = Array.apply(null, Array(categories.length));
groupYs = groupYs.map((g, i) => {
return 30 + i * groupStep;
});
scale.y = d3.scaleOrdinal()
.domain(categoryGroups)
.domain(categories)
.range(groupYs);
axis.y =
d3.axisLeft(scale.y)
.tickValues(categoryGroups);
.tickValues(categories);
}
function update(domain, app) {