Skip to content

Add tracks support#10

Open
tkurki wants to merge 18 commits into
vokkim:masterfrom
tkurki:tracksserver-sk-featurecollection
Open

Add tracks support#10
tkurki wants to merge 18 commits into
vokkim:masterfrom
tkurki:tracksserver-sk-featurecollection

Conversation

@tkurki
Copy link
Copy Markdown
Contributor

@tkurki tkurki commented Sep 20, 2017

This PR supercedes #2 so that it includes everything that PR has and additionally

  • adds support for tracks from SK Node server when Tuktuk is loaded from SK server
  • changes the tracks response format to be plain vanilla GeoJSON FeatureCollection with individual tracks as GeoJSON features with starttime and name properties

If the response contains extra data in addition to the track positions
in the individual coordinates arrays and they are enumerated in the
top FeatureCollection property dataPaths render them as colored points
and rings. Supports 2 distinct series. Includes hover popups
to display the value with timestamp.
@tkurki
Copy link
Copy Markdown
Contributor Author

tkurki commented Sep 24, 2017

image

Start making the data to fetch configurable and fetch units
from the server, caching them locally to skip a few http requests.
@FredericGuilbault
Copy link
Copy Markdown

Hi, Could you PR on my fork on a seperate branch.
I volunteers to fix the merging conflict

@tkurki
Copy link
Copy Markdown
Contributor Author

tkurki commented Apr 11, 2018

@FredericGuilbault I don’t understand what you are after. Please read up on Github https://guides.github.com/activities/forking/ https://guides.github.com/introduction/flow/

@FredericGuilbault
Copy link
Copy Markdown

I taught I would loose the info about commiters if I was the one adding your upstream and push. but it's ok.

FTR that's what I did :
git remote add upstream https://github.com/tkurki/tuktuk-chart-plotter.git
git fetch upstream
git checkout upstream/tracksserver-sk-featurecollection
git checkout -b tkurki-tracksserver-sk-featurecollection
git push origin tkurki-tracksserver-sk-featurecollection

Now I will good :D

Comment thread src/client/app.js
import _ from 'lodash'
import {COG, HDG, MAX_ZOOM, MIN_ZOOM, EXTENSION_LINE_OFF, EXTENSION_LINE_2_MIN, EXTENSION_LINE_5_MIN, EXTENSION_LINE_10_MIN} from './enums'
import Map from './map'
import Connection from './data-connection'
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactoring code from of the master branch inside a feature branch should be avoided. It's a PITA when it come to merge multiple branches. Refactoring process are bumpy enough to worth it's own branch :D.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants