Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

cleanup mapUI and remove unused file

Jason Kentbd50d617bca5
diff --git a/web/js/map/precachetile.js b/web/js/map/precachetile.js
deleted file mode 100644
index f4c7b00eb..000000000
--- a/web/js/map/precachetile.js
+++ /dev/null
@@ -1,201 +0,0 @@
-import lodashEach from 'lodash/each';
-import * as olExtent from 'ol/extent';
-import OlRendererCanvasTileLayer from 'ol/renderer/canvas/TileLayer';
-
-export default function mapPrecacheTile(models, config, cache, parent) {
- /**
- * Loads the layers that are needed for any one date.
- * Checks the cache to see if a layer has already been added to cache.
- *
- * @method promiseDay
- * @param {object} date Date of data to be displayed on the map.
- * @return {object} Promise.all
- */
- /* eslint-disable no-restricted-globals */
- self.promiseDay = function(date) {
- const layers = getActiveLayersWithData(date);
- const map = parent.selected;
- const frameState = parent.selected.frameState_; // OL object describing the current map frame
- const { pixelRatio } = frameState;
- const { viewState } = frameState;
- const promiseArray = layers.map((def) => {
- let layer;
- const key = parent.layerKey(def, {
- date,
- });
- layer = cache.getItem(key);
- if (layer) {
- cache.removeItem(key);
- }
- layer = parent.createLayer(def, {
- date,
- precache: true,
- });
- return promiseLayerGroup(layer, viewState, pixelRatio, map);
- });
- return new Promise((resolve) => {
- Promise.all(promiseArray).then(() => {
- resolve(date);
- });
- });
- };
-
- /**
- * Checks the date provided against the active layers.
- *
- * @method getActiveLayersWithData
- * @param {object} date Date of data to be displayed on the map.
- * @return {array} An array of visible layers within the date.
- */
- const getActiveLayersWithData = function(date) {
- const arra = [];
- const layers = models.layers.get();
- lodashEach(layers, (layer) => {
- if (layer.visible && new Date(layer.startDate > date)) {
- arra.push(layer);
- }
- });
- return arra;
- };
-
- /**
- * Calculate the current extent from the map's extent (boundaries) &
- * the viewport extent (boundaries).
- *
- * @method calculateExtent
- * @param {array} extent The map extent (boundaries)
- * @param {array} viewportExtent The current viewport extecnt (boundaries)
- * @return {array} An extent array. Used to calculate
- * the extent for prev, next & current day
- */
- const calculateExtent = function(extent, viewportExtent) {
- if (extent[1] < -180) {
- // Previous day
- extent = getExtent(viewportExtent, extent);
- extent[1] += 360;
- extent[3] += 360;
- } else if (extent[1] > 180) {
- // Next day
- extent = getExtent(viewportExtent, extent);
- extent[1] -= 360;
- extent[3] -= 360;
- } else {
- // Current day (within map extent)
- extent = getExtent(extent, viewportExtent);
- }
- if (!Number.isFinite(extent[0])) {
- return null;
- }
- return extent;
- };
-
- /**
- * Get the intersection of two extents.
- *
- * @method getExtent
- * @param {array} extent1 Extent 1.
- * @param {array} extent2 Extent 2.
- * @return {array} A new extent with intersecting points
- */
- const getExtent = function(extent1, extent2) {
- return olExtent.getIntersection(extent1, extent2);
- };
-
- /**
- * Once a layer's group of layers (prev, current, next day) are fulfilled,
- * a promise with an array of their fulfilled values is returned.
- *
- * @method promiseLayerGroup
- * @param {object} layer ol_Layer_Group object, contains values.layers for prev, current, next days
- * @param {object} viewState Contains center, projection, resolution, rotation and zoom parameters
- * @param {number} pixelRatio The window.devicePixelRatio, used to detect retina displays
- * @param {object} map _ol_Map_ object
- * @return {object} Promise.all
- */
- const promiseLayerGroup = function(layer, viewState, pixelRatio, map) {
- let extent;
- return new Promise((resolve, reject) => {
- let layers;
- // Current layer's 3 layer array (prev, current, next days)
- layers = layer.values_.layers;
- if (layer.values_.layers) {
- layers = layer.getLayers().getArray();
- } else {
- layers = [layer];
- }
- // Calculate the extent of each layer in the layer group
- // and create a promiseTileLayer for prev, current, next day
- const layerPromiseArray = layers.map((layer) => {
- extent = calculateExtent(
- layer.getExtent(),
- map.getView().calculateExtent(map.getSize()),
- );
- return promiseTileLayer(layer, extent, viewState, pixelRatio);
- });
- Promise.all(layerPromiseArray).then((yo) => {
- resolve('resolve layer group');
- });
- });
- };
-
- /**
- * Returns a promise of the layer tilegrid.
- *
- * @method promiseTileLayer
- * @param {object} layer _ol_layer_Tile_
- * @param {array} extent An array of map boundaries [180, -90, 250, 90]
- * @param {object} viewState Contains center, projection, resolution, rotation and zoom parameters
- * @param {number} pixelRatio The window.devicePixelRatio, used to detect retina displays
- * @return {object} promise
- */
- const promiseTileLayer = function(layer, extent, viewState, pixelRatio) {
- let renderer; let tileSource; let currentZ; let i; let tileGrid; let
- projection;
- return new Promise((resolve, reject) => {
- if (!extent) {
- resolve('resolve tile layer');
- }
- projection = viewState.projection;
- i = 0;
- if (layer.type === 'VECTOR_TILE') {
- // No need to look up tiles, vectors can resolve ASAP
- resolve();
- } else {
- renderer = new OlRendererCanvasTileLayer(layer);
- tileSource = layer.getSource();
- tileGrid = tileSource.getTileGridForProjection(projection);
- currentZ = tileGrid.getZForResolution(
- viewState.resolution,
- renderer.zDirection,
- );
- tileGrid.forEachTileCoord(extent, currentZ, (tileCoord) => {
- const tile = tileSource.getTile(
- tileCoord[0],
- tileCoord[1],
- tileCoord[2],
- pixelRatio,
- projection,
- );
- tile.load();
- const loader = function(e) {
- if (e.type === 'tileloadend') {
- i -= 1;
- if (i === 0) {
- resolve();
- }
- } else {
- reject(new Error('No response at this URL'));
- // resolve();// some gibs data is not accurate and rejecting this will break the animation if tile doesn't exist
- }
- this.un('tileloadend', loader); // remove event listeners from memory
- this.un('tileloaderror', loader);
- };
- tileSource.on('tileloadend', loader);
- tileSource.on('tileloaderror', loader);
- i += 1;
- });
- }
- });
- };
- return self;
-}
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index 064f4920e..0a3d652b5 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -29,7 +29,6 @@ import Cache from 'cachai';
import mapDateLineBuilder from './datelinebuilder';
import mapLayerBuilder from './layerbuilder';
import MapRunningData from './runningdata';
-import mapPrecacheTile from './precachetile';
import { getActiveLayerGroup, saveRotation } from './util';
import mapCompare from './compare/compare';
import { LOCATION_POP_ACTION } from '../redux-location-state-customs';
@@ -73,35 +72,28 @@ const { events } = util;
export default function mapui(models, config, store, ui) {
const animationDuration = 250;
- const self = {};
- let cache;
const dateline = mapDateLineBuilder(store);
- const precache = mapPrecacheTile(models, config, cache, self);
const compareMapUi = mapCompare(store);
- const dataRunner = self.runningdata = new MapRunningData(
- models,
- compareMapUi,
- store,
- );
+ const runningdata = new MapRunningData(models, compareMapUi, store);
const doubleClickZoom = new OlInteractionDoubleClickZoom({
duration: animationDuration,
});
- cache = self.cache = new Cache(400);
- self.mapIsbeingDragged = false;
- self.mapIsbeingZoomed = false;
- self.proj = {}; // One map for each projection
- self.selected = null; // The map for the selected projection
- const layerBuilder = self.layerBuilder = mapLayerBuilder(
- config,
+ const cache = new Cache(400);
+ const { createLayer, layerKey } = mapLayerBuilder(config, cache, store);
+ const self = {
cache,
- store,
- );
- self.layerKey = layerBuilder.layerKey;
- const createLayer = self.createLayer = layerBuilder.createLayer;
- self.promiseDay = precache.promiseDay;
- self.selectedVectors = {};
- self.activeMarker = null;
- self.coordinatesDialogDOMEl = null;
+ mapIsbeingDragged: false,
+ mapIsbeingZoomed: false,
+ proj: {}, // One map for each projection
+ selected: null, // The map for the selected projection
+ selectedVectors: {},
+ activeMarker: null,
+ coordinatesDialogDOMEl: null,
+ runningdata,
+ layerKey,
+ createLayer,
+ };
+
/**
* Subscribe to redux store and listen for
* specific action types
@@ -1195,13 +1187,13 @@ export default function mapui(models, config, store, ui) {
const isMapAnimating = state.animation.isPlaying;
if (isEventsTabActive || isMapAnimating || sidebar.activeTab === 'download') return;
- dataRunner.newPoint(pixels, map);
+ runningdata.newPoint(pixels, map);
}, 300);
events.on('map:mousemove', throttledOnMouseMove);
events.on('map:mouseout', (e) => {
throttledOnMouseMove.cancel();
- dataRunner.clearAll();
+ runningdata.clearAll();
});
}