Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
f130cf7
updated gitignore
aagm Jun 23, 2017
e06377d
updated notebooks
aagm Jun 23, 2017
5114b03
added Ronny`s scripts
aagm Jun 23, 2017
db09e6e
added updates to the dashboard
aagm Jun 29, 2017
cb8104b
added widgets
aagm Jun 29, 2017
c318c3e
updated status
aagm Jul 10, 2017
2d96e93
added modifiend structure for notebooks and data updated
aagm Jul 19, 2017
1e9c0c8
Delete water_risk_data-checkpoint.ipynb
aagm Jul 19, 2017
fb2de66
added ground water scripts
aagm Jul 24, 2017
2cbc826
solve issue
aagm Jul 24, 2017
9f0a641
updated spam crops with comments
aagm Jul 25, 2017
979c20d
added layer definition for rasters
aagm Jul 25, 2017
5c2c53e
updated colors
aagm Jul 25, 2017
eba4a42
updated categorization functions
aagm Jul 26, 2017
8ed8eb4
added arid low water use updated algorithm
aagm Jul 26, 2017
a9ac5c2
added 3 new widgets
aagm Jul 27, 2017
c5778e6
structure finish
aagm Jul 27, 2017
c8bf733
added new graphs
aagm Jul 28, 2017
417326a
updated
aagm Aug 1, 2017
241c5df
upload new widgets
aagm Aug 2, 2017
6273e4b
Querying data from Rasters
ronnyccs24 Aug 10, 2017
3a7a6fc
updated definition
aagm Sep 8, 2017
508586b
updated definition meta
aagm Sep 8, 2017
0357aa8
updated definition
aagm Sep 8, 2017
02eca5a
added updated version dataset check script
aagm Sep 19, 2017
a3e1309
added nexgddp data management
aagm Sep 20, 2017
0ac432d
added nexgddp data management updated histograms
aagm Sep 20, 2017
f2fbcbc
added nexgddp data management updated bar graph
aagm Sep 20, 2017
55112c6
added new function; st_countValue that will allow us get the categori…
aagm Sep 22, 2017
50f6ddf
uploaded new layer user acceptance test
aagm Sep 28, 2017
ce720c0
uploaded new layer user acceptance test
aagm Sep 28, 2017
9217681
uploaded new layer user acceptance test
aagm Sep 28, 2017
0405f00
updated definitions, added proper gee definition, and 3d planet pulse…
aagm Sep 28, 2017
807966d
tables used on aq project added
aagm Oct 20, 2017
7349477
added widget parametrization
aagm Oct 24, 2017
a2d8389
added widget parametrization
aagm Oct 24, 2017
cc1b727
added widget parametrization
aagm Oct 24, 2017
06eca7d
test
aagm Oct 24, 2017
05f7ebb
tesas
aagm Oct 24, 2017
6a1cf37
test_2
aagm Oct 24, 2017
11d2019
tyest 3
aagm Oct 24, 2017
b724d92
Update widget_parametrization.ipynb
aagm Oct 24, 2017
f075463
added widget parametrization
aagm Oct 25, 2017
6a792e7
added improve related vis
aagm Oct 27, 2017
5a0eb84
added improve related vis
aagm Oct 27, 2017
f8cc7f8
added improve related vis
aagm Oct 27, 2017
8421962
added improve related vis
aagm Oct 27, 2017
507be31
added improve related vis
aagm Oct 27, 2017
af5aeb7
added improve related vis
aagm Oct 27, 2017
84104ed
added improve related vis
aagm Oct 27, 2017
e2809e3
added improve related vis
aagm Oct 27, 2017
bd2ad42
added improve related vis
aagm Oct 27, 2017
0ff7a57
added improve related vis
aagm Oct 27, 2017
84c0263
added improve related vis
aagm Oct 27, 2017
a98ad50
added improve related vis
aagm Oct 27, 2017
6061ea1
added improve related vis
aagm Oct 27, 2017
83010cf
added improve related vis
aagm Oct 27, 2017
e616a0c
added improve related vis
aagm Oct 27, 2017
60b75a6
added improve related vis
aagm Oct 27, 2017
d425e81
updated managed files
aagm Nov 13, 2017
5b2c0b8
updated gee connector
aagm Dec 19, 2017
0f8d3cf
added script that allow us upload images to gee programatically
aagm Dec 27, 2017
9f76216
updated definition
aagm Feb 16, 2018
b3ddbdd
widget migration ready for hand made widgets on the api
aagm Feb 22, 2018
2077f62
added ethiopia widgets and updated interaction_config definition
aagm Feb 23, 2018
6311d73
Finished widget migration prepare
aagm Mar 1, 2018
2625b66
added an on going research of export polygons from rasters in GEE for…
aagm Mar 2, 2018
4e62322
updated widgets
aagm Mar 6, 2018
a29def4
loca management files
aagm Mar 15, 2018
9529802
added layers
aagm May 17, 2018
86a4aca
added the cow slide function
aagm May 22, 2018
58e30f7
added the cow slide function to be viewed
aagm May 22, 2018
94b982b
added freeze version of libs used
aagm Jun 8, 2018
0515c46
Added dataprep explanation notebooks
EnriqueCornejo Jun 11, 2018
a46d37b
added working file for Floods data model
aagm Jun 25, 2018
70e569f
Merge branch 'develop' of github.com:resource-watch/notebooks into de…
aagm Jun 25, 2018
47127f2
widgets for risk
ikerey Aug 22, 2018
d4ed580
Merge pull request #2 from resource-watch/work/iker
ikerey Aug 22, 2018
e36a6e5
initial commit
ikerey Oct 5, 2018
30ff451
Merge pull request #3 from resource-watch/work/iker
ikerey Oct 5, 2018
a9a3187
single tag
ikerey Oct 22, 2018
94d4ac2
minor change
ikerey Nov 7, 2018
4468f73
Merge pull request #5 from resource-watch/work/iker
ikerey Nov 7, 2018
1443ba0
V3 water risk data analysis
ikerey Jan 25, 2019
4b013d4
Merge pull request #6 from resource-watch/work/iker
ikerey Jan 25, 2019
fc28f9a
defined water risk indicator layer queries
ikerey Jan 30, 2019
91abb9d
Merge pull request #7 from resource-watch/work/iker
ikerey Jan 30, 2019
44afcb5
added point intersection queries
ikerey Feb 5, 2019
a58bc10
Merge pull request #8 from resource-watch/work/iker
ikerey Feb 5, 2019
a6ef3f2
Added point analysis
ikerey Feb 21, 2019
9af507e
Merge pull request #9 from resource-watch/work/iker
ikerey Feb 21, 2019
60182e9
added interactivity
ikerey Mar 7, 2019
7c010f0
MapSPAM data download
ikerey Mar 8, 2019
4fc2687
Merge pull request #10 from resource-watch/work/iker
ikerey Mar 8, 2019
a7f16dd
analysis microservice changes
ikerey Mar 21, 2019
8aaee67
Merge pull request #11 from resource-watch/work/iker
ikerey Mar 21, 2019
f4f14bf
added FAO hydrobasins layer definition
ikerey Mar 28, 2019
6826e5e
Merge pull request #12 from resource-watch/work/iker
ikerey Mar 28, 2019
79982c5
add SPAM data 2010
ikerey Apr 12, 2019
5f1fac3
Merge pull request #13 from resource-watch/work/iker
ikerey Apr 12, 2019
2040fc1
water risk atlas notebooks
ikerey May 7, 2019
7a578e6
food notebooks
ikerey May 7, 2019
810f655
Merge pull request #14 from resource-watch/work/iker
ikerey May 7, 2019
f0aced9
changed insignificant trend color
ikerey Jun 14, 2019
7e425a6
food layers and widgest with new spam 2010 data
ikerey Jul 16, 2019
353b56a
water risk layers and analysis with new baseline data
ikerey Jul 16, 2019
ee60b1e
country ranking layers and widgets
ikerey Jul 16, 2019
62cb1db
Merge pull request #15 from resource-watch/work/iker
ikerey Jul 16, 2019
37eea3d
removed all queries
ikerey Jul 19, 2019
558213d
Merge pull request #16 from resource-watch/work/iker
ikerey Jul 19, 2019
5e99fc5
added country boundary to province layers
ikerey Jul 23, 2019
b942e32
Merge pull request #17 from resource-watch/work/iker
ikerey Jul 23, 2019
5e9e394
updated dataset
ikerey Jul 25, 2019
b746c8d
Merge pull request #18 from resource-watch/work/iker
ikerey Jul 25, 2019
ed6ae1b
added the_geom
ikerey Jul 25, 2019
db2af1e
changed NoData to No Data
ikerey Jul 26, 2019
23b6f5a
Merge pull request #19 from resource-watch/work/iker
ikerey Jul 26, 2019
e00fb06
removed point_id column
ikerey Jul 29, 2019
e5d0a5f
Merge pull request #20 from resource-watch/work/iker
ikerey Jul 29, 2019
1d4e76a
updated service to get api widgets
aagm Aug 5, 2019
c6e8f96
Merge branch 'develop' of github.com:resource-watch/notebooks into de…
aagm Aug 5, 2019
5dbd5d0
new styles applied
aagm Aug 5, 2019
db59168
updated labels styles
aagm Aug 5, 2019
5ec67ad
updated label styles
aagm Aug 5, 2019
bb2e9a6
updated widgets food
aagm Aug 12, 2019
8f87cff
updated widget queries
aagm Aug 19, 2019
8b49581
updated certain queries for AQ food
aagm Aug 19, 2019
1d3f0a4
working progress
aagm Sep 2, 2019
417d2a6
upload data to the db
aagm Sep 2, 2019
5ddd029
testing geostore geometries
aagm Sep 12, 2019
cf03111
new versions of the queries used on AQ water risk atlas tool this has…
aagm Sep 18, 2019
bb5f841
improvements
aagm Oct 2, 2019
4876f8d
Merge branch 'develop' of github.com:resource-watch/notebooks into de…
aagm Oct 2, 2019
c00b068
geometrriw
aagm Oct 2, 2019
6dc117d
merged
aagm Oct 2, 2019
1c93513
updated way we get data
aagm Oct 3, 2019
c0f117f
Added new info
aagm Oct 7, 2019
7e9dea5
updated data from AQ
aagm Nov 13, 2019
b2066c0
added new versions
aagm Nov 25, 2019
1a9105d
upload latest working version on the compiler
aagm Mar 5, 2020
b7183db
parse cartocss paint style and filter to the mapbox specifications
elpamart Mar 16, 2020
5082b4f
notebook with the fixed script and generation of new vector styles
elpamart Mar 25, 2020
6cfe327
updates in carto to mapbox migration notebook
elpamart Apr 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.DS_Store
*.DS_Store
Aqueduct/.DS_Store
Aqueduct/lab/.DS_Store
PreP/.DS_Store
ResourceWatch/.DS_Store
ResourceWatch/data_management/.DS_Store
ResourceWatch/data_management/.DS_Store
*.ipynb_checkpoints
Aqueduct/lab/.ipynb_checkpoints
143 changes: 0 additions & 143 deletions Aqueduct/.ipynb_checkpoints/water_risk_data-checkpoint.ipynb

This file was deleted.

429 changes: 429 additions & 0 deletions Aqueduct/AQ_2_V4_Points_intersection.ipynb

Large diffs are not rendered by default.

153 changes: 153 additions & 0 deletions Aqueduct/Untitled.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
"import pandas as pd"
]
},
{
"cell_type": "code",
"execution_count": 5,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<div>\n",
"<style scoped>\n",
" .dataframe tbody tr th:only-of-type {\n",
" vertical-align: middle;\n",
" }\n",
"\n",
" .dataframe tbody tr th {\n",
" vertical-align: top;\n",
" }\n",
"\n",
" .dataframe thead th {\n",
" text-align: right;\n",
" }\n",
"</style>\n",
"<table border=\"1\" class=\"dataframe\">\n",
" <thead>\n",
" <tr style=\"text-align: right;\">\n",
" <th></th>\n",
" <th>Unnamed: 0</th>\n",
" <th>location name</th>\n",
" <th>address</th>\n",
" </tr>\n",
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>1</td>\n",
" <td>TMMAL</td>\n",
" <td>1 Cottonvalley Dr NW, Huntsville, AL 35810 Uni...</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>2</td>\n",
" <td>MTMUS</td>\n",
" <td>9000 Greenbriar Parkway, Huntsville, AL 35756 ...</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>3</td>\n",
" <td>DC II Phoenix</td>\n",
" <td>120 East Van Buren Street, Phoenix, AZ 85004 U...</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>4</td>\n",
" <td>Phoenix Satellite Training</td>\n",
" <td>4008 S. 23rd Street, Phoenix, AZ 85040 United ...</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
" <td>5</td>\n",
" <td>TAPG</td>\n",
" <td>30700 West Patton Rd, Wittmann, AZ 85316 Unite...</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" Unnamed: 0 location name \\\n",
"0 1 TMMAL \n",
"1 2 MTMUS \n",
"2 3 DC II Phoenix \n",
"3 4 Phoenix Satellite Training \n",
"4 5 TAPG \n",
"\n",
" address \n",
"0 1 Cottonvalley Dr NW, Huntsville, AL 35810 Uni... \n",
"1 9000 Greenbriar Parkway, Huntsville, AL 35756 ... \n",
"2 120 East Van Buren Street, Phoenix, AZ 85004 U... \n",
"3 4008 S. 23rd Street, Phoenix, AZ 85040 United ... \n",
"4 30700 West Patton Rd, Wittmann, AZ 85316 Unite... "
]
},
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"excel = pd.read_excel('/Users/alicia/Downloads/2019_05_10 TMNA Master Site Aqueduct Input 2019_08_19 (1).xlsx')\n",
"excel.head()"
]
},
{
"cell_type": "code",
"execution_count": 6,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"Index(['Unnamed: 0', 'location name', 'address'], dtype='object')"
]
},
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"excel.columns"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.4"
}
},
"nbformat": 4,
"nbformat_minor": 4
}
Loading