diff --git a/imports/ui/components/Maps/FireIconMark.js b/imports/ui/components/Maps/FireIconMark.js index 7199aa4..94d93a0 100644 --- a/imports/ui/components/Maps/FireIconMark.js +++ b/imports/ui/components/Maps/FireIconMark.js @@ -38,6 +38,7 @@ class FireIconMark extends Component { history, falsePositives, industries, + neighbour, when, t } = this.props; @@ -81,6 +82,7 @@ FireIconMark.propTypes = { nasa: PropTypes.bool, falsePositives: PropTypes.bool.isRequired, industries: PropTypes.bool.isRequired, + neighbour: PropTypes.bool.isRequired, id: PropTypes.object.isRequired, history: PropTypes.object.isRequired, when: PropTypes.instanceOf(Date), diff --git a/imports/ui/components/Maps/FireList.js b/imports/ui/components/Maps/FireList.js index a5979d7..da88cf9 100644 --- a/imports/ui/components/Maps/FireList.js +++ b/imports/ui/components/Maps/FireList.js @@ -9,14 +9,14 @@ import FirePixel from '/imports/ui/components/Maps/FirePixel'; export default function FireList(props) { const { - fires, scale, useMarkers, nasa, t, history, falsePositives, industries + fires, scale, useMarkers, nasa, t, history, falsePositives, industries, neighbour } = props; const useMarks = useMarkers && scale; const usePixel = !nasa || !scale; /* console.log(`Using marks: ${useMarks}, using pixels: ${usePixel}`); */ let items; if (useMarks) { - items = fires.map(({ _id, ...otherProps }) => ()); + items = fires.map(({ _id, ...otherProps }) => ()); } else if (usePixel && !falsePositives && !industries) { items = fires.map(({ _id, ...otherProps }) => ()); } else if (!falsePositives && !industries) { @@ -32,6 +32,7 @@ FireList.propTypes = { nasa: PropTypes.bool.isRequired, falsePositives: PropTypes.bool.isRequired, industries: PropTypes.bool.isRequired, + neighbour: PropTypes.bool.isRequired, history: PropTypes.object.isRequired, t: PropTypes.func.isRequired }; diff --git a/imports/ui/pages/Fires/Fires.js b/imports/ui/pages/Fires/Fires.js index e5bf45f..f871c0c 100644 --- a/imports/ui/pages/Fires/Fires.js +++ b/imports/ui/pages/Fires/Fires.js @@ -124,6 +124,7 @@ class Fire extends React.Component { useMarkers nasa={false} falsePositives + neighbour={false} industries={false} /> diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index 0d7f4ae..73bff87 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -301,6 +301,7 @@ class FiresMap extends React.Component { useMarkers={this.state.useMarkers} nasa={false} falsePositives + neighbour={false} industries={false} /> = MAXZOOM} useMarkers={this.state.useMarkers} nasa={false} + neighbour={false} falsePositives={false} industries /> @@ -320,6 +322,7 @@ class FiresMap extends React.Component { scale={this.state.viewport.zoom >= MAXZOOM} useMarkers={this.state.useMarkers} nasa + neighbour={false} falsePositives={false} industries={false} /> @@ -327,9 +330,10 @@ class FiresMap extends React.Component { t={t} history={this.props.history} fires={this.props.firealerts} - scale={false} + scale={this.state.viewport.zoom >= MAXZOOM} useMarkers={this.state.useMarkers} nasa={false} + neighbour falsePositives={false} industries={false} />