chore: merge conflict resolve
No related branches found
No related tags found
Showing
- src/components/FunctionalArea/Modal/ElementGlyphModal/ElementGlyphModal.component.tsx 1 addition, 1 deletion...a/Modal/ElementGlyphModal/ElementGlyphModal.component.tsx
- src/components/FunctionalArea/Modal/LayerLineFactoryModal/LayerLineEditFactoryModal.component.tsx 4 additions, 2 deletions...rLineFactoryModal/LayerLineEditFactoryModal.component.tsx
- src/components/FunctionalArea/Modal/LayerLineFactoryModal/LayerLineFactory.constants.ts 6 additions, 0 deletions...Modal/LayerLineFactoryModal/LayerLineFactory.constants.ts
- src/components/FunctionalArea/Modal/LayerLineFactoryModal/LayerLineFactory.types.ts 2 additions, 0 deletions...rea/Modal/LayerLineFactoryModal/LayerLineFactory.types.ts
- src/components/FunctionalArea/Modal/LayerLineFactoryModal/LayerLineFactoryModal.component.tsx 5 additions, 2 deletions...LayerLineFactoryModal/LayerLineFactoryModal.component.tsx
- src/components/FunctionalArea/Modal/LayerLineFactoryModal/LayerLineForm.component.tsx 64 additions, 18 deletions...a/Modal/LayerLineFactoryModal/LayerLineForm.component.tsx
- src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx 10 additions, 6 deletions.../Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx
- src/components/Map/MapViewer/MapViewer.constants.ts 7 additions, 1 deletionsrc/components/Map/MapViewer/MapViewer.constants.ts
- src/components/Map/MapViewer/utils/config/commentsLayer/useOlMapCommentsLayer.ts 7 additions, 6 deletions...iewer/utils/config/commentsLayer/useOlMapCommentsLayer.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/elements/BaseMultiPolygon.ts 11 additions, 8 deletions...r/utils/mapElementsRendering/elements/BaseMultiPolygon.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/elements/MapElement.ts 2 additions, 0 deletions...pViewer/utils/mapElementsRendering/elements/MapElement.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/elements/utils/getArrowFeature.ts 33 additions, 3 deletions...ls/mapElementsRendering/elements/utils/getArrowFeature.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/layer/elements/LayerLine.ts 27 additions, 5 deletions...er/utils/mapElementsRendering/layer/elements/LayerLine.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/layer/elements/LayerText.ts 7 additions, 2 deletions...er/utils/mapElementsRendering/layer/elements/LayerText.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/layer/interaction/getModifyLineInteraction.ts 5 additions, 0 deletions...tsRendering/layer/interaction/getModifyLineInteraction.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/reaction/Reaction.ts 2 additions, 2 deletions...MapViewer/utils/mapElementsRendering/reaction/Reaction.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/style/getCoverStyles.ts 4 additions, 0 deletions...Viewer/utils/mapElementsRendering/style/getCoverStyles.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/text/getTextCoords.ts 4 additions, 3 deletions...apViewer/utils/mapElementsRendering/text/getTextCoords.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/text/getWrappedTextWithFontSize.test.ts 1 addition, 1 deletion...ElementsRendering/text/getWrappedTextWithFontSize.test.ts
- src/components/Map/MapViewer/utils/mapElementsRendering/text/getWrappedTextWithFontSize.ts 3 additions, 3 deletions...s/mapElementsRendering/text/getWrappedTextWithFontSize.ts
Loading
Please register or sign in to comment