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.

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

Feature/gee recent imagery #3331

Merged
merged 181 commits into from
May 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
06116bd
fix sentinel requests
pjosh Feb 27, 2018
48b6baa
add sentinel 2 switch
pjosh Feb 27, 2018
3f595f7
first approach of the react map page with the recent imagery component
pjosh Feb 27, 2018
6d66bca
root waits to load the map
pjosh Feb 28, 2018
16d4251
middle view WIP
pjosh Feb 28, 2018
12f84ac
recent imagery layer WIP
pjosh Feb 28, 2018
524b6cf
map events WIP
pjosh Feb 28, 2018
1b473af
action improvements & polygon overlay
pjosh Feb 28, 2018
d20bf72
prevent polygon click on double click
pjosh Feb 28, 2018
cee3a79
simplify custom event
pjosh Mar 5, 2018
30cae08
manage page reload with params & update events
pjosh Mar 6, 2018
10f8e2f
remove countries param
pjosh Mar 6, 2018
ce557b9
remove Sentinel 2 switch
pjosh Mar 6, 2018
1393971
dates selector
pjosh Mar 6, 2018
5effe0c
toggle recent imagery
pjosh Mar 6, 2018
ae906a1
show infowindow on hover
pjosh Mar 6, 2018
971f03a
drag&drop library and settings modal container
pjosh Mar 7, 2018
aa7b5db
save sources on state
pjosh Mar 7, 2018
e3f974b
improve naming
pjosh Mar 7, 2018
71f3002
show settings when click on tiles
pjosh Mar 7, 2018
1cd6cac
format data with selectors
pjosh Mar 7, 2018
92e32a8
set better the empty state
pjosh Mar 7, 2018
2d19473
fetch more tiles & thumbnails
pjosh Mar 8, 2018
cb790db
launch fetch in componentWillReceiveProps
pjosh Mar 8, 2018
d48a293
settings box-shadow
pjosh Mar 8, 2018
74fc679
fix sentinel requests
pjosh Feb 27, 2018
489e772
add sentinel 2 switch
pjosh Feb 27, 2018
850c0eb
first approach of the react map page with the recent imagery component
pjosh Feb 27, 2018
7a20f08
root waits to load the map
pjosh Feb 28, 2018
64fa30e
middle view WIP
pjosh Feb 28, 2018
562c258
recent imagery layer WIP
pjosh Feb 28, 2018
62900dd
map events WIP
pjosh Feb 28, 2018
dd7e3aa
action improvements & polygon overlay
pjosh Feb 28, 2018
d2918dd
prevent polygon click on double click
pjosh Feb 28, 2018
5db2e47
simplify custom event
pjosh Mar 5, 2018
1eddc21
manage page reload with params & update events
pjosh Mar 6, 2018
6e2b39f
remove countries param
pjosh Mar 6, 2018
f5b872d
remove Sentinel 2 switch
pjosh Mar 6, 2018
9434f02
dates selector
pjosh Mar 6, 2018
72b1157
toggle recent imagery
pjosh Mar 6, 2018
47475c3
show infowindow on hover
pjosh Mar 6, 2018
fbb4d7e
drag&drop library and settings modal container
pjosh Mar 7, 2018
a8b44ac
Merge branch 'feature/GEE-recent-imagery' of https://github.com/Vizzu…
pjosh Mar 8, 2018
00293e9
save sources on state
pjosh Mar 7, 2018
089c40b
improve naming
pjosh Mar 7, 2018
f6dd01b
show settings when click on tiles
pjosh Mar 7, 2018
96af7f8
format data with selectors
pjosh Mar 7, 2018
0243dce
set better the empty state
pjosh Mar 7, 2018
d9e61e3
fetch more tiles & thumbnails
pjosh Mar 8, 2018
841e676
launch fetch in componentWillReceiveProps
pjosh Mar 8, 2018
4dc5477
settings box-shadow
pjosh Mar 8, 2018
623e905
Merge branch 'feature/recent-imagery-settings' of https://github.com/…
pjosh Mar 8, 2018
1a1a9e6
thumbs slider WIP
pjosh Mar 9, 2018
16a7d60
adapt to the new endpoint response
pjosh Mar 9, 2018
ced029e
slider styles
pjosh Mar 9, 2018
e4a0dfb
tile description inside the selectors
pjosh Mar 9, 2018
5e5b68e
settings styles
pjosh Mar 9, 2018
c48422a
load thumbs when the tile has been change
pjosh Mar 12, 2018
165f73b
thumbs styles
pjosh Mar 12, 2018
05e5daa
thumbs styles
pjosh Mar 12, 2018
c24aea4
Merge branch 'develop' into feature/GEE-recent-imagery
pjosh Mar 12, 2018
2e0fcdf
Merge branch 'feature/GEE-recent-imagery' into feature/recent-imagery…
pjosh Mar 12, 2018
75ced66
weeks select
pjosh Mar 12, 2018
36c5498
reduce the modal-meta component dependency
pjosh Mar 12, 2018
5199fa4
fix select value
pjosh Mar 12, 2018
f8b9b49
dates styles
pjosh Mar 12, 2018
134cc92
add react-dates library
pjosh Mar 12, 2018
9b3a6b9
datepicker component (wrapper of react-dates)
pjosh Mar 12, 2018
f4c66b3
datepicker styles
pjosh Mar 13, 2018
96774fd
fix datepicker object name
pjosh Mar 13, 2018
0308580
add date selectors
pjosh Mar 13, 2018
afa2b00
round could score
pjosh Mar 13, 2018
4c5018a
remove old refresh tile button
pjosh Mar 13, 2018
aade8c4
fix datepicker color
pjosh Mar 13, 2018
fccdb49
settings box style
pjosh Mar 13, 2018
59b4f00
fix slider with
pjosh Mar 13, 2018
31831ef
data filtered by clouds
pjosh Mar 13, 2018
67ae5ce
prevent problem when the UI request a lot of tiles at the same time
pjosh Mar 13, 2018
45e2082
button styles
pjosh Mar 14, 2018
6219ecc
hide the old recent imagery feature
pjosh Mar 14, 2018
f49a1cf
Merge branch 'develop' into feature/GEE-recent-imagery
pjosh Mar 14, 2018
06e7435
Merge branch 'feature/GEE-recent-imagery' into feature/recent-imagery…
pjosh Mar 14, 2018
ec9e06b
Merge branch 'feature/recent-imagery-settings' into feature/recent-im…
pjosh Mar 14, 2018
30b8f45
improve weeks options
pjosh Mar 14, 2018
065c275
manage data status with redux
pjosh Mar 14, 2018
65d9e72
use haveAllData inside dataStatus
pjosh Mar 14, 2018
7120a34
split tiles & thumbs request into several requests
pjosh Mar 14, 2018
07e74fd
add rc-slider library
pjosh Mar 14, 2018
eeef9c0
change the name of the current slider to carousel
pjosh Mar 14, 2018
c032cd6
change the name of the current slider to carousel
pjosh Mar 15, 2018
769aa99
cloud slider WIP
pjosh Mar 15, 2018
524823a
add 12 months value
pjosh Mar 15, 2018
94cf921
improve hover
pjosh Mar 17, 2018
5be9191
Merge branch 'fix/recent-imagery-requests' into feature/recent-imager…
pjosh Mar 17, 2018
5ea848a
slider component
pjosh Mar 19, 2018
3a09048
getTiles should be get the whole data
pjosh Mar 19, 2018
7340aab
keep the carousel height even if is empty
pjosh Mar 19, 2018
700c000
fix cloud coverage format
pjosh Mar 19, 2018
f8797cd
change thumbnail description on hover
pjosh Mar 19, 2018
f77e931
round cloud score to filter
pjosh Mar 19, 2018
b370b60
remove layer data flow from BB architecture
pjosh Mar 19, 2018
cd80c2a
zoom to 8 when show layer
pjosh Mar 19, 2018
ec7da10
remove hover efect on tile when the zoom is >= 10
pjosh Mar 19, 2018
7d4f802
set the selectedTileIndex before the data to prevent errors
pjosh Mar 19, 2018
d750752
remove unneeded props
pjosh Mar 20, 2018
051c6ce
Merge pull request #3340 from Vizzuality/feature/recent-imagery-cloud…
pjosh Mar 20, 2018
e30a32a
Merge pull request #3338 from Vizzuality/fix/recent-imagery-requests
pjosh Mar 20, 2018
176e5d8
Merge pull request #3337 from Vizzuality/feature/recent-imagery-styles
pjosh Mar 20, 2018
1e97776
remove unneeded css
pjosh Mar 20, 2018
bcf5044
Merge pull request #3335 from Vizzuality/feature/recent-imagery-settings
pjosh Mar 20, 2018
fc67b85
fix carousel config
pjosh Mar 21, 2018
7362952
setting the default weeks to 3 month
pjosh Mar 21, 2018
61a61ec
deleting unneeded files & changing sentinel name to recentImagery
pjosh Mar 21, 2018
d8502cd
Merge branch 'develop' into feature/GEE-recent-imagery
pjosh Mar 21, 2018
4aaad0c
Merge branch 'feature/GEE-recent-imagery' into feature/recent-imagery…
pjosh Mar 21, 2018
681ef4a
setting global params inside the reducer
pjosh Mar 21, 2018
5924ff2
Merge pull request #3341 from Vizzuality/feature/recent-imagery-bug-a…
pjosh Mar 21, 2018
16efcb4
merge develop
edbrett Mar 27, 2018
51b88c2
merge upstream
edbrett Apr 17, 2018
053e371
merge upstream
edbrett Apr 17, 2018
512575e
add missing slider container
pjosh Apr 19, 2018
47bb76e
adding zoom alert
pjosh Apr 19, 2018
d70c932
merge develop
edbrett Apr 20, 2018
8b36ab9
Merge branch 'feature/GEE-recent-imagery' of github.com:Vizzuality/gf…
edbrett Apr 20, 2018
cc00512
return to the previous zoom
pjosh Apr 20, 2018
2c007d0
Merge branch 'feature/GEE-recent-imagery' of https://github.com/Vizzu…
pjosh Apr 20, 2018
e8c4201
Merge pull request #3370 from Vizzuality/feature/zoom-alert
pjosh Apr 20, 2018
97e938d
button active style
pjosh Apr 23, 2018
0a10a73
remove polygon hover style
pjosh Apr 23, 2018
61c4eb7
tile infowindow style
pjosh Apr 23, 2018
3bea097
thumbnails hover style
pjosh Apr 23, 2018
30d05c2
empty state for the thumbnails carousel
pjosh Apr 23, 2018
17314eb
hide the tool button when the screen is less than 1300px
pjosh Apr 23, 2018
9bea9a7
fix button style
pjosh Apr 23, 2018
814061a
change no content text
pjosh Apr 24, 2018
f942867
fix button position
pjosh Apr 24, 2018
91bad73
settings responsive
pjosh Apr 24, 2018
cb6ef87
fix z-index on dates
pjosh Apr 24, 2018
4add537
timeline event & css transform
pjosh Apr 24, 2018
c0727f9
removing the icon margin
pjosh Apr 24, 2018
38e12c2
fix button z-index
pjosh Apr 24, 2018
07b2321
adding readOnly prop on the datepicker
pjosh Apr 24, 2018
5999327
datepicker styles & unify shadows and fangs
pjosh Apr 24, 2018
854a1aa
Merge pull request #3375 from Vizzuality/feature/GEE-design-improvements
edbrett Apr 25, 2018
4754f42
merge develop
edbrett Apr 25, 2018
a80cbe2
Merge branch 'feature/GEE-recent-imagery' of github.com:Vizzuality/gf…
edbrett Apr 25, 2018
ebee66c
add react back to map index template
edbrett Apr 25, 2018
0c4d835
fix set visibility behaviour
pjosh Apr 25, 2018
31c3495
prevent drag&drop issues with the settings above everything
pjosh Apr 25, 2018
65e4f15
prevent drag&drop issues with the settings above everything
pjosh Apr 25, 2018
9328a58
improve settings box position
pjosh Apr 25, 2018
e419968
improve box setting positon
pjosh Apr 25, 2018
d5cacf8
Merge pull request #3379 from Vizzuality/fix/GEE-hidden-layer
edbrett Apr 25, 2018
b4cd627
finite carousel
pjosh Apr 26, 2018
49c093d
empty state only for 0 results
pjosh Apr 26, 2018
53e15fb
use the tile source instead of the data index to find the seleted tile
pjosh Apr 26, 2018
6aeebe6
sort data by date
pjosh Apr 26, 2018
d58d461
prevent errors when the data has been updated
pjosh Apr 26, 2018
26e9ceb
always show the selected tile
pjosh Apr 26, 2018
0ce9c3c
improve tile tooltip
pjosh Apr 26, 2018
2d5f7fb
Merge pull request #3381 from Vizzuality/fix/thumbnails-issues
edbrett Apr 26, 2018
97224f2
fix misalignment state
pjosh Apr 26, 2018
7ae40ca
Merge pull request #3384 from Vizzuality/fix/update-tiles-data
edbrett Apr 26, 2018
2c5defb
Merge branch 'develop' of https://github.com/Vizzuality/gfw into feat…
pjosh Apr 30, 2018
851c6a6
bbox now comes inside every tile
pjosh May 7, 2018
679cc18
improve selected tile on the thumbnails carousel
pjosh May 7, 2018
460a8fb
using 'idle' listener instead of 'dragend' to prevent drag issues
pjosh May 7, 2018
20c47db
remove old zoom condition
pjosh May 7, 2018
3dde8e1
fix spinner conflict
pjosh May 7, 2018
5fccbd0
Merge pull request #3395 from Vizzuality/feature/gee-fixes-and-improv…
edbrett May 7, 2018
f859b0e
merge develop
edbrett May 7, 2018
08208e7
merge upstream
edbrett May 7, 2018
60a36c9
Merge branch 'develop' of https://github.com/Vizzuality/gfw into feat…
pjosh May 8, 2018
a7ebe8d
resolving conflicts
pjosh May 8, 2018
221a9aa
remove pre-commit changes
pjosh May 8, 2018
2311f79
use general weeks data
pjosh May 8, 2018
f729883
fix overlapped box
pjosh May 8, 2018
5442b3d
infowindow improvements
pjosh May 8, 2018
2a805bb
adding a more generic description
pjosh May 9, 2018
754c7c2
Merge pull request #3398 from Vizzuality/feature/gee-text-improves
edbrett May 9, 2018
1e9fc1b
Merge branch 'develop' of github.com:Vizzuality/gfw into feature/GEE-…
edbrett May 9, 2018
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
2 changes: 1 addition & 1 deletion app/assets/javascripts/helpers/fallbackDataHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,4 @@ define([], function() {
};

return fallbackDataHelper;
});
});
45 changes: 27 additions & 18 deletions app/assets/javascripts/map.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable */
/**
* Application entry point.
*/
Expand Down Expand Up @@ -29,6 +30,7 @@ require([
'map/views/NavMobileView',
'map/views/GuideView',
'map/views/controls/GuideButtonView',
'map/views/ReactMapMiddleView',
'views/HeaderView',
'views/FooterView',
'views/NotificationsView',
Expand Down Expand Up @@ -56,6 +58,7 @@ require([
NavMobileView,
GuideView,
GuideButtonView,
ReactMapMiddleView,
HeaderView,
FooterView,
NotificationsView,
Expand All @@ -65,6 +68,9 @@ require([
$el: $('body'),

init: function() {
window.App = {
Views: {}
};
var router = new Router(this);
this._cartodbHack();
this._handlebarsPlugins();
Expand All @@ -80,23 +86,28 @@ require([
if (!Backbone.History.started) {
Backbone.history.start({ pushState: true });
}
window.dispatchEvent(new Event('mapLoaded'));
},

_fetchData: function() {
// I was thinking that, without a map, an array of countries and an array of layers
// we shouldn't create any view.
countryService
.getCountries()
.then(function(results) {
this.countries = results;
this._initViews();
}.bind(this))
.catch(function(e) {
console.warn(e);
// Fallback when request is timing out
this.countries = FallbackDataHelper.getCountryNames();
this._initViews();
}.bind(this));
.then(
function(results) {
this.countries = results;
this._initViews();
}.bind(this)
)
.catch(
function(e) {
console.warn(e);
// Fallback when request is timing out
this.countries = FallbackDataHelper.getCountryNames();
this._initViews();
}.bind(this)
);
},
/**
* Initialize Application Views.
Expand All @@ -122,6 +133,7 @@ require([
new NotificationsView(this.map, this.countries);
new GuideView(this.map, this.countries);
new GuideButtonView(this.map, this.countries);
window.App.Views.ReactMapMiddleView = new ReactMapMiddleView(this.map);

this._initApp();
},
Expand All @@ -137,14 +149,11 @@ require([
},

_handlebarsPlugins: function() {
Handlebars.registerHelper(
'firstLetter',
function(text) {
return text.charAt(0).toUpperCase();
}
);
Handlebars.registerHelper('firstLetter', function(text) {
return text.charAt(0).toUpperCase();
});

Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
Handlebars.registerHelper('ifCond', function(v1, operator, v2, options) {
switch (operator) {
case '==':
return v1 == v2 ? options.fn(this) : options.inverse(this);
Expand Down Expand Up @@ -172,7 +181,7 @@ require([

_googleMapsHelper: function() {
if (!google.maps.Polygon.prototype.getBounds) {
google.maps.Polygon.prototype.getBounds = function () {
google.maps.Polygon.prototype.getBounds = function() {
var bounds = new google.maps.LatLngBounds();
var paths = this.getPaths();
var path;
Expand Down
13 changes: 3 additions & 10 deletions app/assets/javascripts/map/helpers/layersHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@ define(
'map/views/layers/HaitiWatershedLayer',
'map/views/layers/EcuUserProtectedAreasLayer',
'map/views/layers/BolUserFireFrequencyLayer',
// high resolution maps
'map/views/layers/SentinelLayer',
'map/views/layers/SentinelTilesLayer',
'map/views/layers/RecentImageryLayer',
// Layer dialog templates
// 'text!templates/dialogs/loss_dialog.handlebars',
// Layers timelines
Expand Down Expand Up @@ -366,9 +364,7 @@ define(
HaitiWatershedLayer,
EcuUserProtectedAreasLayer,
BolUserFireFrequencyLayer,
// highres layers
SentinelLayer,
SentinelTilesLayer,
RecentImageryLayer,
// Layer dialog templates
// loss_dialog,
// Layer timelines
Expand Down Expand Up @@ -777,11 +773,8 @@ define(
usa_forest_ownership: {
view: UsaForestOwnershipLayer
},
highres: {
view: SentinelLayer
},
sentinel_tiles: {
view: SentinelTilesLayer
view: RecentImageryLayer
},
guyra: {
view: GuyraLayer,
Expand Down
12 changes: 4 additions & 8 deletions app/assets/javascripts/map/models/LayerSpecModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,7 @@ define(['underscore', 'backbone'], function(_, Backbone) {
* @return {object} layers
*/
positionizer: function(layers) {
var layerOrder = _.intersection(
this.layerOrder,
_.pluck(layers, 'slug')
);
var layerOrder = _.intersection(this.layerOrder, _.pluck(layers, 'slug'));
_.each(
layerOrder,
_.bind(function(slug, i) {
Expand Down Expand Up @@ -293,10 +290,9 @@ define(['underscore', 'backbone'], function(_, Backbone) {
var category = this.get(categoryName);
if (category) {
categories.push(
_.sortBy(
this.positionizer(category),
function(layer){ return layer.position; }
).reverse()
_.sortBy(this.positionizer(category), function(layer) {
return layer.position;
}).reverse()
);
}
}, this)
Expand Down
113 changes: 113 additions & 0 deletions app/assets/javascripts/map/presenters/ReactMapMiddlePresenter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/* eslint-disable */
define(
[
'underscore',
'mps',
'map/presenters/PresenterClass',
'map/services/LayerSpecService'
],
function(_, mps, PresenterClass, layerSpecService) {
'use strict';

var StatusModel = Backbone.Model.extend({
defaults: {
layers: [],
recentImagery: null
}
});

var ReactMapMiddlePresenter = PresenterClass.extend({
init: function(view) {
this.view = view;
this.status = new StatusModel();
this._super();
mps.publish('Place/register', [this]);
},

_subscriptions: [
{
'Place/go': function(place) {
this.status.set('layerSpec', place.layerSpec);
this.status.set('recentImagery', place.params.recentImagery);
var isRecentImageryActivated = !!this.status
.get('layerSpec')
.getLayer({ slug: 'sentinel_tiles' });
if (
isRecentImageryActivated &&
!!this.status.get('recentImagery')
) {
this.view.fillParams(
JSON.parse(atob(place.params.recentImagery))
);
}
}
},
{
'LayerNav/change': function(layerSpec) {
this.status.set('layerSpec', layerSpec);
var isRecentImageryActivated = !!this.status
.get('layerSpec')
.getLayer({ slug: 'sentinel_tiles' });

if (isRecentImageryActivated) {
this.setRecentImagery(this.view.getParams());
}
}
},
{
'Layer/add': function(slug) {
if (slug === 'sentinel_tiles') {
window.dispatchEvent(new Event('isRecentImageryActivated'));
}
}
},
{
'ReactMap/zoom-go-back': function(slug) {
mps.publish('Map/set-zoom', [this.view.previousZoom]);
}
}
],

toggleLayer: function(layerSlug) {
var where = [{ slug: layerSlug }];
layerSpecService.toggle(
where,
_.bind(function(layerSpec) {
mps.publish('LayerNav/change', [layerSpec]);
mps.publish('Place/update', [{ go: false }]);
}, this)
);
},

updateLayer: function(name, params) {
this.setRecentImagery(this.view.getParams());
mps.publish('Layer/update', [name]);
},

setRecentImagery: function(value) {
if (!!value) {
value = btoa(JSON.stringify(value));
}

this.status.set('recentImagery', value);
this.publishRecentImagery();
},

publishRecentImagery: function() {
mps.publish('Place/update', [{ go: false }]);
},

getPlaceParams: function() {
return {
recentImagery: this.status.get('recentImagery')
};
},

notificate: function(id) {
mps.publish('Notification/open', [id]);
}
});

return ReactMapMiddlePresenter;
}
);

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,14 @@ define(
getRegions: function() {
var iso = this.status.get('iso');

CountryService.getRegionsList({ iso: iso.country })
.then(function(results) {
CountryService.getRegionsList({ iso: iso.country }).then(
function(results) {
this.status.set({
regions: results
});
this.view.render();
}.bind(this));
}.bind(this)
);
},

getSubRegions: function() {
Expand All @@ -109,12 +110,14 @@ define(
CountryService.getSubRegionsList({
iso: iso.country,
region: iso.region
}).then(function(results) {
this.status.set({
subRegions: results
});
this.view.render();
}.bind(this));
}).then(
function(results) {
this.status.set({
subRegions: results
});
this.view.render();
}.bind(this)
);
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,4 +435,4 @@ define(

return AnalysisResultsPresenter;
}
);
);
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ define(

return BiodiversityCompletenessLayerPresenter;
}
);
);
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ define(

return BiodiversityIntactnessLayerPresenter;
}
);
);
Original file line number Diff line number Diff line change
Expand Up @@ -936,4 +936,4 @@ define(

return AnalysisNewPresenter;
}
);
);
Loading