Add more data #9
Conversation
762266a to
8e792a3
Compare
|
@javier-jimenez-shaw-pix4d @hernando This is finally ready to go! Thanks so much for putting this framework together, we're definitely stronger together 💪 |
d74522d to
eb6473a
Compare
There was a problem hiding this comment.
Thanks for the PR. Many comments inline.
See that now, when data folder is changed, release.txt must be increased before the merge into master (and be careful if there are other merges in between). It is mentioned (since yesterday) in CONTRIBUTING.md.
It would be nice that the NTRIP providers themselves get involved in keeping the ntrip catalog accurate and updated (but I know it is not always possible).
|
Hi Ben.
|
d2f6794 to
2449333
Compare
|
@javier-jimenez-shaw-pix4d Sounds good to me, I'll open up another PR. I ended up just resetting and force-pushing, but the changes are now nicely grouped. Thanks!! |
|
Can you please rebase on master instead of merging it? It looks like the first commit of your branch diverges from master. |
2449333 to
8343a4c
Compare
|
@hernando I think I did this right? Please let me know if not, I don't have a lot of experience with rebasing. |
Not quite. I don't know how you attempted it, but it doesn't look like it was with a It seems that you started working on this branc 9E81 h branching from the commit with the CI workflow before it was ready to merge. You then forgot to rebase this branch on top of the other one (making sure you replaced the base commit with the good one, and for that you have to use an interactive rebase to remove the commit from the branch being rebased) and did a merge instead. The result of a simple merge in a case like this is a branch that that contains a spurious commit which looks like the top from master, but not really the same. |
8343a4c to
5faa890
Compare
This splits CI into one that runs on PR builds, and one that runs on master (which will commit and push the ntrip-catalog.json). This is because the GH action running on Pix4D/ntrip-catalog does not have permission to push changes to the branch of another repo. Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com>
Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com>
Update schema with option for mid-year epochs Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com>
5faa890 to
c54411d
Compare
|
I see you tried to rebase, but this time you resolved the conflict in ci.yml keeping the version from master and dropping the changes you made in the PR. |
|
@hernando I'm just going to open a new PR with the CI changes, and get them tested on my own fork first 😅 Putting those changes in this PR to begin with wasn't great, apologies for that. Thanks for all the help here, much appreciated. |
This reverts commit 09e9592. Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com>
Yes, I think it's a much better idea. Javier and me were discussing about it this morning, but we didn't want to cause more extra work to you by requesting a third PR. |
Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> add v0.2 schema update scripts Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> update to 0.2 in a few more spots Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com>
6e13057 to
cb5932a
Compare
|
@bscholer, the branch can't be merged as is because it contains the CI changes and it conflicts with main. |
|
Sorry, what I said is true for rebase and merge, but for squash and merge there's no issue. |
* Fix CI caching, split into two with common action CI changes This splits CI into one that runs on PR builds, and one that runs on master (which will commit and push the ntrip-catalog.json). This is because the GH action running on Pix4D/ntrip-catalog does not have permission to push changes to the branch of another repo. Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> add ci-common.yml Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> add write permissions add semicolons fi data change to test ci Auto-update ntrip-catalog.json fix caching? try without libcurl don't upgrade pip Revert "data change to test ci" This reverts commit 7238379. Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> * Auto-update ntrip-catalog.json * change names to call-ci-common Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> * Add more data (Pix4D#9) * Update schema to v0.2 with an option for mid-year epochs. * Add DroneDeploys lookups Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> * Create dist/ntrip-catalog.json after failing in previous PR (Pix4D#18) * add fragments on links at index.html (Pix4D#17) * Add workflow 'Manual CI Tests and Commit dist' (Pix4D#19) * rename folder America to Americas (Pix4D#20) --------- Signed-off-by: Ben Scholer <ben.scholer@dronedeploy.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Javier Jimenez Shaw <52919140+javier-jimenez-shaw-pix4d@users.noreply.github.com>
This PR adds a handful of NTRIP providers that we have in our lookup at DroneDeploy.
polaris.pointonenav.comURLsNC CORS Email.pdf
Can-Netcaster.emlid.com"mid-year"option to the schema. Open to renaming this to something else, but this felt pretty inline with"now".(Waiting for responses from unchecked providers)
Note regarding SmartNet note above, if support for polygon bounding boxes is added, we can use the following boundaries for the PointOne lookup. This file was provided by them directly. (This file is GeoJSON, but GitHub doesn't allow uploading of
.geojsonfiles)pointone_polaris_datums.json