@evergis/react 2.0.134 → 2.0.136

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

@@ -3,6 +3,7 @@ import { LegendItem, LegendValueType } from '../../core';
 declare type LegendSectionProps = {
     item: LegendItem;
     children: (value: LegendValueType) => React.ReactNode;
+    hideTitle?: boolean;
     renderLegendTitle?: (item: React.ReactNode | LegendItem) => React.ReactNode;
 };
 export declare const LegendSection: React.FC<LegendSectionProps>;

package/dist/core/style/types/symbol.d.ts

@@ -1,4 +1,4 @@
-import { CirclePointSymbolDc, CompositeSymbolDc, ImagePointSymbolDc, MaskedImagePointSymbolDc, PolygonSymbolDc, PolylineSymbolDc, RasterSymbolDc, SimplePolylineSymbolDc, SquarePointSymbolDc, StyleDc } from '@evergis/api';
+import { CirclePointSymbolDc, CompositeSymbolDc, H3GridSymbolDc, ImagePointSymbolDc, MaskedImagePointSymbolDc, PolygonSymbolDc, PolylineSymbolDc, RasterSymbolDc, SimplePolylineSymbolDc, SquarePointSymbolDc, StyleDc } from '@evergis/api';
 import { LabelType } from './label';
 import { CalculatedAble } from './parameterValue';
 import { ClientSymbol } from './utils';
@@ -17,11 +17,12 @@ export declare type SimplePolylineSymbol = ClientSymbol<'simplePolylineSymbol',
 export declare type PolylineSymbol = ClientSymbol<'polylineSymbol', PolylineSymbolDc>;
 export declare type RasterSymbol = ClientSymbol<'rasterSymbol', RasterSymbolDc>;
 export declare type CompositeSymbolType = ClientSymbol<'compositeSymbol', CompositeSymbolDc>;
+export declare type H3GridSymbol = ClientSymbol<'h3grid', H3GridSymbolDc>;
 export declare type SimpleShapeSymbol = PointSymbol | SquareSymbol;
 export declare type ImageSymbol = MaskedImageSymbol | StaticImageSymbol;
 export declare type PointSymbolType = SimpleShapeSymbol | ImageSymbol;
 export declare type PolylineSymbols = PolylineSymbol | SimplePolylineSymbol;
-export declare type StyleSymbolType = PointSymbolType | PolygonSymbol | PolylineSymbols | LabelType | RasterSymbol | CompositeSymbolType;
+export declare type StyleSymbolType = PointSymbolType | PolygonSymbol | PolylineSymbols | LabelType | RasterSymbol | CompositeSymbolType | H3GridSymbolDc;
 export declare type StyleSymbolTypes = StyleSymbolType['type'];
 export declare type UnknownSymbol = StyleDc['symbol'] | StyleSymbolType;
 export declare type LayerSymbol = PointSymbol | PolylineSymbols | PolygonSymbol;
@@ -60,4 +61,4 @@ export declare const isTwoDimensionalSymbol: (symbol: UnknownSymbol) => symbol i
 export declare const isSizableSymbol: (symbol: UnknownSymbol) => symbol is SimpleShapeSymbol;
 export declare const isStrokeStyledSymbol: (symbol: UnknownSymbol) => symbol is StrokeStyledSymbols;
 export declare const isScalablePolylineSymbol: (symbol: PolylineSymbol | SimplePolylineSymbol) => boolean | undefined;
-export declare const isSimpleSymbol: (symbol: UnknownSymbol) => symbol is ClientSymbol<"circlePointSymbol", CirclePointSymbolDc, never> | ClientSymbol<"maskedImagePointSymbol", MaskedImagePointSymbolDc, never> | ClientSymbol<"imagePointSymbol", ImagePointSymbolDc, never> | ClientSymbol<"simplePolylineSymbol", SimplePolylineSymbolDc, never> | ClientSymbol<"polylineSymbol", PolylineSymbolDc, never> | ClientSymbol<"rasterSymbol", RasterSymbolDc, never> | SquareSymbol | PolygonSymbol<FillBrushType, StrokeBrushType>;
+export declare const isSimpleSymbol: (symbol: UnknownSymbol) => symbol is ClientSymbol<"circlePointSymbol", CirclePointSymbolDc, never> | ClientSymbol<"maskedImagePointSymbol", MaskedImagePointSymbolDc, never> | ClientSymbol<"imagePointSymbol", ImagePointSymbolDc, never> | ClientSymbol<"simplePolylineSymbol", SimplePolylineSymbolDc, never> | ClientSymbol<"polylineSymbol", PolylineSymbolDc, never> | ClientSymbol<"rasterSymbol", RasterSymbolDc, never> | H3GridSymbolDc | SquareSymbol | PolygonSymbol<FillBrushType, StrokeBrushType>;

package/dist/hooks/useLegend/useLegendValueSymbol.d.ts

@@ -3,4 +3,4 @@ export declare type LegendSymbolPart = {
     parameter: ClassificationParameterExtended;
     parameterValue: ParameterValueWithSymbol;
 };
-export declare const useLegendValueSymbol: ({ parameter, parameterValue, }: LegendSymbolPart) => import("@evergis/sgis/es/symbols/point/Point").PointSymbol | import("@evergis/sgis/es/symbols/point/StaticImageSymbol").StaticImageSymbol | import("@evergis/sgis/es/symbols/point/Square").SquareSymbol | import("@evergis/sgis/es/symbols/point/MaskedImage").MaskedImage | import("@evergis/sgis/es/symbols/polygon/Simple").PolygonSymbol | import("@evergis/sgis/es/symbols/polygon/BrushFill").BrushFill | import("@evergis/sgis/es/symbols/polygon/ImageFill").ImageFill | import("@evergis/sgis/es/symbols/PolylineSymbol").PolylineSymbol | import("@evergis/sgis/es/symbols/H3Symbol").H3Symbol | null;
+export declare const useLegendValueSymbol: ({ parameter, parameterValue, }: LegendSymbolPart) => import("@evergis/sgis/es/symbols/point/Point").PointSymbol | import("@evergis/sgis/es/symbols/point/StaticImageSymbol").StaticImageSymbol | import("@evergis/sgis/es/symbols/point/Square").SquareSymbol | import("@evergis/sgis/es/symbols/point/MaskedImage").MaskedImage | import("@evergis/sgis/es/symbols/polygon/Simple").PolygonSymbol | import("@evergis/sgis/es/symbols/polygon/BrushFill").BrushFill | import("@evergis/sgis/es/symbols/polygon/ImageFill").ImageFill | import("@evergis/sgis/es/symbols/PolylineSymbol").PolylineSymbol | import("../../core").ClientSymbol<"h3grid", import("@evergis/api").H3GridSymbolDc, never> | null;

package/dist/react.cjs.development.js

@@ -2793,7 +2793,7 @@ 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 polygonFeature = /*#__PURE__*/new Polygon.Polygon([[50, -15], [80, -33], [80, -67], [50, -85], [20, -67], [20, -33], [50, -15]], {
+const polygonFeature = /*#__PURE__*/new Polygon.Polygon([[20, -20], [80, -20], [80, -80], [20, -80]], {
   crs: Crs.plain
 });
 const h3gridFeature = /*#__PURE__*/new H3Feature.H3Feature([[50, -15], [80, -33], [80, -67], [50, -85], [20, -67], [20, -33], [50, -15]], {
@@ -2837,7 +2837,7 @@ function getSymbolRenders(symbol, size, features) {
   const featuresToRender = _extends({}, MOCK_FEATURES, features);
 
   if (isSGisPolygonSymbol(symbol)) {
-    return symbol.renderFunctionAsync(featuresToRender.h3grid, resolution, Crs.plain);
+    return symbol.renderFunctionAsync(featuresToRender.polygon, resolution, Crs.plain);
   }
 
   if (isSGisPolylineSymbol(symbol)) {
@@ -2845,7 +2845,7 @@ function getSymbolRenders(symbol, size, features) {
   }
 
   if (isSGisH3Symbol(symbol)) {
-    return symbol.renderFunctionAsync(featuresToRender.polygon, resolution, Crs.plain);
+    return symbol.renderFunctionAsync(featuresToRender.h3grid, resolution, Crs.plain);
   }
 
   return symbol.renderFunctionAsync(featuresToRender.point, resolution, Crs.plain);
@@ -2873,6 +2873,9 @@ function renderSymbolToCanvas(renders, canvas) {
 
 function deserializeSymbol(symbol) {
   switch (symbol.type) {
+    case "h3grid":
+      return deserializeH3Symbol(symbol);
+
     case 'circlePointSymbol':
       return deserializePointSymbol(symbol);
 
@@ -2897,6 +2900,17 @@ function deserializeSymbol(symbol) {
   }
 }
 
+function deserializeH3Symbol(symbol) {
+  var _symbol$stroke, _symbol$stroke2, _symbol$fill;
+
+  return new H3Symbol.H3Symbol(_extends({}, symbol, {
+    cellSize: getParameterValue(symbol.cellSize),
+    strokeWidth: getParameterValue(symbol == null ? void 0 : (_symbol$stroke = symbol.stroke) == null ? void 0 : _symbol$stroke.width),
+    strokeColor: getParameterValue(symbol == null ? void 0 : (_symbol$stroke2 = symbol.stroke) == null ? void 0 : _symbol$stroke2.color),
+    fillColor: getParameterValue(symbol == null ? void 0 : (_symbol$fill = symbol.fill) == null ? void 0 : _symbol$fill.color)
+  }));
+}
+
 function deserializePointSymbol(symbol) {
   // @ts-ignore
   return new Point.PointSymbol(deserializePointSymbolParams(symbol));
@@ -4671,7 +4685,7 @@ const EvergisSelect = _ref => {
 };
 
 var _templateObject$2, _templateObject2$1, _templateObject3$1, _templateObject4$1, _templateObject5$1;
-const LegendContainer = /*#__PURE__*/styled__default.div(_templateObject$2 || (_templateObject$2 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  background-color: #fff;\n\n  canvas {\n    border-radius: 0.125rem;\n  }\n"])));
+const LegendContainer = /*#__PURE__*/styled__default.div(_templateObject$2 || (_templateObject$2 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  background-color: white;\n"])));
 const LegendSectionContainer = /*#__PURE__*/styled__default.div(_templateObject2$1 || (_templateObject2$1 = /*#__PURE__*/_taggedTemplateLiteralLoose([""])));
 const LegendSymbolTitle = /*#__PURE__*/styled__default.p(_templateObject3$1 || (_templateObject3$1 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])));
 const LegendValueContainer = /*#__PURE__*/styled__default.div(_templateObject4$1 || (_templateObject4$1 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  font-size: 0.75rem;\n  padding: 0.125rem 0;\n\n  ", " {\n    padding-left: 0.5rem;\n  }\n"])), LegendSymbolTitle);
@@ -4681,9 +4695,10 @@ const LegendSection = _ref => {
   let {
     item,
     renderLegendTitle,
+    hideTitle,
     children
   } = _ref;
-  return React__default.createElement(LegendSectionContainer, null, React__default.createElement(LegendSectionHeader, null, renderLegendTitle ? renderLegendTitle(item) : item.title), item.values.map(children));
+  return React__default.createElement(LegendSectionContainer, null, !hideTitle && React__default.createElement(LegendSectionHeader, null, renderLegendTitle ? renderLegendTitle(item) : item.title), item.values.map(children));
 };
 
 var _templateObject$3, _templateObject2$2, _templateObject3$2;
@@ -4799,6 +4814,7 @@ const Legend = _ref => {
   }), renderCustomLegend && layer ? renderCustomLegend(layer) : children ? legend && children(legend) : legend && legend.items.map(legendItem => React__default.createElement(LegendSection, {
     key: legendItem.attribute + "-" + legendItem.parameter,
     item: legendItem,
+    hideTitle: (layer == null ? void 0 : layer.alias) === legendItem.title,
     renderLegendTitle: config && config.renderLegendTitle
   }, legendValue => React__default.createElement(LegendValue, {
     key: legendValue.title,
@@ -4940,10 +4956,10 @@ const Fullscreen = () => {
 
 var _templateObject$6, _templateObject2$5, _templateObject3$5, _templateObject4$4, _templateObject5$4, _templateObject6$2, _templateObject7$2, _templateObject8$2, _templateObject9$1, _templateObject10$1, _templateObject11$1;
 const MapLegendControl = /*#__PURE__*/styled__default(MapControl)(_templateObject$6 || (_templateObject$6 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  cursor: default;\n"])));
-const MapLegendContainer = /*#__PURE__*/styled__default.div(_templateObject2$5 || (_templateObject2$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  justify-content: space-between;\n  width: 100%;\n  box-sizing: border-box;\n\n  canvas {\n    height: 1rem;\n    width: 1rem;\n  }\n"])));
-const MapLegendHeader = /*#__PURE__*/styled__default(LegendSectionHeader)(_templateObject3$5 || (_templateObject3$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin-bottom: 0.25rem;\n  font-weight: 500;\n"])));
+const MapLegendContainer = /*#__PURE__*/styled__default.div(_templateObject2$5 || (_templateObject2$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  justify-content: space-between;\n  width: 12.5rem;\n  box-sizing: border-box;\n\n  canvas {\n    height: 1rem;\n    width: 1rem;\n  }\n"])));
+const MapLegendHeader = /*#__PURE__*/styled__default(LegendSectionHeader)(_templateObject3$5 || (_templateObject3$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  max-width: 15rem;\n  margin-bottom: 0.25rem;\n  font-weight: 500;\n"])));
 const MapLegendValueDescr = /*#__PURE__*/styled__default.div(_templateObject4$4 || (_templateObject4$4 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin-bottom: 0.25rem;\n  font-size: 0.75rem;\n  font-weight: 500;\n"])));
-const MapLegendItems = /*#__PURE__*/styled__default.div(_templateObject5$4 || (_templateObject5$4 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 100%;\n  border-radius: 0.125rem;\n  overflow: hidden;\n"])));
+const MapLegendItems = /*#__PURE__*/styled__default.div(_templateObject5$4 || (_templateObject5$4 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  width: 100%;\n  border-radius: 0.125rem;\n"])));
 const MapLegendItem = /*#__PURE__*/styled__default.div(_templateObject6$2 || (_templateObject6$2 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  flex: 1;\n  height: 1rem;\n  background-color: ", ";\n  border: 1px rgba(48, 69, 79, 0.1) solid;\n"])), _ref => {
   let {
     value
@@ -4957,8 +4973,14 @@ const MapLegendValuesOther = /*#__PURE__*/styled__default(MapLegendOther)(_templ
 const MapLegendExpandButton = /*#__PURE__*/styled__default.div(_templateObject11$1 || (_templateObject11$1 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  margin: 0.1rem 0 0.5rem;\n  font-size: 0.625rem;\n  color: #1FB3AA;\n"])));
 
 const getValueFromLegendTitle = (title, minOrMax) => {
-  const result = title == null ? void 0 : title.split(" - ");
-  return minOrMax === "min" ? result == null ? void 0 : result[0] : result == null ? void 0 : result[1];
+  var _title$split;
+
+  if (title.includes(" - ")) {
+    const result = title == null ? void 0 : title.split(" - ");
+    return minOrMax === "min" ? result == null ? void 0 : result[0] : result == null ? void 0 : result[1];
+  }
+
+  return (title == null ? void 0 : (_title$split = title.split(" ")) == null ? void 0 : _title$split[1]) || "";
 };
 
 const MapLegend = _ref => {
@@ -4986,7 +5008,7 @@ const MapLegend = _ref => {
     className: className
   }, React__default.createElement(MapLegendHeader, null, layer == null ? void 0 : layer.alias), React__default.createElement(MapLegendContainer, null, isExpanded ? React__default.createElement(Legend, {
     layer: layer
-  }) : React__default.createElement(React__default.Fragment, null, React__default.createElement(MapLegendValueDescr, null, item.title), React__default.createElement(MapLegendItems, null, item.values.map(value => React__default.createElement(MapLegendItem, {
+  }) : React__default.createElement(React__default.Fragment, null, item.title !== (layer == null ? void 0 : layer.alias) && React__default.createElement(MapLegendValueDescr, null, item.title), React__default.createElement(MapLegendItems, null, item.values.map(value => React__default.createElement(MapLegendItem, {
     key: value.title,
     title: value.title,
     value: value.parameterValue
@@ -5503,7 +5525,6 @@ exports.getDashStylePreset = getDashStylePreset;
 exports.getFeatureSymbol = getFeatureSymbol;
 exports.getLegendSymbolRenders = getLegendSymbolRenders;
 exports.getLineDash = getLineDash;
-exports.getLineMiterRender = getLineMiterRender;
 exports.getMapLegendSymbolRenders = getMapLegendSymbolRenders;
 exports.getMapState = getMapState;
 exports.getParameterValue = getParameterValue;