diff --git a/src/constants/mapExplorer.config.json b/src/constants/mapExplorer.config.json index 267e951..1b0d7a1 100644 --- a/src/constants/mapExplorer.config.json +++ b/src/constants/mapExplorer.config.json @@ -18,12 +18,12 @@ "baseLayers": [ { "name": "Terrain", - "url": "http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png", + "url": "//{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png", "attribution": "© OpenCycleMap, © OpenStreetMap" }, { "name": "Satellite", - "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + "url": "//server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", "attribution": "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community" } ], diff --git a/src/containers/MapExplorer-SelectorPanel.jsx b/src/containers/MapExplorer-SelectorPanel.jsx index 82a0e48..a3d766c 100644 --- a/src/containers/MapExplorer-SelectorPanel.jsx +++ b/src/containers/MapExplorer-SelectorPanel.jsx @@ -285,7 +285,7 @@ export default class SelectorPanel extends React.Component { this.setState({ downloadDialog: { status: DialogScreen.DIALOG_ACTOVE, - message: 'Preparing CSV file...', + message: 'Preparing data file...', data: null }}); @@ -323,7 +323,7 @@ export default class SelectorPanel extends React.Component { this.setState({ downloadDialog: { status: DialogScreen.DIALOG_ACTIVE, - message: 'CSV ready!', + message: 'Data file ready!', data: data }}); }) diff --git a/src/presentational/DialogScreen-Download.jsx b/src/presentational/DialogScreen-Download.jsx index 1d2a21b..7f41d9a 100644 --- a/src/presentational/DialogScreen-Download.jsx +++ b/src/presentational/DialogScreen-Download.jsx @@ -6,6 +6,8 @@ export default class DialogScreen_DownloadCSV extends DialogScreen { constructor(props) { super(props); this.downloadCsv = this.downloadCsv.bind(this); + this.blobbifyCsvData = this.blobbifyCsvData.bind(this); + this.generateFilename = this.generateFilename.bind(this); } render() { @@ -19,7 +21,11 @@ export default class DialogScreen_DownloadCSV extends DialogScreen { : null} {(this.props.data) - ?
+ ? + : null} + + {(this.props.data) + ?