Modernizes the whole i18n stack:
- 48 translate([], {wait:true}) / translate() HOCs -> withTranslation()
- react.wait:true -> react.useSuspense:false
- whitelist -> supportedLngs; added compatibilityJSON: 'v3' so our
natural-language keys + v3 _plural layout keep working (custom
separators ss/eth/dj preserved)
- backends: xhr -> i18next-http-backend (client), sync-fs ->
i18next-fs-backend (server); dropped i18next-localstorage-cache
(was enabled:false); languagedetector 2 -> 8
- ReSendEmail: <Interpolate> (removed in v10) -> <Trans values={{email}}/>,
dropped the removed bare t export
- saveMissing handler signature (lngs, ns, key, fallbackValue)
Silences the per-component Translate/I18n legacy-context warnings.
Browser-verified es/en switch and <Trans> interpolation on /fires;
REST smoke byte-identical.
88 lines
2.8 KiB
JavaScript
88 lines
2.8 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 { GoogleLayer } from 'react-leaflet-google/lib/';
|
|
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')}>
|
|
<GoogleLayer opacity={defOpacity} googlekey={this.state.gkey} 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" />
|
|
</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" />
|
|
</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);
|