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

Experimental merge #214

Merged
merged 75 commits into from
Feb 27, 2017
Merged

Experimental merge #214

merged 75 commits into from
Feb 27, 2017

Conversation

rneher
Copy link
Member

@rneher rneher commented Feb 26, 2017

this would merge map-v2, info-paneland tipLabels into master. Some changes re timeBar got lost, but they seem to have been back-logged anyway.

@colinmegill
add dataset guid null to map state, like we do in tree
8732b3b
@colinmegill
pass guid to map so it is aware of dataset
5080b5d
@colinmegill
map clears and resets on dataset change, closes #76 closes #74
88982be
@colinmegill
D3 drawing circles
f6f8ac3
@colinmegill
click handler in map setState in animation in app
ca95fac
@colinmegill
red line
3893881
@colinmegill
time bar
7f04404
@colinmegill
comment out console for now
51cc119
@colinmegill
move animation out of app into map
12a6a95
@colinmegill
change animation duration
240fdf9
@colinmegill
break out latlong into its own helper, d3ify map
a553bf0
@colinmegill
animation progress via redux
f67194f
@colinmegill
fix console error from incorrect ordering of conditionals
12e9e99
@colinmegill
lat long
bf030bc
@colinmegill
animation working
c3b352f
@colinmegill
delete commented out code
500af52
@colinmegill
Merge branch 'master'
f8e46aa 
Conflicts:
	src/components/app.js
	src/components/map/map.js
	src/components/tree/treeView.js
	src/util/globals.js
	src/util/phyloTree.js
@colinmegill
white space
816832f
@colinmegill
set map back to half screen for deploy crunch
ff09713
@colinmegill
beginning work on abstracting to controls
38819ec
@colinmegill
lowercase 'division' to match others
7853f12
@colinmegill
return flatter partial transmission list
84658db
@colinmegill
d3 rendering both paths and tips directly
a7173c9
@colinmegill
refactor map.js, call latlong directly, store d3node in state, methods
8066e2a
@colinmegill
d3 correctly repositions on leaflet zoom in out, switching datasets
12cf3c9
@colinmegill
comments & links
97d37a0
@colinmegill
link to other possible reason for cutoff
a265ac2
@colinmegill
color by from
dc61a73
@colinmegill
Cleaner d3 select attaches directly to leaflet svg, fixes zoom bug
0d0ff13
@colinmegill
pass map into draw tips
dace36e
colinmegill and others added 23 commits February 24, 2017 12:48
@colinmegill
cleanup
0b63738
@colinmegill
add geoResolution type
8f7ceed
@colinmegill
add georesolution control
8986a5f
@colinmegill
add controls to reducer
b5dd26d
@colinmegill
add default to globals
2b79d00
@colinmegill
demes
6e932e4
@colinmegill
change geo resolution
dc610b0
@colinmegill
in the middle of changing the logic to maphelpers lat long
5ad80e7
@colinmegill
add geores state to map, change demes
6b0c191
@trvrb
Fix transmission display
a1a3649
@trvrb
Style tooltip and info panel and include link
5fef713 
Fixes #180. Progress on #175.
@trvrb
Styling of branch selected panel. Per #175.
58ac386
@trvrb
Small fix to tooltip labeling
a3177a5
this adds tip labels, addresses #56 and #207
4a0c53a
messy merge -- map broken
6b8353e
map now renders on first load
ced0d34
cherry picked auto range onto map
d983e1a
Merge remote-tracking branch 'origin/info-panel' into experimental_merge
72789fb
uses left/right, top/bottom instead of width and height
a06e828
removed unused lines
78db22c
make transmission markers be part of the line
7467ae3
adjust the number of ticks on transmission to be distance dependent
ee74341
marker style and comments
d25c15d
@rneher
Copy link
Member Author

rneher commented Feb 26, 2017

this closes #198, #207, #56, #175, #136, #131, #109, #17 (minus animation)

@trvrb trvrb merged commit 54518c2 into master Feb 27, 2017
@trvrb
Copy link
Member

trvrb commented Feb 27, 2017

I can't find anything major broken here. I'm going to merge this now and we can all work on bug fixes etc... tomorrow. I'll push up the acknowledgements work. I don't think there's any major features missing at this point. I know map "filtering" would be good, but it's not essential. Thanks Richard for pulling this together and thanks Colin for all the effort with the new map.

@trvrb trvrb deleted the experimental_merge branch February 27, 2017 01:57
@cmlsn cmlsn mentioned this pull request Apr 19, 2022
Closed
@jmontmaxwell jmontmaxwell mentioned this pull request Jun 23, 2023
Open
@BinamB BinamB mentioned this pull request Jun 23, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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