The spatial dev work so far. Once you are able to fire up the django app, simply click on the "World Map" at the top nav bar.
Your recent commits from the Qing branch too (I merged this into my fork recently, so it's up to date with 850e00d)
As we have discussed, you can set up a dev server to test this before we roll this out to the live site. You'll need to consider the following to test these changes:
If you don't have a dev server with the up to date Qing database already, you can follow/adapt my instructions in docs/setup.md for setting up on an Ubuntu VM. This may be similar to your own documentation, but also includes for example installing the PostGIS extension, and steps on how to populate the spatial data tables (after running migrations as usual). Let me know if anything there is unclear.
The changes I have made in the settings (and to manage.py) can be changed to suit a configuration that matches your production server. I've mostly edited local.py, for my setup at Turing (e.g. here I overwrite DATABASES and other settings), so you may want to update base.py. It might be you can keep everything as you have it now except changing the ENGINE to 'django.contrib.gis.db.backends.postgis'.
Important: I haven't tested whether all other interactions work as expected with this new db engine, clicking through pages it all seems fine, but you'll know better if this is true!
I think that should be all, let me know if you need some help with this. After we merge this and you are satisfied it works on a development environment (with any modifications you make to settings etc), I expect you can merge dev into Qing and perform the same steps on the live site. After that it should be more straightforward to merge subsequent changes I make. We can use the following workflow:
I test changes and when I'm satisfied, make a PR to your dev branch
You merge and test on your dev server, making any changes required for production
You merge dev into Qing (or whichever branch you use for the live site) and hopefully just to a git pull on the prod server
Hi @MajidBenam - this PR includes:
Qingbranch too (I merged this into my fork recently, so it's up to date with 850e00d)As we have discussed, you can set up a dev server to test this before we roll this out to the live site. You'll need to consider the following to test these changes:
docs/setup.mdfor setting up on an Ubuntu VM. This may be similar to your own documentation, but also includes for example installing the PostGIS extension, and steps on how to populate the spatial data tables (after running migrations as usual). Let me know if anything there is unclear.settings(and tomanage.py) can be changed to suit a configuration that matches your production server. I've mostly editedlocal.py, for my setup at Turing (e.g. here I overwriteDATABASESand other settings), so you may want to updatebase.py. It might be you can keep everything as you have it now except changing theENGINEto'django.contrib.gis.db.backends.postgis'.I think that should be all, let me know if you need some help with this. After we merge this and you are satisfied it works on a development environment (with any modifications you make to settings etc), I expect you can merge
devintoQingand perform the same steps on the live site. After that it should be more straightforward to merge subsequent changes I make. We can use the following workflow:devbranch