clean up

Author: mige

src/entity/Billboard/Billboard.tsx

@@ -1,8 +1,6 @@
 import * as React from "react";
 import {useEffect, useRef} from "react";
-import {Billboard as GlobusBillboard, Vec2, Vec3} from "@openglobus/og";
-import {IBillboardParams} from "@openglobus/og/lib/entity/Billboard";
-import {RADIANS} from "@openglobus/og/lib/math";
+import {Billboard as GlobusBillboard, Vec2, Vec3, IBillboardParams} from "@openglobus/og";
 
 export interface BillboardParams extends IBillboardParams {
     name?: string;
@@ -37,7 +35,7 @@ const Billboard: React.FC<BillboardParams> = ({
 
     useEffect(() => {
         if (typeof rotation === 'number' && billboardRef.current) {
-            billboardRef.current?.setRotation(rotation * RADIANS)
+            billboardRef.current?.setRotation(rotation * Math.PI / 180)
         }
     }, [rotation]);
 
@@ -74,7 +72,7 @@ const Billboard: React.FC<BillboardParams> = ({
             src,
             offset,
             visibility,
-            rotation: rotation ? rotation * RADIANS : 0
+            rotation: rotation ? rotation * Math.PI / 180 : 0
         });
         if (billboardRef.current && _addBillboard) {
             _addBillboard(billboardRef.current);

src/entity/GeoObject/GeoObject.tsx

@@ -2,7 +2,6 @@ import * as React from "react";
 import {useEffect, useRef} from "react";
 import {GeoObject as GlobusGeoObject, Vec4} from "@openglobus/og";
 import {IGeoObjectParams} from "@openglobus/og/lib/entity/GeoObject";
-import {RADIANS} from "@openglobus/og/lib/math";
 
 export interface GeoObjectParams extends IGeoObjectParams {
     readonly _addGeoObject?: (geoObject: GlobusGeoObject) => void,

src/entity/Geometry/Geometry.tsx

@@ -1,7 +1,6 @@
 import {useEffect, useRef} from "react";
-import {Geometry as GlobusGeometry, Vec4} from "@openglobus/og";
-import {GeometryTypeEnum, GeometryTypeToCoordinates, IGeometryParams} from "@openglobus/og/lib/entity/Geometry";
-import {htmlColorToRgba} from "@openglobus/og/lib/utils/shared";
+import {Geometry as GlobusGeometry, Vec4, GeometryTypeEnum, GeometryTypeToCoordinates, IGeometryParams} from "@openglobus/og";
+import {utils} from "@openglobus/og";
 
 
 export interface GeometryParamsExtended<T extends keyof typeof GeometryTypeEnum = keyof typeof GeometryTypeEnum> extends Omit<IGeometryParams, 'style'> {
@@ -64,7 +63,7 @@ const Geometry = <T extends keyof typeof GeometryTypeEnum>(params: GeometryParam
             } else if (Array.isArray(fillColor)) {
                 geometryRef.current.setFillColor(...fillColor);
             } else if (typeof fillColor === 'string' && geometryRef.current) {
-                const fillColorVec = htmlColorToRgba(fillColor);
+                const fillColorVec = utils.htmlColorToRgba(fillColor);
                 geometryRef.current.setFillColor4v(fillColorVec);
             }
         }
@@ -77,7 +76,7 @@ const Geometry = <T extends keyof typeof GeometryTypeEnum>(params: GeometryParam
             } else if (Array.isArray(lineColor)) {
                 geometryRef.current.setLineColor(...lineColor);
             } else if (typeof lineColor === 'string' && geometryRef.current) {
-                const lineColorVec = htmlColorToRgba(lineColor);
+                const lineColorVec = utils.htmlColorToRgba(lineColor);
                 geometryRef.current.setLineColor4v(lineColorVec);
             }
         }
@@ -90,7 +89,7 @@ const Geometry = <T extends keyof typeof GeometryTypeEnum>(params: GeometryParam
             } else if (Array.isArray(strokeColor)) {
                 geometryRef.current.setStrokeColor(...strokeColor);
             } else if (typeof strokeColor === 'string' && geometryRef.current) {
-                const strokeColorVec = htmlColorToRgba(strokeColor);
+                const strokeColorVec = utils.htmlColorToRgba(strokeColor);
                 geometryRef.current.setStrokeColor4v(strokeColorVec);
             }
         }

src/entity/Label/Label.tsx

@@ -1,8 +1,6 @@
 import * as React from "react";
 import {useEffect, useRef} from "react";
-import {Label as GlobusLabel, Vec2, Vec3} from "@openglobus/og";
-import {ILabelParams} from "@openglobus/og/lib/entity/Label";
-import {RADIANS} from "@openglobus/og/lib/math";
+import {Label as GlobusLabel, Vec2, Vec3, ILabelParams} from "@openglobus/og";
 
 export interface LabelParams extends ILabelParams {
     name?: string;
@@ -38,7 +36,7 @@ const Label: React.FC<LabelParams> = ({
 
     useEffect(() => {
         if (typeof rotation === 'number' && labelRef.current) {
-            labelRef.current?.setRotation(rotation * RADIANS)
+            labelRef.current?.setRotation(rotation * Math.PI / 180)
         }
     }, [rotation]);
 
@@ -122,7 +120,7 @@ const Label: React.FC<LabelParams> = ({
             opacity,
             offset,
             visibility,
-            rotation: rotation ? rotation * RADIANS : 0
+            rotation: rotation ? rotation * Math.PI / 180 : 0
         });
         if (labelRef.current && _addLabel) {
             _addLabel(labelRef.current);

src/entity/Polyline/Polyline.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import {useEffect, useRef} from "react";
 import {LonLat, Polyline as GlobusPolyline, Vec3} from "@openglobus/og";
 import {IPolylineParams} from "@openglobus/og/lib/entity/Polyline";
-import {htmlColorToRgba} from "@openglobus/og/lib/utils/shared";
+import {utils} from "@openglobus/og";
 
 type CSSColor =
     | 'aliceblue' | 'antiquewhite' | 'aqua' | 'aquamarine' | 'azure'
@@ -70,7 +70,7 @@ const isSegmentPathColorArray = (arr: any): arr is  IPolylineParams['pathColors'
 const convertPathColors = (pathColors: CSSColor[][] | IPolylineParams['pathColors']): IPolylineParams['pathColors'] => {
     if (isCSSColorArray(pathColors)) {
         return pathColors.map(path => path.map((c) => {
-            const vec4Color = htmlColorToRgba(c as CSSColor); // необходимо приведение типа
+            const vec4Color = utils.htmlColorToRgba(c as CSSColor); // необходимо приведение типа
             return [vec4Color.x, vec4Color.y, vec4Color.z, vec4Color.w];
         }));
     }