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

Feature: GADM36 on GFW #3496

Merged
merged 43 commits into from
Jun 26, 2018
Merged

Feature: GADM36 on GFW #3496

merged 43 commits into from
Jun 26, 2018

Conversation

edbrett
Copy link
Contributor

@edbrett edbrett commented Jun 22, 2018 •
edited
Loading

This is a base feature branch for updating GFW to GADM36 🎉 !

As this will be an intensive task and require a lot of testing please make PRs from and to this branch in order for proper review.

NOTES: you will need the env keys to be pointing to the staging api and COUNTRIES_PAGE_DATASET=e5149c98-c31d-4f7e-95eb-654993031348

TASKS:

  • umd_nat_staging still in use and out of date (getRanking)
  • testing of staging tables
  • check blacklist provider needs testing with routing
  • url redirection and blacklisting updates

edbrett and others added 25 commits May 30, 2018 17:53
@edbrett
update loss layer to have 2017 data
e708009
@edbrett
swap gadm28 for gadm36
4a16b74
@edbrett
Merge pull request #3439 from Vizzuality/feature/new-loss-2017
ff1d94f 
Update loss layer to have 2017 data
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/gadm38
205b9ac
@01painadam
Update tables, add helpers
682f2c1
@01painadam
Update actions
9f103ca
@edbrett
merge develop
dc14278
@edbrett
Merge branch 'feature/gadm38' of github.com:Vizzuality/gfw into featu…
c0c79fa 
…re/gadm36-table-updates
@edbrett
Merge branch 'feature/2017-loss' of github.com:Vizzuality/gfw into fe…
250afd5 
…ature/2017-loss
@edbrett
Merge pull request #3491 from Vizzuality/feature/gadm36-table-updates
269b36e 
GADM36: Table updates & Country fetches
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/2017…
cc8fd59 
…-loss
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/gadm38
2652418
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/gadm38
20f0c4f
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/2017…
055b4ed 
…-loss
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/gadm38
dd06d8d
@edbrett
fix int issue when parsing gadm36 ids
c672631
@edbrett
update dashboard blacklists to use the new gid codes
507be18
@edbrett
update backbone countries service
8b28570
@pjosh
change url to 2017
3065f78
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/2017…
cd52150 
…-loss
@edbrett
Merge branch 'feature/2017-loss' of github.com:Vizzuality/gfw into fe…
6e86de3 
…ature/2017-spreadsheet
@edbrett
Merge pull request #3495 from Vizzuality/feature/2017-spreadsheet
6003e9a 
feature/2017-spreadsheet
@edbrett
change ifl_2013 to ifl for all dashboards and widgets
85269b0
@edbrett
Merge pull request #3493 from Vizzuality/gadm36/blacklist-for-new-reg…
fa6285e 
…ion-codes

update dashboard blacklists to use the new gid codes
@edbrett
Merge branch 'feature/gadm38' of github.com:Vizzuality/gfw into featu…
7e3f5d5 
…re/gadm36
@edbrett edbrett added WIP Any PR that should not be merged to develop staging Any PR expected to be kept on staging gadm36 labels Jun 22, 2018
@edbrett edbrett removed the WIP Any PR that should not be merged to develop label Jun 22, 2018
edbrett and others added 17 commits June 22, 2018 11:47
@edbrett
Merge pull request #3498 from Vizzuality/feature/update-api-v3
e0f9c7c 
GADM36: Update Analysis to /v3/
@edbrett
add new land categories and forest types
85262cf
@edbrett
fix style for settings menu where border spilling over
b42777a
@edbrett
add global black list
1c5fd0a
@edbrett
update widget footer fetch for countries count
b9e857b
@edbrett
update all widget config to use new land categories
93c8773
@edbrett
Merge pull request #3499 from Vizzuality/feature/new-indicators-for-w…
9c99df5 
…idgets

Feature/new indicators for widgets
@edbrett
merge develop
152d203
@edbrett
Merge branch 'feature/gadm36' of github.com:Vizzuality/gfw into featu…
aedaea0 
…re/gadm36
@edbrett
make widgets use 2017 loss
0c5ed83
@edbrett
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/2017…
382ca2f 
…-loss
@edbrett
Merge pull request #3481 from Vizzuality/feature/2017-loss
1c081f7 
Feature/2017 loss
@edbrett
update geostore version
c9410cb
@edbrett
fix analysis adm lists fetches
b3203e9
@edbrett
add subregion geojson drawing to map
37c15c8
@01painadam @edbrett
Add double fetch for glad alerts analysis with umd loss gain layers
635cf41
@edbrett
fix geostore rendering
1424c2d
@edbrett
Copy link
Contributor Author

edbrett commented Jun 26, 2018

Thanks everyone! Big effort from everyone to get this one running on all fronts @01painadam @benlaken @pjosh @simaob! 2017 loss and GADM 3.6 going live!

@edbrett edbrett merged commit a1c32f6 into develop Jun 26, 2018
@edbrett edbrett deleted the feature/gadm36 branch June 26, 2018 17:11
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
staging Any PR expected to be kept on staging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@edbrett @01painadam @pjosh