deps: react-leaflet 1.8 -> 4.2 (+ leaflet 1.9) — the last legacy react-* lib
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.
This commit is contained in:
parent
e61a3a9bcb
commit
bc778bfd97
18 changed files with 276 additions and 220 deletions
|
|
@ -5,7 +5,7 @@
|
|||
import React, { Component } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import { GoogleLayer } from 'react-leaflet-google/lib/';
|
||||
import GoogleMutantLayer from '/imports/ui/components/Maps/GoogleMutantLayer';
|
||||
import Gkeys from '/imports/startup/client/Gkeys';
|
||||
import { TileLayer, LayersControl } from 'react-leaflet';
|
||||
|
||||
|
|
@ -54,15 +54,15 @@ class DefMapLayers extends Component {
|
|||
{/* React.Fragment does not work here */}
|
||||
{ this.state.gkey &&
|
||||
<BaseLayer name={t('Mapa de carreteras de Google')}>
|
||||
<GoogleLayer opacity={defOpacity} googlekey={this.state.gkey} maptype="ROADMAP" />
|
||||
<GoogleMutantLayer opacity={defOpacity} maptype="ROADMAP" />
|
||||
</BaseLayer> }
|
||||
{ this.state.gkey &&
|
||||
<BaseLayer name={t('Mapa de terreno de Google')} checked={this.props.terrain}>
|
||||
<GoogleLayer opacity={defOpacity} googlekey={this.state.gkey} maptype="TERRAIN" />
|
||||
<GoogleMutantLayer opacity={defOpacity} maptype="TERRAIN" />
|
||||
</BaseLayer> }
|
||||
{ this.state.gkey &&
|
||||
<BaseLayer name={t('Mapa de satélite de Google')} checked={this.props.satellite}>
|
||||
<GoogleLayer opacity={defOpacity} googlekey={this.state.gkey} maptype="SATELLITE" />
|
||||
<GoogleMutantLayer opacity={defOpacity} maptype="SATELLITE" />
|
||||
</BaseLayer> }
|
||||
</LayersControl>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class FireCircleMark extends Component {
|
|||
} = this.props;
|
||||
const rect = rectangleAround({ lat, lon }, track, track);
|
||||
return (
|
||||
<GeoJSON data={rect} color="red" stroke width="1" opacity=".4" fillOpacity="1">
|
||||
<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>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ class FireIconMark extends Component {
|
|||
lat, lon, scan, track, nasa, id, history, falsePositives, industries, neighbour, when, t
|
||||
} = this.props;
|
||||
return (
|
||||
<div>
|
||||
<Fragment>
|
||||
{ !falsePositives && !industries &&
|
||||
<Marker position={[lat, lon]} icon={nasa ? this.getIcon(scan) : nFireIcon} onClick={this.onClick} >
|
||||
<Marker position={[lat, lon]} icon={nasa ? this.getIcon(scan) : nFireIcon} eventHandlers={{ click: this.onClick }} >
|
||||
<FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
|
||||
</Marker> }
|
||||
{ industries && <Marker position={[lat, lon]} icon={regIndustryIcon}>
|
||||
|
|
@ -43,23 +43,20 @@ class FireIconMark extends Component {
|
|||
</Marker> }
|
||||
{ /* disabled */ industries && false && <CircleMarker
|
||||
center={[lat, lon]}
|
||||
color="violet"
|
||||
stroke={false}
|
||||
fillOpacity="1"
|
||||
fill
|
||||
radius={1}
|
||||
pathOptions={{ color: 'violet', stroke: false, fillOpacity: 1, fill: true }}
|
||||
/>}
|
||||
{ falsePositives && !industries &&
|
||||
<Marker position={[lat, lon]} icon={industryIcon} onClick={this.onClick}>
|
||||
<Marker position={[lat, lon]} icon={industryIcon} eventHandlers={{ click: this.onClick }}>
|
||||
<Tooltip><Fragment>{t('Es una industria (fuente: nuestros usuarios/as)')}</Fragment></Tooltip>
|
||||
{ /* disabled because was a past fire (and can be marked multiple times) */ false && <FirePopup t={t} history={history} id={id} lat={lat} lon={lon} /> }
|
||||
</Marker>
|
||||
}
|
||||
{ !falsePositives && !industries &&
|
||||
<CircleMarker center={[lat, lon]} color={nasa ? 'red' : '#D35400'} stroke={false} fillOpacity="1" fill radius={1} onClick={this.onClick}>
|
||||
<CircleMarker center={[lat, lon]} radius={1} pathOptions={{ color: nasa ? 'red' : '#D35400', stroke: false, fillOpacity: 1, fill: true }} eventHandlers={{ click: this.onClick }}>
|
||||
<FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
|
||||
</CircleMarker> }
|
||||
</div>
|
||||
</Fragment>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,8 @@ const FirePixel = ({
|
|||
}) => (
|
||||
<CircleMarker
|
||||
center={[lat, lon]}
|
||||
color={nasa ? 'red' : '#D35400'}
|
||||
stroke={false}
|
||||
fillOpacity="1"
|
||||
fill
|
||||
radius={nasa ? 1 : 2}
|
||||
pathOptions={{ color: nasa ? 'red' : '#D35400', stroke: false, fillOpacity: 1, fill: true }}
|
||||
>
|
||||
<FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
|
||||
</CircleMarker>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class FirePolygonMark extends Component {
|
|||
const lon = centerid.coordinates[0];
|
||||
const lat = centerid.coordinates[1];
|
||||
return (
|
||||
<GeoJSON data={shape} color="orange" stroke width="1" opacity=".2" fillOpacity=".0" />
|
||||
<GeoJSON data={shape} style={{ color: 'orange', stroke: true, weight: 1, opacity: 0.2, fillOpacity: 0 }} />
|
||||
);
|
||||
/* <FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} /> */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,27 @@
|
|||
/* eslint-disable react/jsx-indent-props */
|
||||
/* eslint-disable import/no-absolute-path */
|
||||
/* eslint-disable import/no-absolute-path */
|
||||
|
||||
import React, { Component } from 'react';
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
import FullscreenControl from 'react-leaflet-fullscreen';
|
||||
import 'react-leaflet-fullscreen/dist/styles.css';
|
||||
import { createControlComponent } from '@react-leaflet/core';
|
||||
import L from 'leaflet';
|
||||
import 'leaflet.fullscreen';
|
||||
import 'leaflet.fullscreen/Control.FullScreen.css';
|
||||
|
||||
class FullScreenMap extends Component {
|
||||
render() {
|
||||
const { t } = this.props;
|
||||
return (
|
||||
<FullscreenControl
|
||||
position="topleft"
|
||||
title={t('Pantalla completa')}
|
||||
titleCancel={t('Salir de pantalla completa')}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
// Replacement for react-leaflet-fullscreen (v1-only): wrap the vanilla
|
||||
// leaflet.fullscreen control with react-leaflet v4's control factory.
|
||||
const FullscreenControl = createControlComponent(
|
||||
({ position = 'topleft', title, titleCancel }) => L.control.fullscreen({ position, title, titleCancel })
|
||||
);
|
||||
|
||||
const FullScreenMap = ({ t }) => (
|
||||
<FullscreenControl
|
||||
position="topleft"
|
||||
title={t('Pantalla completa')}
|
||||
titleCancel={t('Salir de pantalla completa')}
|
||||
/>
|
||||
);
|
||||
|
||||
FullScreenMap.propTypes = {
|
||||
t: PropTypes.func.isRequired
|
||||
|
|
|
|||
25
imports/ui/components/Maps/GoogleMutantLayer.js
Normal file
25
imports/ui/components/Maps/GoogleMutantLayer.js
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
import { createLayerComponent } from '@react-leaflet/core';
|
||||
import L from 'leaflet';
|
||||
import 'leaflet.gridlayer.googlemutant';
|
||||
|
||||
// Replacement for react-leaflet-google's GoogleLayer (v1-only). The Google Maps
|
||||
// JS API is already loaded (with the places library) by Gkeys before any Google
|
||||
// BaseLayer renders, so googlemutant can use window.google.maps directly.
|
||||
function createGoogleMutant({
|
||||
maptype = 'roadmap', opacity, googlekey, ...options
|
||||
}, ctx) {
|
||||
const instance = L.gridLayer.googleMutant({
|
||||
type: String(maptype).toLowerCase(),
|
||||
...(opacity != null ? { opacity } : {}),
|
||||
...options
|
||||
});
|
||||
return { instance, context: { ...ctx } };
|
||||
}
|
||||
|
||||
function updateGoogleMutant(instance, props, prevProps) {
|
||||
if (props.opacity != null && props.opacity !== prevProps.opacity) {
|
||||
instance.setOpacity(props.opacity);
|
||||
}
|
||||
}
|
||||
|
||||
export default createLayerComponent(createGoogleMutant, updateGoogleMutant);
|
||||
22
imports/ui/components/Maps/MapBridge.js
Normal file
22
imports/ui/components/Maps/MapBridge.js
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
import { useEffect } from 'react';
|
||||
import { useMap, useMapEvents } from 'react-leaflet';
|
||||
|
||||
// v4 replaces the v1 `ref`/`.leafletElement` + handleLeafletLoad pattern: this
|
||||
// child runs inside <MapContainer> and hands the ready Leaflet map to a class
|
||||
// parent once, so the parent can drive it imperatively (setView, fitBounds,
|
||||
// graphicScale, subsUnion, …).
|
||||
export const MapReady = ({ onReady }) => {
|
||||
const map = useMap();
|
||||
useEffect(() => {
|
||||
if (onReady) onReady(map);
|
||||
// run once per map instance
|
||||
}, [map]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||
return null;
|
||||
};
|
||||
|
||||
// Bridges Leaflet map events to callbacks (replaces the v1 onMoveend /
|
||||
// onViewportChanged / onZoomend props on <Map>).
|
||||
export const MapEvents = ({ handlers }) => {
|
||||
useMapEvents(handlers || {});
|
||||
return null;
|
||||
};
|
||||
32
imports/ui/components/Maps/MapControl.js
Normal file
32
imports/ui/components/Maps/MapControl.js
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
import { useEffect, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
import { useMap } from 'react-leaflet';
|
||||
import L from 'leaflet';
|
||||
|
||||
// Replacement for react-leaflet-control (v1-only): mounts a Leaflet control at
|
||||
// the given corner and portals arbitrary React children into it. Click/scroll
|
||||
// on the control no longer pans/zooms the map underneath.
|
||||
const MapControl = ({ position = 'topright', children }) => {
|
||||
const map = useMap();
|
||||
const [container, setContainer] = useState(null);
|
||||
|
||||
useEffect(() => {
|
||||
const ReactControl = L.Control.extend({
|
||||
onAdd: () => {
|
||||
const div = L.DomUtil.create('div', 'leaflet-control leaflet-control-react');
|
||||
L.DomEvent.disableClickPropagation(div);
|
||||
L.DomEvent.disableScrollPropagation(div);
|
||||
setContainer(div);
|
||||
return div;
|
||||
},
|
||||
onRemove: () => setContainer(null)
|
||||
});
|
||||
const control = new ReactControl({ position });
|
||||
control.addTo(map);
|
||||
return () => control.remove();
|
||||
}, [map, position]);
|
||||
|
||||
return container ? createPortal(children, container) : null;
|
||||
};
|
||||
|
||||
export default MapControl;
|
||||
|
|
@ -12,7 +12,8 @@ const subsUnion = (union, options) => {
|
|||
const interactive = options.interactive || false;
|
||||
|
||||
if (options.subs) {
|
||||
const lmap = options.map.leafletElement;
|
||||
// v4: options.map is the Leaflet map instance directly (no .leafletElement)
|
||||
const lmap = options.map;
|
||||
if (union) {
|
||||
lmap.removeLayer(union);
|
||||
}
|
||||
|
|
@ -30,7 +31,7 @@ const subsUnion = (union, options) => {
|
|||
if (options.fit && options.bounds) {
|
||||
// console.log(options.bounds);
|
||||
const bounds = JSON.parse(options.bounds);
|
||||
options.map.leafletElement.fitBounds(L.latLngBounds(bounds._northEast, bounds._southWest));
|
||||
lmap.fitBounds(L.latLngBounds(bounds._northEast, bounds._southWest));
|
||||
}
|
||||
} else if (options.subs.length > 0) {
|
||||
const result = calcUnion(L, options.subs, sub => sub, true);
|
||||
|
|
@ -43,7 +44,7 @@ const subsUnion = (union, options) => {
|
|||
});
|
||||
union.addTo(lmap);
|
||||
if (options.fit) {
|
||||
options.map.leafletElement.fitBounds(bounds);
|
||||
lmap.fitBounds(bounds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue