Skip to content

Latest commit

 

History

History
34 lines (29 loc) · 2.79 KB

10_update-py3dtiles.md

File metadata and controls

34 lines (29 loc) · 2.79 KB

Update py3dtiles package with Oslandia updates

Overview instructions are also documented in the repo README. Update this repo from your local machine rather than a server.

Oslandia GitLab repo is here.

Steps:

  • Pull updates from viz-staging, viz-raster, viz-3dtiles, and py3dtiles into your local repos
  • cd into py3dtiles, switch into branch gitlab-oslandia
    • this branch is essentially a mirror of the Oslandia gitlab repo
  • run git remote -v to see all remote branches. If this is your first time, you'll need to add the http link for the Oslandia gitlab repo using git remote add and name the remote gitlab
  • run git pull gitlab master (the master part was necessary the first time, may or may not be necessary next times)
  • run git push origin
  • run git checkout develop
  • run git merge gitlab-oslandia
    • This is where conflicts will arise if there are any. Conflicts will occur if any changes we have made to our fork conflict with any of the code they changed, regardless if the changes we made were since the last pull or not, because any code we ever modified was not merged into their repo, so if they modified their version of that code, it's new to our repo.
    • After resolving conflicts, don't forget to save modified files.
  • run git commit, no message necessary
  • Time to test the changes. The point of this is to see if any of the changes made result in errors in our workflow, or changes something that can only be identified after visualizing the files. Switch into viz-3dtiles repo, main branch is fine.
  • activate python environment that has local versions of all these packages installed
  • run python test/test.py
    • ignore a warning from geopandas if one comes up
    • if an error message is printed in the terminal, use the traceback to find the file causing it. Can also ctrl+shift+f in the file explorer for a keyword like the module that is at the root of the error, like 'class moduleName` to find the file you're looking for.
  • switch into test/run-cesium, open cesium.js and enter token for the cesium baselayer, and run node cesium.js
    • take a look at the url printed in the terminal and see if any of the web tiles look like they are obviously in the wrong places, such as over water
  • cd into py3dtiles again, develop branch, commit & push changes
  • switch to main branch, git merge develop, push changes

Done!

Notes:

  • can subscribe to changes from Oslandia
  • do this about every 2 weeks to avoid getting too far behind
  • if you're not sure if you should accept a merged change, can accept the merge and run the test, and if it goes poorly, can just unmerge changes and make opposite decision and run the test again