@evergis/react 2.0.179 → 2.0.181

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

@@ -1,8 +1,9 @@
 import { ReactNode, RefObject } from "react";
-import { AttributeType, PointLabelSymbolDc, SvgPointSymbolDc, StyleDc, FeatureLayerServiceInfoDc } from "@evergis/api";
+import { AttributeType, PointLabelSymbolDc, SvgPointSymbolDc, StyleDc, FeatureLayerServiceInfoDc, AttributeFormatDc, FeatureDc } from "@evergis/api";
 import { MaskedImage } from "@evergis/sgis/es/symbols/point/MaskedImage";
 import { H3Symbol } from "@evergis/sgis/es/symbols/H3Symbol";
-import { ClassificationParameterExtended, LegendValueType, ParameterByAttribute, ParameterValue, StyleSymbolType, SvgPointSymbol } from "../../core";
+import { Coordinates } from "@evergis/sgis/es/baseTypes";
+import { ClassificationParameterExtended, LayerAttribute, LegendValueType, ParameterByAttribute, ParameterValue, StyleSymbolType, SvgPointSymbol } from "../../core";
 import { SGisBrushFill, SGisImageFill, SGisPolygonSymbol, SGisPolylineSymbol } from "../../symbols";
 export declare type ClassifyParameter = "fill.color" | "fill.hatchColor" | "stroke.width" | "stroke.color" | "textBackground.fill.color" | "background.fillColor" | "background.strokeColor" | "background.strokeWidth" | "figure.fillColor" | "fillColor" | "strokeColor" | "strokeWidth" | "fontColor" | "haloColor" | "size" | "symbol" | "angle" | "maskedColor" | "endingSize" | "beginningSize" | "maxObjectCount" | "gridSize" | "selectionObjectsLimit";
 export interface ParameterInfo {
@@ -19,20 +20,23 @@ export declare const enum Units {
     Count = "pcs",
     Degrees = "\u00B0"
 }
+export declare type Positions = Coordinates | Coordinates[] | Coordinates[][];
+export declare type FeaturedDcExtendedGeometry = Omit<FeatureDc["geometry"], "coordinates"> & {
+    coordinates?: Positions;
+};
 export declare type LegendProps = {
     layerInfo: FeatureLayerServiceInfoDc;
+    formatValue?: (type: AttributeType, value: string | number | Date | FeaturedDcExtendedGeometry, stringFormat?: AttributeFormatDc) => string;
     hiddenLegends?: Record<string, string[]>;
     toggleHiddenLegend?: (layerName: string, hiddenCondition: string) => void;
 };
-export declare type LegendSectionProps = Pick<LegendProps, "hiddenLegends" | "toggleHiddenLegend"> & {
+export declare type LegendSectionProps = Pick<LegendProps, "hiddenLegends" | "toggleHiddenLegend" | "formatValue"> & {
     layerName: string;
     symbol: StyleDc["symbol"];
     parameter: ClassificationParameterExtended;
     parameters: ClassificationParameterExtended[];
     classified: ParameterByAttribute<ParameterValue>;
-    attributeName: string;
-    attributeTitle: string;
-    attributeType: AttributeType;
+    attribute: LayerAttribute;
     index: number;
 };
 export declare type LegendSectionItem = Pick<LegendProps, "hiddenLegends" | "toggleHiddenLegend"> & {

package/dist/react.cjs.development.js

@@ -45,7 +45,9 @@ var StaticImageSymbol = require('@evergis/sgis/es/symbols/point/StaticImageSymbo
 var Square = require('@evergis/sgis/es/symbols/point/Square');
 var MaskedImage = require('@evergis/sgis/es/symbols/point/MaskedImage');
 var H3Symbol = require('@evergis/sgis/es/symbols/H3Symbol');
+var CombinedPolylineSymbol = require('@evergis/sgis/es/symbols/CombinedPolylineSymbol');
 var H3Feature = require('@evergis/sgis/es/features/H3Feature');
+var CombinedPolyline = require('@evergis/sgis/es/features/CombinedPolyline');
 var Canvas = require('@evergis/sgis/es/painters/DomPainter/Canvas');
 var commonEvents = require('@evergis/sgis/es/commonEvents');
 var ClusterLayer$1 = require('@evergis/sgis/es/layers/ClusterLayer');
@@ -1396,7 +1398,7 @@ const formatDate = function formatDate(date, _temp) {
     return dateFns.format(dateValue, dateFormat);
   }
 
-  return "" + defaultValue;
+  return defaultValue.toString();
 };
 
 function numberWithSpaces(x, fractionDigits, delim) {
@@ -2542,39 +2544,25 @@ const isRangeCondition = condition => condition.includes("(");
 const getSymbolParameterInfo = parameter => {
   return PARAMETER_INFOS[parameter] || DEFAULT_PARAMETER_INFO;
 };
-const formatValue$1 = (value, type, calculatedParameter) => {
-  var _ref;
-
-  if (type === api.AttributeType.DateTime) {
-    return formatDate(value, {
-      dateFormat: exports.DateFormat.DateTime
-    });
-  }
-
-  const {
-    serialize
-  } = getSymbolParameterInfo(calculatedParameter);
-  return (_ref = value && typeof value === "number" ? serialize(value) : value) == null ? void 0 : _ref.toString();
-};
-const formatUniqueClassValue = value => {
+const formatUniqueClassValue = (value, formatValue) => {
   const {
     attribute,
     uniqueValue
   } = value;
-  return attribute ? formatValue$1(uniqueValue, attribute.type) : uniqueValue;
+  return attribute && formatValue ? formatValue(attribute.type, uniqueValue, attribute.stringFormat) : uniqueValue;
 };
-const getRangeValues$1 = (_ref2, isDouble, isDate, index) => {
+const getRangeValues$1 = (_ref, isDouble, isDate, index) => {
   let {
     from,
     to
-  } = _ref2;
+  } = _ref;
   return {
     from: from !== null && index !== 0 ? isDate ? from : isDouble ? +from : +from + 1 : from,
     to
   };
 };
-const formatRangeClassValue = (value, index) => {
-  var _value$attribute, _value$attribute2;
+const formatRangeClassValue = (value, formatValue, index) => {
+  var _value$attribute, _value$attribute2, _value$attribute3, _value$attribute4, _value$attribute5, _value$attribute6;
 
   const isDouble = ((_value$attribute = value.attribute) == null ? void 0 : _value$attribute.type) === "Double";
   const isDate = ((_value$attribute2 = value.attribute) == null ? void 0 : _value$attribute2.type) === "DateTime";
@@ -2582,8 +2570,8 @@ const formatRangeClassValue = (value, index) => {
     from,
     to
   } = getRangeValues$1(value, isDouble, isDate, index);
-  const formattedFrom = isDate && from ? formatDate(from) : from;
-  const formattedTo = isDate && to ? formatDate(to) : to;
+  const formattedFrom = formatValue ? formatValue((_value$attribute3 = value.attribute) == null ? void 0 : _value$attribute3.type, from, (_value$attribute4 = value.attribute) == null ? void 0 : _value$attribute4.stringFormat) : from;
+  const formattedTo = formatValue ? formatValue((_value$attribute5 = value.attribute) == null ? void 0 : _value$attribute5.type, to, (_value$attribute6 = value.attribute) == null ? void 0 : _value$attribute6.stringFormat) : to;
 
   if (from === null) {
     return "" + formattedTo + (!isDate ? " и менее" : "");
@@ -2612,20 +2600,18 @@ const getTitleFromCondition = condition => {
   return (_parts$ = parts[1]) == null ? void 0 : _parts$.slice(1, -1);
 };
 
-function createValueTitle$1(paramValue, attributeType, index) {
+function createValueTitle$1(paramValue, attribute, formatValue, index) {
   if (paramValue.title) return paramValue.title;
   const value = {
     parameterValue: getParameterValue(paramValue.value),
-    attribute: {
-      type: attributeType
-    }
+    attribute
   };
   const sign = getSignFromConditionPart(paramValue.condition, 1);
   const isFirstFrom = sign.includes(">");
   value.from = isFirstFrom ? getValueFromConditionPart(paramValue.condition, 1) : null;
   value.to = paramValue.condition.includes(" && ") && isFirstFrom ? getValueFromConditionPart(paramValue.condition, 2) : !isFirstFrom ? getValueFromConditionPart(paramValue.condition, 1) : null;
-  if (isRangeClass(value)) return formatRangeClassValue(value, index);
-  if (isUniqueClass(value)) return formatUniqueClassValue(value);
+  if (isRangeClass(value)) return formatRangeClassValue(value, formatValue, index);
+  if (isUniqueClass(value)) return formatUniqueClassValue(value, formatValue);
   return "";
 } // Основывается на http://cf.everpoint.ru/pages/viewpage.action?pageId=45024217 ->
 // пункт "Настраиваемые значения параметров символики в системе"
@@ -2900,19 +2886,17 @@ const createOtherHiddenCondition = (values, attributeName, attributeType) => {
 
   return hiddenCondition;
 };
-const getMinimizedLegendValues = (attributeName, attributeType, classified, index, otherTitle) => {
+const getMinimizedLegendValues = (attribute, classified, formatValue, index, otherTitle) => {
   const other = {
     title: otherTitle,
     parameterValue: classified.defaultValue,
-    hiddenCondition: createOtherHiddenCondition(classified.values.map(val => getClassificationValue(val.value, otherTitle, new ClassificationCondition(val.condition))), attributeName, attributeType)
+    hiddenCondition: createOtherHiddenCondition(classified.values.map(val => getClassificationValue(val.value, otherTitle, new ClassificationCondition(val.condition))), attribute.name, attribute.type)
   };
   const items = classified.values.map(paramValue => {
     const parameterValue = getParameterValue(paramValue.value);
     const result = {
       parameterValue,
-      attribute: {
-        type: attributeType
-      }
+      attribute
     };
 
     if (isRangeCondition(paramValue.condition)) {
@@ -2920,38 +2904,38 @@ const getMinimizedLegendValues = (attributeName, attributeType, classified, inde
       const to = getValueFromConditionPart(paramValue.condition, 2);
       result.from = from ? isNumeric(from) ? +from : formatDate(from) : null;
       result.to = to ? isNumeric(to) ? +to : formatDate(to) : null;
-      result.title = createValueTitle$1(paramValue, attributeType, index);
+      result.title = createValueTitle$1(paramValue, attribute, formatValue, index);
       return result;
     }
 
-    result.uniqueValue = formatValue$1(paramValue.value);
+    result.uniqueValue = formatValue ? formatValue(attribute.type, paramValue.value, attribute.stringFormat) : paramValue.value.toString();
     result.title = getTitleFromCondition(paramValue.condition);
-    result.hiddenCondition = createHiddenCondition(attributeName, attributeType, getClassificationValue(paramValue.value, result.title, new ClassificationCondition(paramValue.condition)));
+    result.hiddenCondition = createHiddenCondition(attribute.name, attribute.type, getClassificationValue(paramValue.value, result.title, new ClassificationCondition(paramValue.condition)));
     return result;
   });
 
-  if (attributeType !== api.AttributeType.String) {
+  if (attribute.type !== api.AttributeType.String) {
     items.reverse();
   }
 
   return [...items, other];
 };
-const getMaximizedLegendValues = (attributeName, attributeType, param, params, classified, symbol, sectionIndex, otherTitle) => {
+const getMaximizedLegendValues = (attribute, param, params, classified, symbol, formatValue, sectionIndex, otherTitle) => {
   const other = {
     title: otherTitle,
     symbol: createLegendSymbol(classified.defaultValue, param, params, symbol),
-    hiddenCondition: createOtherHiddenCondition(classified.values.map(val => getClassificationValue(val.value, otherTitle, new ClassificationCondition(val.condition))), attributeName, attributeType)
+    hiddenCondition: createOtherHiddenCondition(classified.values.map(val => getClassificationValue(val.value, otherTitle, new ClassificationCondition(val.condition))), attribute.name, attribute.type)
   };
   const items = classified.values.map((paramValue, index) => {
     const result = {
-      symbol: createLegendSymbol(classified.values[index].value, param, params, symbol)
+      symbol: createLegendSymbol(paramValue.value, param, params, symbol)
     };
-    result.title = isRangeCondition(paramValue.condition) ? createValueTitle$1(paramValue, attributeType, sectionIndex) : getTitleFromCondition(paramValue.condition);
-    result.hiddenCondition = createHiddenCondition(attributeName, attributeType, getClassificationValue(classified.values[index].value, result.title, new ClassificationCondition(classified.values[index].condition)));
+    result.title = isRangeCondition(paramValue.condition) ? createValueTitle$1(paramValue, attribute, formatValue, sectionIndex) : getTitleFromCondition(paramValue.condition);
+    result.hiddenCondition = createHiddenCondition(attribute.name, attribute.type, getClassificationValue(paramValue.value, result.title, new ClassificationCondition(classified.values[index].condition)));
     return result;
   });
 
-  if (attributeType !== api.AttributeType.String) {
+  if (attribute.type !== api.AttributeType.String) {
     items.reverse();
   }
 
@@ -4154,7 +4138,7 @@ function isSGisH3Symbol(symbol) {
   return symbol instanceof H3Symbol.H3Symbol;
 }
 function isSGisCombinedPolylineSymbol(symbol) {
-  return symbol.type === "combinedPolylineSymbol";
+  return symbol instanceof CombinedPolylineSymbol.CombinedPolylineSymbol;
 }
 function isSGisClusterSymbol(symbol) {
   return !!symbol.singleObjectSymbol;
@@ -4172,6 +4156,9 @@ const pointFeature = /*#__PURE__*/new PointFeature.PointFeature([50, -50], {
 const lineFeature = /*#__PURE__*/new Polyline.Polyline([[0, -57], [26, -57], [40, -35], [60, -65], [74, -43], [100, -43]], {
   crs: Crs.plain
 });
+const combinedLineFeature = /*#__PURE__*/new CombinedPolyline.CombinedPolyline([[0, -57], [26, -57], [40, -35], [60, -65], [74, -43], [100, -43]], {
+  crs: Crs.plain
+});
 const polygonFeature = /*#__PURE__*/new Polygon.Polygon([[20, -20], [80, -20], [80, -80], [20, -80]], {
   crs: Crs.plain
 });
@@ -4193,14 +4180,14 @@ const MAP_LEGEND_FEATURES = {
 const LEGEND_FEATURES = {
   point: pointFeature,
   polyline: lineLegendFeature,
-  combinedPolyline: lineLegendFeature,
+  combinedPolyline: combinedLineFeature,
   polygon: polygonLegendFeature,
   h3grid: h3gridFeature
 };
 const MOCK_FEATURES = {
   point: pointFeature,
   polyline: lineFeature,
-  combinedPolyline: lineFeature,
+  combinedPolyline: combinedLineFeature,
   polygon: polygonFeature,
   h3grid: h3gridFeature
 };
@@ -6370,9 +6357,8 @@ const LegendSection = _ref => {
     classified,
     hiddenLegends,
     toggleHiddenLegend,
-    attributeName,
-    attributeTitle,
-    attributeType,
+    attribute,
+    formatValue,
     index
   } = _ref;
   const {
@@ -6381,7 +6367,7 @@ const LegendSection = _ref => {
   const [isExpanded, toggleExpanded] = useToggle();
   const [maxRef, maxNode] = useNode();
   const [minRef, minNode] = useNode();
-  return React__default.createElement(MapLegendSectionContainer, null, React__default.createElement(MapLegendHeader, null, attributeTitle), React__default.createElement(LegendParameterDescription, {
+  return React__default.createElement(MapLegendSectionContainer, null, React__default.createElement(MapLegendHeader, null, attribute.alias || attribute.name), React__default.createElement(LegendParameterDescription, {
     parameter: parameter
   }), React__default.createElement(MapLegendSectionItems, {
     height: isExpanded ? ((maxNode == null ? void 0 : maxNode.offsetHeight) || 0) + 4 : minNode == null ? void 0 : minNode.offsetHeight
@@ -6393,15 +6379,15 @@ const LegendSection = _ref => {
     hiddenLegends: hiddenLegends == null ? void 0 : hiddenLegends[layerName],
     toggleHiddenLegend: toggleHiddenLegend,
     parameter: parameter,
-    attributeType: attributeType,
+    attributeType: attribute.type,
     index: index,
-    values: getMaximizedLegendValues(attributeName, attributeType, parameter, parameters, classified, symbol, index, t("classification.other"))
+    values: getMaximizedLegendValues(attribute, parameter, parameters, classified, symbol, formatValue, index, t("classification.other"))
   }), React__default.createElement(MinimizedLegend, {
     innerRef: minRef,
     isShown: !isExpanded,
-    values: getMinimizedLegendValues(attributeName, attributeType, classified, index, t("classification.other")),
     hiddenLegends: hiddenLegends == null ? void 0 : hiddenLegends[layerName],
-    parameter: parameter
+    parameter: parameter,
+    values: getMinimizedLegendValues(attribute, classified, formatValue, index, t("classification.other"))
   })), React__default.createElement(MapLegendExpandButton, {
     onClick: toggleExpanded
   }, t(isExpanded ? "toggleMenu" : "Развернуть")));
@@ -6419,21 +6405,19 @@ const Legend = /*#__PURE__*/React.memo(_ref => {
   const parameters = Object.keys(classified);
   const attributes = getLayerAttributes(layerInfo.layerDefinition);
   return React__default.createElement(MapLegendContainer, null, Object.keys(classified).map((param, index) => {
-    var _classified$param$val, _layerInfo$style, _attributes$find;
+    var _classified$param$val, _layerInfo$style;
 
     const attributeName = getAttributeNameFromCondition((_classified$param$val = classified[param].values[0]) == null ? void 0 : _classified$param$val.condition);
     return React__default.createElement(LegendSection, Object.assign({
       key: index,
       layerName: layerInfo.name,
       symbol: (_layerInfo$style = layerInfo.style) == null ? void 0 : _layerInfo$style.symbol,
-      attributeName: attributeName,
-      attributeTitle: ((_attributes$find = attributes.find(_ref2 => {
+      attribute: attributes.find(_ref2 => {
         let {
           name
         } = _ref2;
         return name === attributeName;
-      })) == null ? void 0 : _attributes$find.alias) || attributeName,
-      attributeType: getAttributeType(layerInfo, attributeName),
+      }),
       classified: classified[param],
       parameter: param,
       parameters: parameters,
@@ -7012,7 +6996,6 @@ exports.formatLength = formatLength;
 exports.formatPolygonMeasure = formatPolygonMeasure;
 exports.formatRangeClassValue = formatRangeClassValue;
 exports.formatUniqueClassValue = formatUniqueClassValue;
-exports.formatValue = formatValue$1;
 exports.getAttributeFromCondition = getAttributeFromCondition;
 exports.getAttributeNameFromClassified = getAttributeNameFromClassified;
 exports.getAttributeNameFromCondition = getAttributeNameFromCondition;