mirror of
https://github.com/maputnik/editor.git
synced 2025-12-23 14:40:01 +00:00
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.3 to 5.9.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/microsoft/TypeScript/releases">typescript's releases</a>.</em></p> <blockquote> <h2>TypeScript 5.9</h2> <p>Release notes pending.</p> <!-- raw HTML omitted --> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> <li>[[No specific changes for TypeScript 5.9.2 (Stable)]]</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 RC</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-rc/">release announcement</a></p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 Beta</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-beta/">release announcement</a>.</p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="be86783155"><code>be86783</code></a> Give more specific errors for <code>verbatimModuleSyntax</code> (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62113">#62113</a>)</li> <li><a href="22ef57786f"><code>22ef577</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250714...</li> <li><a href="d5a414cd1d"><code>d5a414c</code></a> Don't use <code>noErrorTruncation</code> when printing types with <code>maximumLength</code> set (#...</li> <li><a href="f14b5c8a2f"><code>f14b5c8</code></a> Remove unused and confusing dom.iterable.d.ts file (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62037">#62037</a>)</li> <li><a href="2778e84ed8"><code>2778e84</code></a> Restore AbortSignal.abort (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62086">#62086</a>)</li> <li><a href="65cb4bd2d5"><code>65cb4bd</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250710...</li> <li><a href="9e20e032ef"><code>9e20e03</code></a> Clear out checker-level stacks on pop (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62016">#62016</a>)</li> <li><a href="87740bc7fe"><code>87740bc</code></a> Fix for Issue 61081 (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61221">#61221</a>)</li> <li><a href="833a8d492c"><code>833a8d4</code></a> Fix Symbol completion priority and cursor positioning (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61945">#61945</a>)</li> <li><a href="0018c9ff12"><code>0018c9f</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250702...</li> <li>Additional commits viewable in <a href="https://github.com/microsoft/TypeScript/compare/v5.8.3...v5.9.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Harel M <harel.mazor@gmail.com>
209 lines
5.0 KiB
TypeScript
209 lines
5.0 KiB
TypeScript
import React from "react";
|
||
import {throttle} from "lodash";
|
||
import { type WithTranslation, withTranslation } from "react-i18next";
|
||
|
||
import MapMaplibreGlLayerPopup from "./MapMaplibreGlLayerPopup";
|
||
|
||
import "ol/ol.css";
|
||
//@ts-ignore
|
||
import {apply} from "ol-mapbox-style";
|
||
import {Map, View, Overlay} from "ol";
|
||
|
||
import {toLonLat} from "ol/proj";
|
||
import type {StyleSpecification} from "maplibre-gl";
|
||
|
||
|
||
function renderCoords (coords: string[]) {
|
||
if (!coords || coords.length < 2) {
|
||
return null;
|
||
}
|
||
else {
|
||
return <span className="maputnik-coords">
|
||
{coords.map((coord) => String(coord).padStart(7, "\u00A0")).join(", ")}
|
||
</span>;
|
||
}
|
||
}
|
||
|
||
type MapOpenLayersInternalProps = {
|
||
onDataChange?(...args: unknown[]): unknown
|
||
mapStyle: object
|
||
accessToken?: string
|
||
style?: object
|
||
onLayerSelect(layerId: string): void
|
||
debugToolbox: boolean
|
||
replaceAccessTokens(...args: unknown[]): unknown
|
||
onChange(...args: unknown[]): unknown
|
||
} & WithTranslation;
|
||
|
||
type MapOpenLayersState = {
|
||
zoom: string
|
||
rotation: string
|
||
cursor: string[]
|
||
center: string[]
|
||
selectedFeatures?: any[]
|
||
};
|
||
|
||
class MapOpenLayersInternal extends React.Component<MapOpenLayersInternalProps, MapOpenLayersState> {
|
||
static defaultProps = {
|
||
onMapLoaded: () => {},
|
||
onDataChange: () => {},
|
||
onLayerSelect: () => {},
|
||
};
|
||
updateStyle: any;
|
||
map: any;
|
||
container: HTMLDivElement | null = null;
|
||
overlay: Overlay | undefined;
|
||
popupContainer: HTMLElement | null = null;
|
||
|
||
constructor(props: MapOpenLayersInternalProps) {
|
||
super(props);
|
||
this.state = {
|
||
zoom: "0",
|
||
rotation: "0",
|
||
cursor: [] as string[],
|
||
center: [],
|
||
};
|
||
this.updateStyle = throttle(this._updateStyle.bind(this), 200);
|
||
}
|
||
|
||
_updateStyle(newMapStyle: StyleSpecification) {
|
||
if(!this.map) return;
|
||
|
||
// See <https://github.com/openlayers/ol-mapbox-style/issues/215#issuecomment-493198815>
|
||
this.map.getLayers().clear();
|
||
apply(this.map, newMapStyle);
|
||
}
|
||
|
||
componentDidUpdate(prevProps: MapOpenLayersInternalProps) {
|
||
if (this.props.mapStyle !== prevProps.mapStyle) {
|
||
this.updateStyle(
|
||
this.props.replaceAccessTokens(this.props.mapStyle)
|
||
);
|
||
}
|
||
}
|
||
|
||
componentDidMount() {
|
||
this.overlay = new Overlay({
|
||
element: this.popupContainer!,
|
||
autoPan: {
|
||
animation: {
|
||
duration: 250
|
||
}
|
||
},
|
||
});
|
||
|
||
const map = new Map({
|
||
target: this.container!,
|
||
overlays: [this.overlay],
|
||
view: new View({
|
||
zoom: 1,
|
||
center: [180, -90],
|
||
})
|
||
});
|
||
|
||
map.on("pointermove", (evt) => {
|
||
const coords = toLonLat(evt.coordinate);
|
||
this.setState({
|
||
cursor: [
|
||
coords[0].toFixed(2),
|
||
coords[1].toFixed(2)
|
||
]
|
||
});
|
||
});
|
||
|
||
const onMoveEnd = () => {
|
||
const zoom = map.getView().getZoom();
|
||
const center = toLonLat(map.getView().getCenter()!);
|
||
|
||
this.props.onChange({
|
||
zoom,
|
||
center: {
|
||
lng: center[0],
|
||
lat: center[1],
|
||
},
|
||
});
|
||
};
|
||
|
||
onMoveEnd();
|
||
map.on("moveend", onMoveEnd);
|
||
|
||
map.on("postrender", (_e) => {
|
||
const center = toLonLat(map.getView().getCenter()!);
|
||
this.setState({
|
||
center: [
|
||
center[0].toFixed(2),
|
||
center[1].toFixed(2),
|
||
],
|
||
rotation: map.getView().getRotation().toFixed(2),
|
||
zoom: map.getView().getZoom()!.toFixed(2)
|
||
});
|
||
});
|
||
|
||
|
||
|
||
this.map = map;
|
||
this.updateStyle(
|
||
this.props.replaceAccessTokens(this.props.mapStyle)
|
||
);
|
||
}
|
||
|
||
closeOverlay = (e: any) => {
|
||
e.target.blur();
|
||
this.overlay!.setPosition(undefined);
|
||
};
|
||
|
||
render() {
|
||
const t = this.props.t;
|
||
return <div className="maputnik-ol-container">
|
||
<div
|
||
ref={x => {this.popupContainer = x;}}
|
||
style={{background: "black"}}
|
||
className="maputnik-popup"
|
||
>
|
||
<button
|
||
className="maplibregl-popup-close-button"
|
||
onClick={this.closeOverlay}
|
||
aria-label={t("Close popup")}
|
||
>
|
||
×
|
||
</button>
|
||
<MapMaplibreGlLayerPopup
|
||
features={this.state.selectedFeatures || []}
|
||
onLayerSelect={this.props.onLayerSelect}
|
||
/>
|
||
</div>
|
||
<div className="maputnik-ol-zoom">
|
||
{t("Zoom:")} {this.state.zoom}
|
||
</div>
|
||
{this.props.debugToolbox &&
|
||
<div className="maputnik-ol-debug">
|
||
<div>
|
||
<label>{t("cursor:")} </label>
|
||
<span>{renderCoords(this.state.cursor)}</span>
|
||
</div>
|
||
<div>
|
||
<label>{t("center:")} </label>
|
||
<span>{renderCoords(this.state.center)}</span>
|
||
</div>
|
||
<div>
|
||
<label>{t("rotation:")} </label>
|
||
<span>{this.state.rotation}</span>
|
||
</div>
|
||
</div>
|
||
}
|
||
<div
|
||
className="maputnik-ol"
|
||
ref={x => {this.container = x;}}
|
||
role="region"
|
||
aria-label={t("Map view")}
|
||
style={{
|
||
...this.props.style,
|
||
}}>
|
||
</div>
|
||
</div>;
|
||
}
|
||
}
|
||
|
||
const MapOpenLayers = withTranslation()(MapOpenLayersInternal);
|
||
export default MapOpenLayers;
|