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.
88 lines
2.7 KiB
JavaScript
88 lines
2.7 KiB
JavaScript
/* eslint-disable react/jsx-indent-props */
|
|
/* eslint-disable import/no-absolute-path */
|
|
/* eslint-disable import/no-absolute-path */
|
|
|
|
import React, { Component } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { withTranslation } from 'react-i18next';
|
|
import GoogleMutantLayer from '/imports/ui/components/Maps/GoogleMutantLayer';
|
|
import Gkeys from '/imports/startup/client/Gkeys';
|
|
import { TileLayer, LayersControl } from 'react-leaflet';
|
|
|
|
const { BaseLayer } = LayersControl;
|
|
|
|
const defOpacity = 0.7;
|
|
|
|
class DefMapLayers extends Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.state = {
|
|
gkey: null
|
|
};
|
|
}
|
|
|
|
componentDidMount() {
|
|
const self = this;
|
|
Gkeys.load((err, key) => {
|
|
self.setState({ gkey: key });
|
|
});
|
|
}
|
|
|
|
render() {
|
|
const { t } = this.props;
|
|
const osmgraylayer = (
|
|
<BaseLayer checked={this.props.gray} name={t('Mapa gris de OpenStreetMap')}>
|
|
<TileLayer
|
|
opacity={defOpacity}
|
|
attribution="© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors"
|
|
// url="https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png"
|
|
url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png"
|
|
/>
|
|
</BaseLayer>);
|
|
const osmlayer = (
|
|
<BaseLayer checked={this.props.osmcolor} name={t('Mapa color de OpenStreetMap')}>
|
|
<TileLayer
|
|
opacity={defOpacity}
|
|
attribution="&copy <a href="http://osm.org/copyright">OpenStreetMap</a> contributors"
|
|
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
|
|
/>
|
|
</BaseLayer>);
|
|
return (
|
|
<LayersControl position="topleft">
|
|
{osmlayer}
|
|
{osmgraylayer}
|
|
{/* React.Fragment does not work here */}
|
|
{ this.state.gkey &&
|
|
<BaseLayer name={t('Mapa de carreteras de Google')}>
|
|
<GoogleMutantLayer opacity={defOpacity} maptype="ROADMAP" />
|
|
</BaseLayer> }
|
|
{ this.state.gkey &&
|
|
<BaseLayer name={t('Mapa de terreno de Google')} checked={this.props.terrain}>
|
|
<GoogleMutantLayer opacity={defOpacity} maptype="TERRAIN" />
|
|
</BaseLayer> }
|
|
{ this.state.gkey &&
|
|
<BaseLayer name={t('Mapa de satélite de Google')} checked={this.props.satellite}>
|
|
<GoogleMutantLayer opacity={defOpacity} maptype="SATELLITE" />
|
|
</BaseLayer> }
|
|
</LayersControl>
|
|
);
|
|
}
|
|
}
|
|
|
|
DefMapLayers.propTypes = {
|
|
t: PropTypes.func.isRequired,
|
|
gray: PropTypes.bool,
|
|
osmcolor: PropTypes.bool,
|
|
terrain: PropTypes.bool,
|
|
satellite: PropTypes.bool
|
|
|
|
};
|
|
|
|
DefMapLayers.defaultProps = {
|
|
gray: false,
|
|
osmcolor: false,
|
|
terrain: false,
|
|
satellite: false
|
|
};
|
|
|
|
export default withTranslation()(DefMapLayers);
|