Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Map responds to controls #253

Merged
merged 20 commits into from
Mar 17, 2017
Merged

Map responds to controls #253

merged 20 commits into from
Mar 17, 2017

Conversation

colinmegill
Copy link
Collaborator

No description provided.

@trvrb
Copy link
Member

trvrb commented Mar 14, 2017

This super cool. One possible bug though. Many filters end up with disconnected demes on the map. Like so:

filter-zika-to-caribbean

I can't think of a scenario where this should occur given the trace-subtending-branches algorithm we're theoretically using. Actually... I'm seeing missing transmission edges before any filtering has occurred. Here's Zika in South America on e06c630:

missing-connections

Notice that Peru is disconnected. This is not an issue on current master:

correct-connections

@colinmegill colinmegill self-assigned this Mar 15, 2017
@jameshadfield
Copy link
Member

Filtering is now applied from the "valid tips" to the root and time is a slice through the tree. Here "valid tips" mean tips that match the filters, are in-view (this occurs when a branch has been zoomed to), and are within the time parameters. This means that you will not get the images seen above if no time bounds are applied, but you will start to get a disconnected graph as you tighten your time bounds.

South America (no time constraints):
image

South America (2016-2017):
image

jameshadfield and others added 4 commits March 17, 2017 14:01
@jameshadfield
debugging console.log statements
07b7c29
@colinmegill
use prevprops rather than version, change every time
df0b6ef
@jameshadfield
Revert "debugging console.log statements"
74f032e 
This reverts commit 07b7c29.
@jameshadfield
Merge branch 'master' into controls-to-map
c92b0fd 
* master:
  Fix bug with display of genotype colorby control
  tip modal click behavior. closes #252
  Map colors by genotype. Fixes #220.
  version bump to 1.1.2 for release
  add gates tweet
@jameshadfield jameshadfield merged commit 88cdf06 into master Mar 17, 2017
@jameshadfield jameshadfield deleted the controls-to-map branch March 17, 2017 22:49
@BinamB BinamB mentioned this pull request Jan 10, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@colinmegill colinmegill

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@colinmegill @trvrb @jameshadfield