@evergis/react 2.0.181 → 2.0.183

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

@@ -1,45 +1,37 @@
+import { LineEndingType } from "@evergis/api";
 import { ClassifyAble } from './parameterValue';
 export declare const enum LineMiterSize {
     Small = "small",
     Large = "large"
 }
-export declare enum LineMiterKind {
-    None = "none",
-    Arrow = "arrow",
-    FilledArrow = "filledArrow",
-    Square = "square",
-    FilledSquare = "filledSquare",
-    Circle = "circle",
-    FilledCircle = "filledCircle"
-}
 export declare type NoLineMiterType = {
-    type: LineMiterKind.None;
+    type: LineEndingType.None;
 };
-declare type LineMiterBase<T extends LineMiterKind> = {
+declare type LineMiterBase<T extends LineEndingType> = {
     type: T;
     color?: ClassifyAble<string>;
 };
-export declare type ArrowLineType = LineMiterBase<LineMiterKind.Arrow> & {
+export declare type ArrowLineType = LineMiterBase<LineEndingType.Arrow> & {
     strokeWidth?: number;
     arrowLength?: number;
     arrowWidth?: number;
 };
-export declare type FilledArrowLineMiterType = LineMiterBase<LineMiterKind.FilledArrow> & {
+export declare type FilledArrowLineMiterType = LineMiterBase<LineEndingType.FilledArrow> & {
     arrowLength?: number;
     arrowWidth?: number;
 };
-export declare type SquareLineMiterType = LineMiterBase<LineMiterKind.Square> & {
+export declare type SquareLineMiterType = LineMiterBase<LineEndingType.Square> & {
     size?: number;
     strokeWidth?: number;
 };
-export declare type FilledSquareLineMiterType = LineMiterBase<LineMiterKind.FilledSquare> & {
+export declare type FilledSquareLineMiterType = LineMiterBase<LineEndingType.FilledSquare> & {
     size?: number;
 };
-export declare type CircleLineMiterType = LineMiterBase<LineMiterKind.Circle> & {
+export declare type CircleLineMiterType = LineMiterBase<LineEndingType.Circle> & {
     size?: number;
     strokeWidth?: number;
 };
-export declare type FilledCircleLineMiterType = LineMiterBase<LineMiterKind.FilledCircle> & {
+export declare type FilledCircleLineMiterType = LineMiterBase<LineEndingType.FilledCircle> & {
     size?: number;
 };
 export declare type FilledLineMitters = FilledArrowLineMiterType | FilledSquareLineMiterType | FilledCircleLineMiterType;

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

@@ -1,7 +1,7 @@
-import { ParameterDcColor, ParameterDcDouble } from '@evergis/api';
+import { LineEndingType, ParameterDcColor, ParameterDcDouble } from '@evergis/api';
 import { CalculatedAble, ClassifyAble } from './parameterValue';
 import { Offset } from './offset';
-import { LineMiterKind, LineMiterSize } from './miters';
+import { LineMiterSize } from './miters';
 import { StyleSymbolType } from './symbol';
 import { FillBrushType, StrokeBrushType, TextBackgroundType } from './brush';
 declare type ToClientSymbolField<F, IsClassifyable extends boolean> = F extends ParameterDcDouble ? IsClassifyable extends true ? ClassifyAble<number> : number : F extends ParameterDcColor ? IsClassifyable extends true ? ClassifyAble<string> : string : F;
@@ -12,9 +12,9 @@ declare type ExtraClientSymbolFields = {
     stroke: StrokeBrushType;
     fill: FillBrushType;
     textBackground: TextBackgroundType;
-    beginning: null | LineMiterKind;
+    beginning: null | LineEndingType;
     beginningSize: LineMiterSize;
-    ending: null | LineMiterKind;
+    ending: null | LineEndingType;
     endingSize: LineMiterSize;
     angle: CalculatedAble<number>;
 };

package/dist/react.cjs.development.js

@@ -713,21 +713,11 @@ const isSolidBrush = /*#__PURE__*/symbolTypeGuard('solid');
 const isPolygonHasPatternBrush = symbol => Boolean(symbol && isPolygonSymbol(symbol) && isPatternBrush(symbol.fill));
 const isPolygonHasHatchBrush = symbol => Boolean(symbol && isPolygonSymbol(symbol) && isHatchBrush(symbol.fill));
 
-(function (LineMiterKind) {
-  LineMiterKind["None"] = "none";
-  LineMiterKind["Arrow"] = "arrow";
-  LineMiterKind["FilledArrow"] = "filledArrow";
-  LineMiterKind["Square"] = "square";
-  LineMiterKind["FilledSquare"] = "filledSquare";
-  LineMiterKind["Circle"] = "circle";
-  LineMiterKind["FilledCircle"] = "filledCircle";
-})(exports.LineMiterKind || (exports.LineMiterKind = {}));
-
-const isMiterExist = miter => Boolean(miter && miter.type !== exports.LineMiterKind.None);
-const isFilledLineMitter = miter => miter.type === exports.LineMiterKind.FilledCircle || miter.type === exports.LineMiterKind.FilledArrow || miter.type === exports.LineMiterKind.FilledSquare;
-const isArrowLineMiter = miter => miter.type === exports.LineMiterKind.Arrow || miter.type === exports.LineMiterKind.FilledArrow;
-const isSquareLineMiter = miter => miter.type === exports.LineMiterKind.Square || miter.type === exports.LineMiterKind.FilledSquare;
-const isCircleLineMiter = miter => miter.type === exports.LineMiterKind.Circle || miter.type === exports.LineMiterKind.FilledCircle;
+const isMiterExist = miter => Boolean(miter && miter.type !== api.LineEndingType.None);
+const isFilledLineMitter = miter => miter.type === api.LineEndingType.FilledCircle || miter.type === api.LineEndingType.FilledArrow || miter.type === api.LineEndingType.FilledSquare;
+const isArrowLineMiter = miter => miter.type === api.LineEndingType.Arrow || miter.type === api.LineEndingType.FilledArrow;
+const isSquareLineMiter = miter => miter.type === api.LineEndingType.Square || miter.type === api.LineEndingType.FilledSquare;
+const isCircleLineMiter = miter => miter.type === api.LineEndingType.Circle || miter.type === api.LineEndingType.FilledCircle;
 
 const isSimpleOffset = offset => offset && !isParameterByAttribute(offset[0]) && !isParameterByAttribute(offset[1]);
 const isSymbolWithOffset = symbol => Boolean(symbol && 'offset' in symbol);
@@ -1343,7 +1333,7 @@ let ArrowLineMiterRender = /*#__PURE__*/function (_LineMiterRender) {
   }, {
     key: "createRender",
     value: function createRender(miterRings) {
-      const isFilled = this.kind === exports.LineMiterKind.FilledArrow;
+      const isFilled = this.kind === api.LineEndingType.FilledArrow;
       return new Poly.PolyRender(miterRings, {
         enclosed: isFilled,
         fillColor: isFilled ? this.color : void 0,
@@ -3327,7 +3317,7 @@ let CircleLineMiterRender = /*#__PURE__*/function (_LineMiterRender) {
   }, {
     key: "createRender",
     value: function createRender(miterRings) {
-      const isFilled = this.kind === exports.LineMiterKind.FilledCircle;
+      const isFilled = this.kind === api.LineEndingType.FilledCircle;
       return new Poly.PolyRender(polygonCircleFromPoint(miterRings[0][0], this.miterSize), {
         fillColor: isFilled ? this.color : 'transparent',
         strokeColor: this.color,
@@ -3365,7 +3355,7 @@ let SquareLineMiterRender = /*#__PURE__*/function (_LineMiterRender) {
   }, {
     key: "createRender",
     value: function createRender(miterRings) {
-      const isFilled = this.kind === exports.LineMiterKind.FilledSquare;
+      const isFilled = this.kind === api.LineEndingType.FilledSquare;
       return new Poly.PolyRender(miterRings, {
         enclosed: true,
         fillColor: isFilled ? this.color : void 0,
@@ -3383,16 +3373,16 @@ let SquareLineMiterRender = /*#__PURE__*/function (_LineMiterRender) {
 
 const getLineMiterRender = options => {
   switch (options.kind) {
-    case exports.LineMiterKind.Arrow:
-    case exports.LineMiterKind.FilledArrow:
+    case api.LineEndingType.Arrow:
+    case api.LineEndingType.FilledArrow:
       return new ArrowLineMiterRender(options);
 
-    case exports.LineMiterKind.Square:
-    case exports.LineMiterKind.FilledSquare:
+    case api.LineEndingType.Square:
+    case api.LineEndingType.FilledSquare:
       return new SquareLineMiterRender(options);
 
-    case exports.LineMiterKind.Circle:
-    case exports.LineMiterKind.FilledCircle:
+    case api.LineEndingType.Circle:
+    case api.LineEndingType.FilledCircle:
       return new CircleLineMiterRender(options);
 
     default:
@@ -3485,28 +3475,26 @@ let SGisPolylineSymbol = /*#__PURE__*/function (_sPolylineSymbol) {
       if (!isSimplePolylineSymbol(this.originalSymbol)) return _get(_getPrototypeOf(SGisPolylineSymbol.prototype), "renderFunction", this).call(this, feature, resolution, crs);
       const {
         ending,
-        beginningSize,
-        beginning,
-        endingSize
+        beginning
       } = this.originalSymbol;
       const renders = [];
       const featureCopy = feature.clone();
       const beginningMiterRender = getLineMiterRender({
         color: this.strokeColor,
         // @ts-ignore
-        kind: beginning,
+        kind: beginning.type,
         position: 'left',
         // @ts-ignore
-        size: beginningSize,
+        size: beginning.size,
         strokeWidth: this.strokeWidth
       });
       const endingMiterRender = getLineMiterRender({
         color: this.strokeColor,
         // @ts-ignore
-        kind: ending,
+        kind: ending.type,
         position: 'right',
         // @ts-ignore
-        size: endingSize,
+        size: ending.size,
         strokeWidth: this.strokeWidth
       });