From 052bcb166dd5e0d175995acb8b9702ea71c00c35 Mon Sep 17 00:00:00 2001
From: "Vink, S.A. (Sjoerd)" <s.a.vink@uu.nl>
Date: Mon, 8 Jul 2024 12:08:27 +0200
Subject: [PATCH] feat(map_nodelink): fixed merge issue
---
libs/shared/lib/vis/visualizations/mapvis/MapSettings.tsx | 2 +-
.../mapvis/components/layers/nodelink-layer/NodeLinkLayer.tsx | 3 ---
libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx | 3 ---
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/libs/shared/lib/vis/visualizations/mapvis/MapSettings.tsx b/libs/shared/lib/vis/visualizations/mapvis/MapSettings.tsx
index 42ceb19ae..7f4245b4c 100644
--- a/libs/shared/lib/vis/visualizations/mapvis/MapSettings.tsx
+++ b/libs/shared/lib/vis/visualizations/mapvis/MapSettings.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { SettingsContainer } from '../../components/config';
import { layerSettings, layerTypes } from './components/layers';
-import { Input } from '../../..';
+import { EntityPill, Input } from '../../..';
import { VisualizationSettingsPropTypes } from '../../common';
import { MapProps } from './mapvis';
import { nodeColorHex } from '../nodelinkvis/components/utils';
diff --git a/libs/shared/lib/vis/visualizations/mapvis/components/layers/nodelink-layer/NodeLinkLayer.tsx b/libs/shared/lib/vis/visualizations/mapvis/components/layers/nodelink-layer/NodeLinkLayer.tsx
index 025c470cc..1a8a8626c 100644
--- a/libs/shared/lib/vis/visualizations/mapvis/components/layers/nodelink-layer/NodeLinkLayer.tsx
+++ b/libs/shared/lib/vis/visualizations/mapvis/components/layers/nodelink-layer/NodeLinkLayer.tsx
@@ -20,9 +20,6 @@ export class NodeLinkLayer extends CompositeLayer<LayerProps> {
const brushingExtension = new BrushingExtension();
const collisionFilter = new CollisionFilterExtension();
- const brushingExtension = new BrushingExtension();
- const collisionFilter = new CollisionFilterExtension();
-
graph.metaData.nodes.labels.map((label: string) => {
layers.push(
new ScatterplotLayer({
diff --git a/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx b/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx
index 3effcce38..e122e2b27 100644
--- a/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx
+++ b/libs/shared/lib/vis/visualizations/mapvis/mapvis.tsx
@@ -15,7 +15,6 @@ export type MapProps = {
lat: string;
lon: string;
enableBrushing: boolean;
- enableBrushing: boolean;
};
const settings: MapProps = {
@@ -24,7 +23,6 @@ const settings: MapProps = {
lat: 'gp_latitude',
lon: 'gp_longitude',
enableBrushing: false,
- enableBrushing: false,
};
const INITIAL_VIEW_STATE = {
@@ -107,7 +105,6 @@ export const MapVis = ({ data, settings, updateSettings, graphMetadata, handleSe
name: 'New layer',
type: layerType,
config: settings,
- config: settings,
visible: true,
});
}, [settings.layer]);
--
GitLab