vjrj
bc778bfd97
Ground-up hooks rewrite of the app's core map. Removes the final batch of
React-19-blocking warnings (legacy context on Map/LayersControl/TileLayer/
Marker/CircleMarker/Circle/Tooltip + ReactDOM.render from the old controls).
Core: <Map> -> <MapContainer>; .leafletElement refs (6 files) -> the map/
layer instances directly, via a <MapReady> child (useMap) + plain refs on
Marker/Circle/GeoJSON; controlled viewport (onViewportChanged + state.center/
zoom) -> <MapEvents> (useMapEvents moveend/zoomend) + imperative setView;
onClick -> eventHandlers={{click}}; Path styling -> pathOptions/style;
subsUnion takes the L.Map directly.
The 4 v1-only plugins reimplemented (new in-repo helpers under Maps/):
- react-leaflet-control -> MapControl (L.Control + createPortal)
- react-leaflet-google -> GoogleMutantLayer (createLayerComponent +
leaflet.gridlayer.googlemutant; Google Maps API already loaded by Gkeys)
- react-leaflet-fullscreen -> createControlComponent + leaflet.fullscreen
- leaflet-sleep / leaflet-graphicscale kept as vanilla (work on leaflet 1.9)
Browser-verified: /fires (tiles, OSM+Google layer switch, custom control,
fullscreen, graphic scale, pan/zoom -> re-fetch, no NaN), fire detail
(GeoJSON rect + fitBounds), home (3 maps coexist; SelectionMap draggable
marker -> updatePosition + distance circle). Console now shows 0 React
warnings on home/fires. REST smoke byte-identical.
54 lines
1.5 KiB
JavaScript
54 lines
1.5 KiB
JavaScript
import React, { Component } from 'react';
|
|
import { GeoJSON } from 'react-leaflet';
|
|
import PropTypes from 'prop-types';
|
|
import { rectangleAround } from 'map-common-utils';
|
|
import { onMarkClick } from './MarkListeners';
|
|
import FirePopup from './FirePopup';
|
|
|
|
class FireCircleMark extends Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.t = props.t;
|
|
this.onClick = this.onClick.bind(this);
|
|
}
|
|
|
|
onClick() {
|
|
const { history, nasa, id } = this.props;
|
|
onMarkClick(history, nasa, id);
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
lat,
|
|
lon,
|
|
scan,
|
|
track,
|
|
nasa,
|
|
id,
|
|
history,
|
|
when,
|
|
t
|
|
} = this.props;
|
|
const rect = rectangleAround({ lat, lon }, track, track);
|
|
return (
|
|
<GeoJSON data={rect} style={{ color: 'red', stroke: true, weight: 1, opacity: 0.4, fillOpacity: 1 }}>
|
|
<FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
|
|
</GeoJSON>
|
|
);
|
|
/* <Circle center={[lat, lon]} color="red" stroke={false} fillOpacity="1" fill radius={scan * 500} onClick={this.onClick}> */
|
|
}
|
|
}
|
|
|
|
FireCircleMark.propTypes = {
|
|
scan: PropTypes.number.isRequired,
|
|
track: PropTypes.number.isRequired,
|
|
lat: PropTypes.number.isRequired,
|
|
lon: PropTypes.number.isRequired,
|
|
nasa: PropTypes.bool.isRequired,
|
|
id: PropTypes.object.isRequired,
|
|
history: PropTypes.object.isRequired,
|
|
when: PropTypes.instanceOf(Date).isRequired,
|
|
t: PropTypes.func.isRequired
|
|
};
|
|
|
|
export default FireCircleMark;
|