@evergis/react 3.1.107 → 3.1.108

package/dist/components/Dashboard/types.d.ts

@@ -1,5 +1,4 @@
 import { CSSProperties, FC, ReactNode } from 'react';
-import { Projection } from 'mapbox-gl';
 import { i18n } from 'i18next';
 import { AttributeDefinitionDc, AttributeFormatDefinitionDc, AttributeType, EqlRequestDc, FeatureDc, GeometryType, PagedFeaturesListDc, PositionDc, RemoteTaskStatus, StringSubType } from '@evergis/api';
 import { PieChartData, BarChartMarker } from '@evergis/charts';
@@ -142,7 +141,7 @@ export interface ConfigOptions {
     align?: "left" | "center" | "right";
     pitch?: number;
     bearing?: number;
-    projection?: Projection["name"];
+    projection?: string;
     baseMapName?: string;
     baseMapSettings?: Record<string, BaseMapSettings>;
     expandedLayers?: boolean;

package/dist/components/Layer/constants.d.ts

@@ -1,5 +1,5 @@
-import { CirclePaint, FillPaint, FillExtrusionPaint, LinePaint } from 'mapbox-gl';
-export declare const DEFAULT_CIRCLE_PAINT: CirclePaint;
-export declare const DEFAULT_FILL_PAINT: FillPaint;
-export declare const DEFAULT_FILL_EXTRUSION_PAINT: FillExtrusionPaint;
-export declare const DEFAULT_LINE_PAINT: LinePaint;
+import { CircleLayerSpecification, FillExtrusionLayerSpecification, FillLayerSpecification, LineLayerSpecification } from 'maplibre-gl';
+export declare const DEFAULT_CIRCLE_PAINT: CircleLayerSpecification["paint"];
+export declare const DEFAULT_FILL_PAINT: FillLayerSpecification["paint"];
+export declare const DEFAULT_FILL_EXTRUSION_PAINT: FillExtrusionLayerSpecification["paint"];
+export declare const DEFAULT_LINE_PAINT: LineLayerSpecification["paint"];

package/dist/components/Map/types.d.ts

@@ -1,5 +1,5 @@
 import { CSSProperties, ReactNode } from 'react';
-import { MapProps as MapGLProps } from 'react-map-gl/mapbox';
+import { MapProps as MapGLProps } from 'react-map-gl/maplibre';
 export interface MapProps extends MapGLProps {
     zIndex?: CSSProperties["zIndex"];
     lowerSiblings?: ReactNode;

package/dist/contexts/MapContext/types.d.ts

@@ -1,5 +1,5 @@
 import { Dispatch, MutableRefObject, PropsWithChildren, SetStateAction } from 'react';
-import { Map as MapboxGLMap } from 'mapbox-gl';
+import { Map as MaplibreGLMap } from 'maplibre-gl';
 import { default as MapboxDraw } from '@mapbox/mapbox-gl-draw';
 export declare enum BaseMapTheme {
     Light = "light",
@@ -16,7 +16,7 @@ export interface BaseMapItem {
     color?: string;
 }
 export interface MapContextProps {
-    map?: MutableRefObject<MapboxGLMap>;
+    map?: MutableRefObject<MaplibreGLMap>;
     draw?: MutableRefObject<Omit<MapboxDraw, "getDefaultPosition">>;
     loaded?: boolean;
     setLoaded?: Dispatch<SetStateAction<boolean>>;

package/dist/core/classification/findAttributeInExpression.d.ts

@@ -1,2 +1,2 @@
-import { ExpressionSpecification } from 'mapbox-gl';
+import { ExpressionSpecification } from 'maplibre-gl';
 export declare const findAttributeInExpression: (expression: ExpressionSpecification) => string[];

package/dist/core/classification/getActualExtrusionHeight.d.ts

@@ -1,2 +1,2 @@
-import { AnyPaint } from 'mapbox-gl';
-export declare const getActualExtrusionHeight: (paint: AnyPaint) => any;
+import { CircleLayerSpecification, LineLayerSpecification, FillLayerSpecification, FillExtrusionLayerSpecification, HeatmapLayerSpecification, SymbolLayerSpecification } from 'maplibre-gl';
+export declare const getActualExtrusionHeight: (paint: CircleLayerSpecification["paint"] | LineLayerSpecification["paint"] | FillLayerSpecification["paint"] | FillExtrusionLayerSpecification["paint"] | HeatmapLayerSpecification["paint"] | SymbolLayerSpecification["paint"]) => any;

package/dist/index.js

@@ -18,7 +18,7 @@ var jspdf = require('jspdf');
 var html2canvas = require('html2canvas');
 var MapboxDraw = require('@mapbox/mapbox-gl-draw');
 var turf = require('@turf/turf');
-var MapGL = require('react-map-gl/mapbox');
+var MapGL = require('react-map-gl/maplibre');
 require('@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css');
 require('mapbox-gl/dist/mapbox-gl.css');
 var react = require('swiper/react');
@@ -4898,12 +4898,10 @@ const useMapImages = ({ images }) => {
         if (isSvgUrl(config.url)) {
             // SVG: растеризуем через canvas
             try {
-                const { data, width, height } = await loadSvgAsImage(config.url, size, pixelRatio);
+                const { data } = await loadSvgAsImage(config.url, size, pixelRatio);
                 map.current.addImage(config.name, data, {
                     sdf,
                     pixelRatio,
-                    width,
-                    height,
                 });
                 loadedImagesRef.current.add(config.name);
             }
@@ -4916,12 +4914,7 @@ const useMapImages = ({ images }) => {
         else {
             // PNG/другие форматы: используем стандартную загрузку Mapbox
             return new Promise((resolve, reject) => {
-                map.current.loadImage(config.url, (error, image) => {
-                    if (error) {
-                        setErrors(prev => ({ ...prev, [config.name]: error.message }));
-                        reject(error);
-                        return;
-                    }
+                map.current.loadImage(config.url).then((image) => {
                     if (image) {
                         map.current.addImage(config.name, image, {
                             sdf,
@@ -4930,6 +4923,9 @@ const useMapImages = ({ images }) => {
                         loadedImagesRef.current.add(config.name);
                         resolve();
                     }
+                }).catch(error => {
+                    setErrors(prev => ({ ...prev, [config.name]: error.message }));
+                    reject(error);
                 });
             });
         }
@@ -11468,7 +11464,7 @@ const VectorLayer = ({ layer, tileUrl, visible, beforeId, getLayerTempStyle, fil
             return null;
         }).filter((config) => config !== null);
     }, [clientStyle]);
-    const { loaded: iconsLoaded } = useMapImages({ images: iconConfigs });
+    useMapImages({ images: iconConfigs });
     const renderLayerByGeometryType = React.useCallback(() => {
         const visibility = visible ? "visible" : "none";
         switch (geometryType) {
@@ -11621,7 +11617,7 @@ const MapWrapper = styled.div `
 
 const Map$1 = ({ zIndex, lowerSiblings, upperSiblings, onError, children, ...rest }) => {
     const { map, setLoaded } = useMapContext();
-    return (jsxRuntime.jsxs(MapWrapper, { "$zIndex": zIndex, children: [lowerSiblings, jsxRuntime.jsx(MapGL, { ...rest, renderWorldCopies: true, antialias: true, doubleClickZoom: false, cursor: "default", onLoad: e => {
+    return (jsxRuntime.jsxs(MapWrapper, { "$zIndex": zIndex, children: [lowerSiblings, jsxRuntime.jsx(MapGL, { ...rest, renderWorldCopies: true, doubleClickZoom: false, cursor: "default", onLoad: e => {
                     map.current = e.target;
                     map.current.on("error", onError);
                     setLoaded(true);