Interactive interface for browsing global, full-resolution satellite imagery
Basic crossfade prototype
Jason Kent253b2bb9d399
diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.jsindex d243061be..490cf7c7e 100644--- a/web/js/map/layerbuilder.js+++ b/web/js/map/layerbuilder.js@@ -80,6 +80,29 @@ export default function mapLayerBuilder(config, cache, store) {};};+ const getGraticule = (proj) => new OlGraticule({+ lonLabelStyle: new OlText({+ font: '12px Calibri,sans-serif',+ textBaseline: 'top',+ fill: new OlFill({+ color: 'rgba(0,0,0,1)',+ }),+ stroke: new OlStroke({+ color: 'rgba(255,255,255,1)',+ width: 3,+ }),+ }),+ // the style to use for the lines, optional.+ strokeStyle: new OlStroke({+ color: 'rgb(255, 255, 255)',+ width: 2,+ lineDash: [0.5, 4],+ }),+ extent: proj.maxExtent,+ lonLabelPosition: 1,+ showLabels: true,+ });+/*** Create a new OpenLayers Layer*@@ -89,18 +112,17 @@ export default function mapLayerBuilder(config, cache, store) {* @param {object} options - Layer options* @returns {object} OpenLayers layer*/- self.createLayer = function(def, options) {+ self.createLayer = function(def, options = {}) {const state = store.getState();const { sidebar: { activeTab } } = state;- options = options || {};- const group = options.group || null;- const { closestDate, nextDate, previousDate } = self.getRequestDates(def, options);+ const { group } = options;+ const { closestDate, nextDate, previousDate } = getRequestDates(def, options);let date = closestDate;if (date) {options.date = date;}- const key = self.layerKey(def, options, state);const proj = state.proj.selected;+ const key = self.layerKey(def, options, state);let layer = cache.getItem(key);if (!layer) {@@ -122,7 +144,8 @@ export default function mapLayerBuilder(config, cache, store) {if (def.breakPointLayer) def = mergeBreakpointLayerAttributes(def, proj.id);const isDataDownloadTabActive = activeTab === 'download';- const wrapLayer = proj.id === 'geographic' && !isDataDownloadTabActive && (def.wrapadjacentdays === true || def.wrapX);+ const wrapDefined = def.wrapadjacentdays === true || def.wrapX;+ const wrapLayer = proj.id === 'geographic' && !isDataDownloadTabActive && wrapDefined;switch (def.type) {case 'wmts':layer = getLayer(createLayerWMTS, def, options, attributes, wrapLayer);@@ -134,28 +157,7 @@ export default function mapLayerBuilder(config, cache, store) {layer = getLayer(createLayerWMS, def, options, attributes, wrapLayer);break;case 'graticule':- layer = new OlGraticule({- lonLabelStyle: new OlText({- font: '12px Calibri,sans-serif',- textBaseline: 'top',- fill: new OlFill({- color: 'rgba(0,0,0,1)',- }),- stroke: new OlStroke({- color: 'rgba(255,255,255,1)',- width: 3,- }),- }),- // the style to use for the lines, optional.- strokeStyle: new OlStroke({- color: 'rgb(255, 255, 255)',- width: 2,- lineDash: [0.5, 4],- }),- extent: proj.maxExtent,- lonLabelPosition: 1,- showLabels: true,- });+ layer = getGraticule(proj);break;default:throw new Error(`Unknown layer type: ${def.type}`);@@ -165,6 +167,7 @@ export default function mapLayerBuilder(config, cache, store) {layer.setVisible(false);}layer.setOpacity(def.opacity || 1.0);+return layer;};@@ -175,7 +178,7 @@ export default function mapLayerBuilder(config, cache, store) {* @param {object} options Layer options* @return {object} Closest date*/- self.getRequestDates = function(def, options) {+ const getRequestDates = function(def, options) {const state = store.getState();const { date } = state;const { appNow } = date;@@ -355,7 +358,7 @@ export default function mapLayerBuilder(config, cache, store) {}let date = options.date || getSelectedDate(state);if (isSubdaily && !date) {- date = self.getRequestDates(def, options).closestDate;+ date = getRequestDates(def, options).closestDate;date = new Date(date.getTime());}if (day && def.wrapadjacentdays && !isSubdaily) {diff --git a/web/js/map/ui.js b/web/js/map/ui.jsindex 6ba46475f..2a87deeaf 100644--- a/web/js/map/ui.js+++ b/web/js/map/ui.js@@ -90,6 +90,7 @@ export default function mapui(models, config, store, ui) {runningdata,layerKey,createLayer,+ layersToFade: [],};/**@@ -147,13 +148,6 @@ export default function mapui(models, config, store, ui) {case layerConstants.REMOVE_GROUP:case layerConstants.REMOVE_LAYER:return removeLayer(action.layersToRemove);- case layerConstants.TOGGLE_LAYER_VISIBILITY:- case layerConstants.TOGGLE_OVERLAY_GROUP_VISIBILITY: {- updateLayerVisibilities();- updateDate().then(preloadNextTiles);- return;- }-case layerConstants.UPDATE_OPACITY:return updateOpacity(action);case compareConstants.CHANGE_STATE:@@ -176,7 +170,7 @@ export default function mapui(models, config, store, ui) {case paletteConstants.SET_CUSTOM:case paletteConstants.SET_DISABLED_CLASSIFICATION:case paletteConstants.CLEAR_CUSTOM:- return updateLookup();+ return reloadLayers();case vectorStyleConstants.SET_FILTER_RANGE:case vectorStyleConstants.SET_VECTORSTYLE:case vectorStyleConstants.CLEAR_VECTORSTYLE:@@ -199,8 +193,10 @@ export default function mapui(models, config, store, ui) {case dateConstants.CHANGE_CUSTOM_INTERVAL:case dateConstants.CHANGE_INTERVAL:return preloadNextTiles();- case dateConstants.SELECT_DATE: {- layerQueue.add(updateDate).then(preloadNextTiles);+ case dateConstants.SELECT_DATE:+ case layerConstants.TOGGLE_LAYER_VISIBILITY:+ case layerConstants.TOGGLE_OVERLAY_GROUP_VISIBILITY: {+ updateDate();break;}case dateConstants.ARROW_DOWN:@@ -218,19 +214,12 @@ export default function mapui(models, config, store, ui) {}};- /*- * Sets up map listeners- *- * @method init- * @static- *- * @returns {void}- */const init = function() {// NOTE: iOS sometimes bombs if this is _.each instead. In that case,// it is possible that config.projections somehow becomes array-like.lodashForOwn(config.projections, (proj) => {const map = createMap(proj);+ // map.getLayers().on('add', onLayerAdd);self.proj[proj.id] = map;});events.on('map:disable-click-zoom', () => {@@ -243,7 +232,6 @@ export default function mapui(models, config, store, ui) {});events.on('redux:action-dispatched', subscribeToStore);events.on('map:reload-layers', reloadLayers);- events.on('map:update-date', updateDate);updateProjection(true);};@@ -576,9 +564,9 @@ export default function mapui(models, config, store, ui) {let renderable;const state = store.getState();const layers = self.selected.getLayers();+layers.forEach((layer) => {const compareActiveString = layer.get('group');-// Not in A|Bif (layer.wv) {renderable = isRenderableLayer(@@ -590,7 +578,7 @@ export default function mapui(models, config, store, ui) {);layer.setVisible(renderable);- // If in A|B layer-group will have a 'group' string+ // If in A|B layer-group will have a 'group' string} else if (compareActiveString) {lodashEach(layer.getLayers().getArray(), (subLayer) => {if (!subLayer.wv) {@@ -691,88 +679,81 @@ export default function mapui(models, config, store, ui) {updateLayerVisibilities();}- /*- * Update layers for the correct Date- *- * @method updateDate- * @static- *- *- * @returns {void}- */- const updateDate = self.updateDate = async function() {- return new Promise((resolve) => {- const state = store.getState();- const { compare } = state;- const activeLayers = getAllActiveLayers(state);- let layerGroups;- let layerGroup;-- if (compare && compare.active) {- layerGroups = self.selected.getLayers().getArray();- if (layerGroups.length > 1) {- layerGroup = layerGroups[0].get('group') === compare.activeString- ? layerGroups[0]- : layerGroups[1].get('group') === compare.activeString- ? layerGroups[1]- : null;+ function updateVectorStyles (def) {+ const state = store.getState();+ const activeLayers = getActiveLayers(state);+ const { vectorStyles } = config;+ const layerName = def.layer || def.id;+ let vectorStyleId;++ vectorStyleId = def.vectorStyle.id;+ if (activeLayers) {+ activeLayers.forEach((layer) => {+ if (layer.id === layerName && layer.custom) {+ vectorStyleId = layer.custom;}- }-- const group = compare && compare.active ? layerGroup : self.selected;- const layers = group.getLayers().getArray();- const visibleLayers = activeLayers.filter(- ({ id }) => layers- .map(({ wv }) => lodashGet(wv, 'def.id'))- .includes(id),- ).filter(({ visible }) => visible);-- lodashEach(visibleLayers, (def) => {- const layerName = def.layer || def.id;+ });+ }+ setStyleFunction(def, vectorStyleId, vectorStyles, null, state);+ }- if (!['subdaily', 'daily', 'monthly', 'yearly'].includes(def.period)) {- return;- }+ function getLayerGroup (state) {+ const { compare } = state;+ const { active, activeString } = compare || {};+ if (active) {+ const layerGroups = self.selected.getLayers().getArray();+ if (layerGroups.length > 1) {+ return layerGroups[0].get('group') === activeString+ ? layerGroups[0]+ : layerGroups[1].get('group') === activeString+ ? layerGroups[1]+ : null;+ }+ }+ return self.selected;+ }- if (compare && compare.active) {- if (layers.length) {- const index = findLayerIndex(def, layerGroup);- const layerValue = self.selected.getLayers().getArray()[index];- layerGroup.getLayers().setAt(- index,- createLayer(def, {- group: compare.activeString,- date: getSelectedDate(state),- previousLayer: layerValue ? layerValue.wv : null,- }),- );- compareMapUi.update(compare.activeString);- }- } else {- const index = findLayerIndex(def);- const layer = createLayer(def, { previousLayer: layers[index] ? layers[index].wv : null });- self.selected.getLayers().setAt(index, layer);- }+ function updateCompareLayer (def, index, layerCollection) {+ const state = store.getState();+ const { compare } = state;+ const updatedLayer = createLayer(def, {+ group: compare.activeString,+ date: getSelectedDate(state),+ });+ layerCollection.setAt(index, updatedLayer);+ compareMapUi.update(compare.activeString);+ }- if (config.vectorStyles && def.vectorStyle && def.vectorStyle.id) {- const { vectorStyles } = config;- let vectorStyleId;-- vectorStyleId = def.vectorStyle.id;- if (getActiveLayers(state)) {- getActiveLayers(state).forEach((layer) => {- if (layer.id === layerName && layer.custom) {- vectorStyleId = layer.custom;- }- });- }- setStyleFunction(def, vectorStyleId, vectorStyles, null, state);- }- });- updateLayerVisibilities();- resolve();+ function updateDate() {+ const state = store.getState();+ const { compare = {} } = state;+ const layerGroup = getLayerGroup(state);+ const mapLayerCollection = layerGroup.getLayers();+ const layers = mapLayerCollection.getArray();+ const activeLayers = getAllActiveLayers(state);+ const visibleLayers = activeLayers.filter(+ ({ id }) => layers+ .map(({ wv }) => lodashGet(wv, 'def.id'))+ .includes(id),+ ).filter(({ visible }) => visible);++ visibleLayers.forEach((def) => {+ const index = findLayerIndex(def);+ if (!['subdaily', 'daily', 'monthly', 'yearly'].includes(def.period)) {+ return;+ }+ if (compare.active && layers.length) {+ updateCompareLayer(def, index, mapLayerCollection);+ } else {+ mapLayerCollection.setAt(index, createLayer(def));+ }+ if (config.vectorStyles && lodashGet(def, 'vectorStyle.id')) {+ updateVectorStyles(def);+ }});- };+ updateLayerVisibilities();+ layerQueue.add(preloadNextTiles);+ }/*** Preload tiles for the next and previous time interval so they are visible@@ -803,17 +784,15 @@ export default function mapui(models, config, store, ui) {lastPreloadDate: subsequentDate,});await promiseImageryForTime(state, subsequentDate, useActiveString);- self.selected.getView().changed();return;}await promiseImageryForTime(state, nextDate, useActiveString);await promiseImageryForTime(state, prevDate, useActiveString);- self.selected.getView().changed();if (!date && !arrowDown) {- preloadNextTiles(nextDate, useActiveString);- preloadNextTiles(prevDate, useActiveString);+ layerQueue.add(() => preloadNextTiles(nextDate, useActiveString));+ layerQueue.add(() => preloadNextTiles(prevDate, useActiveString));}}@@ -857,21 +836,6 @@ export default function mapui(models, config, store, ui) {});}- /*- * Update layers for the correct Date- *- * @method updateLookup- * @static- *- *- * @returns {void}- *- * @todo Check if this function can be combined with updateLayerOrder- */- function updateLookup(layerId) {- reloadLayers();- }-/** Get a layer object from id*@@ -910,17 +874,14 @@ export default function mapui(models, config, store, ui) {/** Return an Index value for a layer in the OPenLayers layer array- ** @method findLayerIndex- * @static- ** @param {object} def - Layer Specs- *- *+* @returns {number} Index of layer in OpenLayers layer array*/- function findLayerIndex(def, layerGroup) {- layerGroup = layerGroup || self.selected;+ function findLayerIndex(def) {+ const state = store.getState();+ const layerGroup = getLayerGroup(state);const layers = layerGroup.getLayers().getArray();const index = lodashFindIndex(layers, {@@ -1136,9 +1097,5 @@ export default function mapui(models, config, store, ui) {}init();- return {- ...self,- updateDate,- reloadLayers,- };+ return self;}diff --git a/web/js/modules/map/util.js b/web/js/modules/map/util.jsindex 5786a2f4c..ec3c3bc40 100644--- a/web/js/modules/map/util.js+++ b/web/js/modules/map/util.js@@ -193,9 +193,10 @@ function promiseTileLayer(layer, extent, map) {let i;let tileGrid;- return new Promise((resolve) => {+ return new Promise((resolve, reject) => {if (!extent) {resolve('resolve tile layer');+ return;}// OL object describing the current map frameconst { pixelRatio, viewState } = map.frameState_;@@ -291,6 +292,6 @@ export async function promiseImageryForTime(state, date, activeString) {const layerGroup = cache.getItem(key) || createLayer(layer, options);return promiseLayerGroup(layerGroup, selected);}));-+ selected.getView().changed();return date;}