Skip to content

Commit 1c081f7

Browse files
authored
Merge pull request #3481 from Vizzuality/feature/2017-loss
Feature/2017 loss
2 parents aedaea0 + 382ca2f commit 1c081f7

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

app/assets/javascripts/map/views/layers/LossLayer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ define([
1818
options: {
1919
threshold: 30,
2020
dataMaxZoom: 12,
21-
urlTemplate: 'https://storage.googleapis.com/wri-public/Hansen_16/tiles/hansen_world/v1/tc{threshold}{/z}{/x}{/y}.png',
22-
currentDate: ['2001-01-01','2017-01-01']
21+
urlTemplate: 'https://storage.googleapis.com/wri-public/Hansen17/tiles/hansen_world/v1/tc{threshold}{/z}{/x}{/y}.png',
22+
currentDate: ['2001-01-01','2018-01-01']
2323
},
2424

2525
init: function(layer, options, map) {

app/javascript/components/map/assets/layers/loss.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const OPTIONS = {
77
urlTemplate:
88
'https://storage.googleapis.com/wri-public/Hansen15/tiles/hansen_world/v1/tc{threshold}/{z}/{x}/{y}.png',
99
startYear: 2001,
10-
endYear: 2016
10+
endYear: 2017
1111
};
1212

1313
class Loss extends Canvas {

app/javascript/components/widgets/widgets/climate/emissions-deforestation/initial-state.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default {
1414
'units'
1515
],
1616
units: ['biomassCarbon', 'co2Emissions'],
17-
yearRange: ['2001', '2016'],
17+
yearRange: ['2001', '2017'],
1818
metaKey: 'widget_carbon_emissions_tree_cover_loss',
1919
type: 'loss',
2020
colors: 'emissions',
@@ -29,7 +29,7 @@ export default {
2929
unit: 'biomassCarbon',
3030
threshold: 30,
3131
startYear: 2001,
32-
endYear: 2016
32+
endYear: 2017
3333
},
3434
enabled: true
3535
};

app/javascript/components/widgets/widgets/forest-change/tree-loss-global/selectors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const parseConfig = createSelector(
126126
xAxis: {
127127
tickFormatter: tick => {
128128
const year = moment(tick, 'YYYY');
129-
if ([2001, 2016].includes(tick)) {
129+
if ([2001, 2017].includes(tick)) {
130130
return year.format('YYYY');
131131
}
132132
return year.format('YY');

app/javascript/components/widgets/widgets/forest-change/tree-loss-located/initial-state.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default {
4343
pageSize: 5,
4444
page: 0,
4545
startYear: 2001,
46-
endYear: 2016,
46+
endYear: 2017,
4747
layers: ['loss']
4848
},
4949
enabled: true

app/javascript/components/widgets/widgets/forest-change/tree-loss-plantations/initial-state.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const initialState = {
88
categories: ['forest-change'],
99
admins: ['country', 'region', 'subRegion'],
1010
selectors: ['startYears', 'endYears', 'thresholds'],
11-
yearRange: ['2013', '2016'],
11+
yearRange: ['2013', '2017'],
1212
type: 'loss',
1313
metaKey: 'widget_plantations_tree_cover_loss',
1414
layers: ['loss', 'plantations_by_type'],
@@ -23,7 +23,7 @@ export const initialState = {
2323
settings: {
2424
threshold: 30,
2525
startYear: 2013,
26-
endYear: 2016,
26+
endYear: 2017,
2727
layers: ['loss', 'plantations_by_type']
2828
},
2929
enabled: true

app/javascript/components/widgets/widgets/forest-change/tree-loss-ranked/initial-state.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const initialState = {
4040
settings: {
4141
threshold: 30,
4242
startYear: 2001,
43-
endYear: 2016,
43+
endYear: 2017,
4444
unit: '%',
4545
extentYear: 2000,
4646
layers: ['loss'],

app/javascript/components/widgets/widgets/forest-change/tree-loss/initial-state.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const initialState = {
3636
settings: {
3737
threshold: 30,
3838
startYear: 2001,
39-
endYear: 2016,
39+
endYear: 2017,
4040
extentYear: 2000,
4141
layers: ['loss']
4242
},

app/javascript/components/widgets/widgets/forest-change/tree-loss/selectors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const parseConfig = createSelector([getColors], colors => ({
4545
xAxis: {
4646
tickFormatter: tick => {
4747
const year = moment(tick, 'YYYY');
48-
if ([2001, 2016].includes(tick)) {
48+
if ([2001, 2017].includes(tick)) {
4949
return year.format('YYYY');
5050
}
5151
return year.format('YY');

app/javascript/pages/dashboards/header/header.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const mapStateToProps = ({ countryData, location, header, widgets }) => {
3434
);
3535
const downloadLink = `http://gfw2-data.s3.amazonaws.com/country/umd_country_stats${
3636
country ? '/iso' : ''
37-
}/tree_cover_stats_2016${country ? `_${country}` : ''}.xlsx`;
37+
}/tree_cover_stats_2017${country ? `_${country}` : ''}.xlsx`;
3838
const locationOptions = { ...countryData };
3939
const locationNames = getAdminsSelected({ ...countryData, ...location });
4040

0 commit comments

Comments
 (0)