@evergis/react 2.0.179 → 2.0.181

package/dist/symbols/mockFeatures.d.ts

@@ -2,6 +2,7 @@ import { PointFeature } from '@evergis/sgis/es/features/PointFeature';
 import { Polygon } from '@evergis/sgis/es/features/Polygon';
 import { Polyline } from '@evergis/sgis/es/features/Polyline';
 import { H3Feature } from "@evergis/sgis/es/features/H3Feature";
+import { CombinedPolyline } from "@evergis/sgis/es/features/CombinedPolyline";
 /**
  * Моки фич для отображения превью символа
  * http://cf.everpoint.ru/pages/viewpage.action?pageId=45024217
@@ -9,6 +10,7 @@ import { H3Feature } from "@evergis/sgis/es/features/H3Feature";
 export declare const viewBoxSize = 100;
 export declare const pointFeature: PointFeature;
 export declare const lineFeature: Polyline;
+export declare const combinedLineFeature: CombinedPolyline;
 export declare const polygonFeature: Polygon;
 export declare const h3gridFeature: H3Feature;
 export declare const lineLegendFeature: Polyline;
@@ -20,14 +22,14 @@ export declare const MAP_LEGEND_FEATURES: {
 export declare const LEGEND_FEATURES: {
     point: PointFeature;
     polyline: Polyline;
-    combinedPolyline: Polyline;
+    combinedPolyline: CombinedPolyline;
     polygon: Polygon;
     h3grid: H3Feature;
 };
 export declare const MOCK_FEATURES: {
     readonly point: PointFeature;
     readonly polyline: Polyline;
-    readonly combinedPolyline: Polyline;
+    readonly combinedPolyline: CombinedPolyline;
     readonly polygon: Polygon;
     readonly h3grid: H3Feature;
 };

package/dist/symbols/types.d.ts

@@ -8,8 +8,9 @@ import { ImageFill } from '@evergis/sgis/es/symbols/polygon/ImageFill';
 import { PointSymbol } from '@evergis/sgis/es/symbols/point/Point';
 import { H3Symbol } from "@evergis/sgis/es/symbols/H3Symbol";
 import { ClusterSymbol } from "@evergis/sgis/es/symbols/ClusterSymbol";
+import { CombinedPolylineSymbol } from "@evergis/sgis/es/symbols/CombinedPolylineSymbol";
 export declare type SGisPointSymbolType = PointSymbol | StaticImageSymbol | SquareSymbol | MaskedImage;
 export declare type SGisImageSymbolType = StaticImageSymbol | MaskedImage;
 export declare type SGisPolygonSymbolType = PolygonSymbol | BrushFill | ImageFill;
 export declare type SGisPolylineSymbolType = PolylineSymbol;
-export declare type SGisSymbolType = SGisPointSymbolType | SGisPolygonSymbolType | SGisPolylineSymbolType | H3Symbol | ClusterSymbol;
+export declare type SGisSymbolType = SGisPointSymbolType | SGisPolygonSymbolType | SGisPolylineSymbolType | H3Symbol | ClusterSymbol | CombinedPolylineSymbol;

package/dist/utils/legend.d.ts

@@ -1,6 +1,6 @@
 import { AttributesConfigurationDc, AttributeType, FeatureLayerServiceInfoDc, LayerDefinitionDc, ServiceInfoDc, StyleDc } from "@evergis/api";
-import { ClassifyParameter, LegendSectionItem, ParameterInfo } from "../components";
-import { ClassificationClass, ClassificationParameter, ClassificationParameterExtended, ClassifyAble, FeatureAttributeValue, ImageSymbol, LabelType, LegendValueType, MaskedImageSymbol, ParameterByAttribute, ParameterValue, ParameterValueWithSymbol, PointSymbolType, PolygonSymbol, PolylineSymbol, RangeClass, StyleSymbolType, SvgPointSymbol, UniqueClass } from "../core";
+import { ClassifyParameter, LegendProps, LegendSectionItem, ParameterInfo } from "../components";
+import { ClassificationClass, ClassificationParameter, ClassificationParameterExtended, ClassifyAble, ImageSymbol, LabelType, LayerAttribute, LegendValueType, MaskedImageSymbol, ParameterByAttribute, ParameterValue, ParameterValueWithSymbol, PointSymbolType, PolygonSymbol, PolylineSymbol, RangeClass, StyleSymbolType, SvgPointSymbol, UniqueClass } from "../core";
 export declare const isLayerService: (value?: unknown) => value is import("@evergis/api").ResourceInfoDc | ServiceInfoDc;
 export declare const getAttributeFromCondition: (condition: string) => string;
 export declare const getExprFromCondition: (condition: string, partIndex?: number | undefined) => string[];
@@ -8,10 +8,9 @@ export declare const getSignFromConditionPart: (condition: string, partIndex?: n
 export declare const getValueFromConditionPart: (condition: string, partIndex?: number | undefined) => string;
 export declare const isRangeCondition: (condition: string) => boolean;
 export declare const getSymbolParameterInfo: (parameter: ClassificationParameter) => ParameterInfo;
-export declare const formatValue: (value: FeatureAttributeValue, type?: AttributeType | undefined, calculatedParameter?: "symbol" | "fill.color" | "fill.hatchColor" | "stroke.width" | "stroke.color" | "background.fillColor" | "background.strokeColor" | "background.strokeWidth" | "figure.fillColor" | "fillColor" | "strokeColor" | "strokeWidth" | "size" | "angle" | "maskedColor" | undefined) => string | undefined;
-export declare const formatUniqueClassValue: (value: UniqueClass) => string;
+export declare const formatUniqueClassValue: (value: UniqueClass, formatValue?: LegendProps["formatValue"]) => string;
 export declare const getRangeValues: ({ from, to }: Pick<RangeClass, "from" | "to">, isDouble: boolean, isDate: boolean, index: number) => Pick<RangeClass, "from" | "to">;
-export declare const formatRangeClassValue: (value: RangeClass, index: number) => string;
+export declare const formatRangeClassValue: (value: RangeClass, formatValue: LegendProps["formatValue"], index: number) => string;
 export declare const checkLayerHasLegend: (layerInfo: Pick<FeatureLayerServiceInfoDc, "geometryType" | "style">) => boolean;
 export declare const getTitleFromCondition: (condition: string) => string;
 export declare const enum LegendSymbolTypes {
@@ -38,8 +37,8 @@ export declare function getDimensions(symbol: ImageSymbol, size: number): Dimens
 export declare const createLegendSymbol: (parameterValue: ParameterValueWithSymbol, parameter: ClassificationParameterExtended, classificationsParams: ClassificationParameterExtended[], baseSymbol: StyleSymbolType) => StyleSymbolType | null;
 export declare function createHiddenCondition(attributeName: string, attributeType: AttributeType, value: ClassificationClass): string | null;
 export declare const createOtherHiddenCondition: (values: ClassificationClass[], attributeName: string, attributeType: AttributeType) => string | null;
-export declare const getMinimizedLegendValues: (attributeName: string, attributeType: AttributeType, classified: ParameterByAttribute<ParameterValue>, index: number, otherTitle: string) => LegendValueType[];
-export declare const getMaximizedLegendValues: (attributeName: string, attributeType: AttributeType, param: ClassificationParameterExtended, params: ClassificationParameterExtended[], classified: ParameterByAttribute<ParameterValue>, symbol: StyleDc["symbol"], sectionIndex: number, otherTitle: string) => LegendSectionItem[];
+export declare const getMinimizedLegendValues: (attribute: LayerAttribute, classified: ParameterByAttribute<ParameterValue>, formatValue: LegendProps["formatValue"], index: number, otherTitle: string) => LegendValueType[];
+export declare const getMaximizedLegendValues: (attribute: LayerAttribute, param: ClassificationParameterExtended, params: ClassificationParameterExtended[], classified: ParameterByAttribute<ParameterValue>, symbol: StyleDc["symbol"], formatValue: LegendProps["formatValue"], sectionIndex: number, otherTitle: string) => LegendSectionItem[];
 export declare type ClassifiedList = Record<ClassifyParameter, ParameterByAttribute<ParameterValue>>;
 export declare const getClassified: (layerInfo: FeatureLayerServiceInfoDc) => ClassifiedList;
 export declare const getSymbolStrokeWidth: (symbol: PointSymbolType) => number;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.179",
+  "version": "2.0.181",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   },
   "peerDependencies": {
     "@evergis/api": ">=1.0.0",
-    "@evergis/sgis": ">=0.5.0-alpha.45",
+    "@evergis/sgis": ">=0.5.0-alpha.54",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -43,8 +43,8 @@
     "@babel/core": "^7.17.5",
     "@babel/plugin-transform-classes": "^7.16.7",
     "@babel/preset-env": "^7.16.11",
-    "@evergis/api": "^3.0.147",
-    "@evergis/sgis": "0.5.0-alpha.45",
+    "@evergis/api": "^3.0.148",
+    "@evergis/sgis": "0.5.0-alpha.54",
     "@storybook/addon-actions": "^6.4.18",
     "@storybook/addon-controls": "^6.4.18",
     "@storybook/addon-docs": "^6.4.18",
@@ -79,5 +79,5 @@
     "punycode": "^2.1.1",
     "styled-components": "^5.3.5"
   },
-  "gitHead": "369aaf9dd061730af4da1a3241c9a37e059defbb"
+  "gitHead": "40d2d6e7144ea93d4b8759f9aa89a6e0975217d7"
 }