- {{innerText}}
+
+ {{ innerText }}
diff --git a/src/app/cartography/components/text-editor/text-editor.component.scss b/src/app/cartography/components/text-editor/text-editor.component.scss
index 1b55f51f..575b3600 100644
--- a/src/app/cartography/components/text-editor/text-editor.component.scss
+++ b/src/app/cartography/components/text-editor/text-editor.component.scss
@@ -1,10 +1,10 @@
-.temporaryElement{
- padding-left: 4px;
- width: fit-content;
- position: absolute;
- z-index: 99;
- font-family: 'Noto Sans';
- font-size: 11pt;
- font-weight: bold;
- color: #000000;
+.temporaryElement {
+ padding-left: 4px;
+ width: fit-content;
+ position: absolute;
+ z-index: 99;
+ font-family: 'Noto Sans';
+ font-size: 11pt;
+ font-weight: bold;
+ color: #000000;
}
diff --git a/src/app/cartography/components/text-editor/text-editor.component.spec.ts b/src/app/cartography/components/text-editor/text-editor.component.spec.ts
index 65ac5fdf..89c52c0b 100644
--- a/src/app/cartography/components/text-editor/text-editor.component.spec.ts
+++ b/src/app/cartography/components/text-editor/text-editor.component.spec.ts
@@ -1,4 +1,4 @@
-import { TextEditorComponent } from "./text-editor.component";
+import { TextEditorComponent } from './text-editor.component';
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { DrawingsEventSource } from '../../events/drawings-event-source';
@@ -7,34 +7,29 @@ import { Context } from '../../models/context';
import { Renderer2 } from '@angular/core';
describe('TemporaryTextElementComponent', () => {
- let component: TextEditorComponent;
- let fixture: ComponentFixture
;
+ let component: TextEditorComponent;
+ let fixture: ComponentFixture;
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- imports: [
- NoopAnimationsModule
- ],
- providers: [
- { provide: DrawingsEventSource, useClass: DrawingsEventSource },
- { provide: ToolsService, useClass: ToolsService },
- { provide: Context, useClass: Context },
- { provide: Renderer2, useClass: Renderer2 }
- ],
- declarations: [
- TextEditorComponent
- ]
- })
- .compileComponents();
- }));
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [NoopAnimationsModule],
+ providers: [
+ { provide: DrawingsEventSource, useClass: DrawingsEventSource },
+ { provide: ToolsService, useClass: ToolsService },
+ { provide: Context, useClass: Context },
+ { provide: Renderer2, useClass: Renderer2 }
+ ],
+ declarations: [TextEditorComponent]
+ }).compileComponents();
+ }));
- beforeEach(() => {
- fixture = TestBed.createComponent(TextEditorComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TextEditorComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
- it('should create', () => {
- expect(component).toBeTruthy();
- });
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
});
diff --git a/src/app/cartography/components/text-editor/text-editor.component.ts b/src/app/cartography/components/text-editor/text-editor.component.ts
index ea674e9f..f8b9fa8e 100644
--- a/src/app/cartography/components/text-editor/text-editor.component.ts
+++ b/src/app/cartography/components/text-editor/text-editor.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild, ElementRef, OnInit, Input, EventEmitter, OnDestroy, Renderer2 } from "@angular/core";
+import { Component, ViewChild, ElementRef, OnInit, Input, EventEmitter, OnDestroy, Renderer2 } from '@angular/core';
import { DrawingsEventSource } from '../../events/drawings-event-source';
import { TextAddedDataEvent, TextEditedDataEvent } from '../../events/event-source';
import { ToolsService } from '../../../services/tools.service';
@@ -7,113 +7,134 @@ import { TextElement } from '../../models/drawings/text-element';
import { Context } from '../../models/context';
import { Subscription } from 'rxjs';
-
@Component({
- selector: 'app-text-editor',
- templateUrl: './text-editor.component.html',
- styleUrls: ['./text-editor.component.scss']
+ selector: 'app-text-editor',
+ templateUrl: './text-editor.component.html',
+ styleUrls: ['./text-editor.component.scss']
})
export class TextEditorComponent implements OnInit, OnDestroy {
- @ViewChild('temporaryTextElement') temporaryTextElement: ElementRef;
- @Input('svg') svg: SVGSVGElement;
+ @ViewChild('temporaryTextElement') temporaryTextElement: ElementRef;
+ @Input('svg') svg: SVGSVGElement;
- private leftPosition: string = '0px';
- private topPosition: string = '0px';
- private innerText: string = '';
+ leftPosition: string = '0px';
+ topPosition: string = '0px';
+ innerText: string = '';
- private editingDrawingId: string;
- private editedElement: any;
+ private editingDrawingId: string;
+ private editedElement: any;
- private mapListener: Function;
- private textListener: Function;
- private textAddingSubscription: Subscription;
- public addingFinished = new EventEmitter();
-
- constructor(
- private drawingsEventSource: DrawingsEventSource,
- private toolsService: ToolsService,
- private context: Context,
- private renderer: Renderer2
- ){}
+ private mapListener: Function;
+ private textListener: Function;
+ private textAddingSubscription: Subscription;
+ public addingFinished = new EventEmitter();
- ngOnInit(){
- this.textAddingSubscription = this.toolsService.isTextAddingToolActivated.subscribe((isActive: boolean) => {
- isActive ? this.activateTextAdding() : this.deactivateTextAdding()
- });
+ constructor(
+ private drawingsEventSource: DrawingsEventSource,
+ private toolsService: ToolsService,
+ private context: Context,
+ private renderer: Renderer2
+ ) {}
- this.activateTextEditing();
- }
+ ngOnInit() {
+ this.textAddingSubscription = this.toolsService.isTextAddingToolActivated.subscribe((isActive: boolean) => {
+ isActive ? this.activateTextAdding() : this.deactivateTextAdding();
+ });
- activateTextAdding(){
- let addTextListener = (event: MouseEvent) => {
- this.leftPosition = event.clientX.toString() + 'px';
- this.topPosition = (event.clientY + window.pageYOffset).toString() + 'px';
- this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
- this.temporaryTextElement.nativeElement.focus();
+ this.activateTextEditing();
+ }
- let textListener = () => {
- this.drawingsEventSource.textAdded.emit(new TextAddedDataEvent(this.temporaryTextElement.nativeElement.innerText.replace(/\n$/, ""), event.clientX, event.clientY));
- this.deactivateTextAdding();
- this.innerText = '';
- this.temporaryTextElement.nativeElement.removeEventListener("focusout", this.textListener);
- this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'none');
- }
- this.textListener = textListener;
- this.temporaryTextElement.nativeElement.addEventListener('focusout', this.textListener);
- }
+ activateTextAdding() {
+ let addTextListener = (event: MouseEvent) => {
+ this.leftPosition = event.clientX.toString() + 'px';
+ this.topPosition = (event.clientY + window.pageYOffset).toString() + 'px';
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
+ this.temporaryTextElement.nativeElement.focus();
+ let textListener = () => {
+ this.drawingsEventSource.textAdded.emit(
+ new TextAddedDataEvent(
+ this.temporaryTextElement.nativeElement.innerText.replace(/\n$/, ''),
+ event.clientX,
+ event.clientY
+ )
+ );
this.deactivateTextAdding();
- this.mapListener = addTextListener;
- this.svg.addEventListener('click', this.mapListener as EventListenerOrEventListenerObject);
- }
+ this.innerText = '';
+ this.temporaryTextElement.nativeElement.innerText = '';
+ this.temporaryTextElement.nativeElement.removeEventListener('focusout', this.textListener);
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'none');
+ };
+ this.textListener = textListener;
+ this.temporaryTextElement.nativeElement.addEventListener('focusout', this.textListener);
+ };
- deactivateTextAdding(){
- this.svg.removeEventListener('click', this.mapListener as EventListenerOrEventListenerObject);
- }
+ this.deactivateTextAdding();
+ this.mapListener = addTextListener;
+ this.svg.addEventListener('click', this.mapListener as EventListenerOrEventListenerObject);
+ }
- activateTextEditing(){
- const rootElement = select(this.svg);
+ deactivateTextAdding() {
+ this.svg.removeEventListener('click', this.mapListener as EventListenerOrEventListenerObject);
+ }
- rootElement.selectAll('text.text_element')
- .on("dblclick", (elem, index, textElements) => {
- this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
- this.editedElement = elem;
+ activateTextEditing() {
+ const rootElement = select(this.svg);
- select(textElements[index])
- .attr("visibility", "hidden");
+ rootElement
+ .selectAll('text.text_element')
+ .on('dblclick', (elem, index, textElements) => {
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
+ this.editedElement = elem;
- select(textElements[index])
- .classed("editingMode", true);
+ select(textElements[index]).attr('visibility', 'hidden');
- this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute("drawing_id");
- var transformData = textElements[index].parentElement.getAttribute("transform").split(/\(|\)/);
- var x = Number(transformData[1].split(/,/)[0]) + this.context.getZeroZeroTransformationPoint().x;
- var y = Number(transformData[1].split(/,/)[1]) + this.context.getZeroZeroTransformationPoint().y;
- this.leftPosition = x.toString() + 'px';
- this.topPosition = y.toString() + 'px';
- this.temporaryTextElement.nativeElement.innerText = elem.text;
-
- let listener = () => {
- let innerText = this.temporaryTextElement.nativeElement.innerText;
- this.drawingsEventSource.textEdited.emit(new TextEditedDataEvent(this.editingDrawingId, innerText.replace(/\n$/, ""), this.editedElement));
-
- rootElement.selectAll('text.editingMode')
- .attr("visibility", "visible")
- .classed("editingMode", false);
-
- this.innerText = '';
- this.temporaryTextElement.nativeElement.innerText = '';
- this.temporaryTextElement.nativeElement.removeEventListener("focusout", this.textListener);
+ select(textElements[index]).classed('editingMode', true);
- this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'none');
- };
- this.textListener = listener;
- this.temporaryTextElement.nativeElement.addEventListener("focusout", this.textListener);
- this.temporaryTextElement.nativeElement.focus();
- });
- }
+ this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute('drawing_id');
+ var transformData = textElements[index].parentElement.getAttribute('transform').split(/\(|\)/);
+ var x = Number(transformData[1].split(/,/)[0]) + this.context.getZeroZeroTransformationPoint().x;
+ var y = Number(transformData[1].split(/,/)[1]) + this.context.getZeroZeroTransformationPoint().y;
+ this.leftPosition = x.toString() + 'px';
+ this.topPosition = y.toString() + 'px';
+ this.temporaryTextElement.nativeElement.innerText = elem.text;
- ngOnDestroy(){
- this.textAddingSubscription.unsubscribe();
- }
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'color', elem.fill);
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-family', elem.font_family);
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-size', `${elem.font_size}pt`);
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-weight', elem.font_weight);
+
+ let listener = () => {
+ let innerText = this.temporaryTextElement.nativeElement.innerText;
+ this.drawingsEventSource.textEdited.emit(
+ new TextEditedDataEvent(this.editingDrawingId, innerText.replace(/\n$/, ''), this.editedElement)
+ );
+
+ rootElement
+ .selectAll('text.editingMode')
+ .attr('visibility', 'visible')
+ .classed('editingMode', false);
+
+ this.innerText = '';
+ this.temporaryTextElement.nativeElement.innerText = '';
+ this.temporaryTextElement.nativeElement.removeEventListener('focusout', this.textListener);
+
+ this.clearStyle();
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'none');
+ };
+ this.textListener = listener;
+ this.temporaryTextElement.nativeElement.addEventListener('focusout', this.textListener);
+ this.temporaryTextElement.nativeElement.focus();
+ });
+ }
+
+ ngOnDestroy() {
+ this.textAddingSubscription.unsubscribe();
+ }
+
+ clearStyle() {
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'color', '#000000');
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-family', 'Noto Sans');
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-size', '11pt');
+ this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-weight', 'bold');
+ }
}
diff --git a/src/app/cartography/converters/converter.ts b/src/app/cartography/converters/converter.ts
index 3bf7ea3e..17226eed 100644
--- a/src/app/cartography/converters/converter.ts
+++ b/src/app/cartography/converters/converter.ts
@@ -1,3 +1,3 @@
export interface Converter {
- convert(obj: F): T;
+ convert(obj: F): T;
}
diff --git a/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts b/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts
index 26a7af35..2c43cf80 100644
--- a/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts
+++ b/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts
@@ -1,15 +1,13 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { Drawing } from "../../models/drawing";
-import { MapDrawing } from "../../models/map/map-drawing";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { Drawing } from '../../models/drawing';
+import { MapDrawing } from '../../models/map/map-drawing';
@Injectable()
export class DrawingToMapDrawingConverter implements Converter {
- constructor(
- ) {}
-
+ constructor() {}
+
convert(drawing: Drawing) {
const mapDrawing = new MapDrawing();
mapDrawing.id = drawing.drawing_id;
diff --git a/src/app/cartography/converters/map/label-to-map-label-converter.ts b/src/app/cartography/converters/map/label-to-map-label-converter.ts
index 77a3b2e4..0d1f0095 100644
--- a/src/app/cartography/converters/map/label-to-map-label-converter.ts
+++ b/src/app/cartography/converters/map/label-to-map-label-converter.ts
@@ -1,13 +1,12 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
-import { Converter } from "../converter";
-import { Label } from "../../models/label";
-import { MapLabel } from "../../models/map/map-label";
+import { Converter } from '../converter';
+import { Label } from '../../models/label';
+import { MapLabel } from '../../models/map/map-label';
import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator';
import { CssFixer } from '../../helpers/css-fixer';
import { FontFixer } from '../../helpers/font-fixer';
-
@Injectable()
export class LabelToMapLabelConverter implements Converter {
constructor(
@@ -15,7 +14,7 @@ export class LabelToMapLabelConverter implements Converter {
private cssFixer: CssFixer,
private fontFixer: FontFixer
) {}
- convert(label: Label, paramaters?: {[node_id: string]: string}) {
+ convert(label: Label, paramaters?: { [node_id: string]: string }) {
const mapLabel = new MapLabel();
mapLabel.rotation = label.rotation;
mapLabel.style = label.style;
@@ -33,7 +32,7 @@ export class LabelToMapLabelConverter implements Converter {
const fixedCss = this.cssFixer.fix(mapLabel.style);
const fixedFont = this.fontFixer.fixStyles(fixedCss);
const box = this.fontBBoxCalculator.calculate(mapLabel.text, fixedFont);
-
+
if (mapLabel.x !== null) {
mapLabel.x += 3;
}
diff --git a/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts b/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts
index 794ccc16..66039723 100644
--- a/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts
+++ b/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts
@@ -1,29 +1,26 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { LabelToMapLabelConverter } from "./label-to-map-label-converter";
-import { LinkNode } from "../../../models/link-node";
-import { MapLinkNode } from "../../models/map/map-link-node";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { LabelToMapLabelConverter } from './label-to-map-label-converter';
+import { LinkNode } from '../../../models/link-node';
+import { MapLinkNode } from '../../models/map/map-link-node';
@Injectable()
export class LinkNodeToMapLinkNodeConverter implements Converter {
- constructor(
- private labelToMapLabel: LabelToMapLabelConverter,
- ) {}
-
- convert(linkNode: LinkNode, paramaters?: {[link_id: string]: string}) {
- const mapLinkNode = new MapLinkNode();
- mapLinkNode.nodeId = linkNode.node_id;
- mapLinkNode.adapterNumber = linkNode.adapter_number;
- mapLinkNode.portNumber = linkNode.port_number;
- mapLinkNode.label = this.labelToMapLabel.convert(linkNode.label);
+ constructor(private labelToMapLabel: LabelToMapLabelConverter) {}
- if (paramaters !== undefined) {
- mapLinkNode.linkId = paramaters.link_id;
- mapLinkNode.id = `${mapLinkNode.nodeId}-${mapLinkNode.linkId}`;
- }
+ convert(linkNode: LinkNode, paramaters?: { [link_id: string]: string }) {
+ const mapLinkNode = new MapLinkNode();
+ mapLinkNode.nodeId = linkNode.node_id;
+ mapLinkNode.adapterNumber = linkNode.adapter_number;
+ mapLinkNode.portNumber = linkNode.port_number;
+ mapLinkNode.label = this.labelToMapLabel.convert(linkNode.label);
- return mapLinkNode;
+ if (paramaters !== undefined) {
+ mapLinkNode.linkId = paramaters.link_id;
+ mapLinkNode.id = `${mapLinkNode.nodeId}-${mapLinkNode.linkId}`;
}
+
+ return mapLinkNode;
+ }
}
diff --git a/src/app/cartography/converters/map/link-to-map-link-converter.ts b/src/app/cartography/converters/map/link-to-map-link-converter.ts
index 71c052f4..c2946f08 100644
--- a/src/app/cartography/converters/map/link-to-map-link-converter.ts
+++ b/src/app/cartography/converters/map/link-to-map-link-converter.ts
@@ -1,26 +1,23 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { LinkNodeToMapLinkNodeConverter } from "./link-node-to-map-link-node-converter";
-import { Link } from "../../../models/link";
-import { MapLink } from "../../models/map/map-link";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { LinkNodeToMapLinkNodeConverter } from './link-node-to-map-link-node-converter';
+import { Link } from '../../../models/link';
+import { MapLink } from '../../models/map/map-link';
@Injectable()
export class LinkToMapLinkConverter implements Converter {
- constructor(
- private linkNodeToMapLinkNode: LinkNodeToMapLinkNodeConverter
- ) {}
-
- convert(link: Link) {
- const mapLink = new MapLink();
- mapLink.id = link.link_id;
- mapLink.captureFileName = link.capture_file_name;
- mapLink.captureFilePath = link.capture_file_path;
- mapLink.capturing = link.capturing;
- mapLink.linkType = link.link_type;
- mapLink.nodes = link.nodes.map((linkNode) => this.linkNodeToMapLinkNode.convert(linkNode,{ link_id: link.link_id }));
- mapLink.projectId = link.project_id;
- return mapLink;
- }
+ constructor(private linkNodeToMapLinkNode: LinkNodeToMapLinkNodeConverter) {}
+
+ convert(link: Link) {
+ const mapLink = new MapLink();
+ mapLink.id = link.link_id;
+ mapLink.captureFileName = link.capture_file_name;
+ mapLink.captureFilePath = link.capture_file_path;
+ mapLink.capturing = link.capturing;
+ mapLink.linkType = link.link_type;
+ mapLink.nodes = link.nodes.map(linkNode => this.linkNodeToMapLinkNode.convert(linkNode, { link_id: link.link_id }));
+ mapLink.projectId = link.project_id;
+ return mapLink;
+ }
}
diff --git a/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts b/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts
index 04347c0e..01edbc61 100644
--- a/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts
+++ b/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts
@@ -1,24 +1,23 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { Drawing } from "../../models/drawing";
-import { MapDrawing } from "../../models/map/map-drawing";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { Drawing } from '../../models/drawing';
+import { MapDrawing } from '../../models/map/map-drawing';
@Injectable()
export class MapDrawingToDrawingConverter implements Converter {
- constructor(
- ) {}
-
- convert(mapDrawing: MapDrawing) {
- const drawing = new Drawing();
- drawing.drawing_id = mapDrawing.id;
- drawing.project_id = mapDrawing.projectId;
- drawing.rotation = mapDrawing.rotation;
- drawing.svg = mapDrawing.svg;
- drawing.x = mapDrawing.x;
- drawing.y = mapDrawing.y;
- drawing.z = mapDrawing.z;
- return drawing;
- }
+ constructor() {}
+
+ convert(mapDrawing: MapDrawing) {
+ const drawing = new Drawing();
+ drawing.drawing_id = mapDrawing.id;
+ drawing.project_id = mapDrawing.projectId;
+ drawing.rotation = mapDrawing.rotation;
+ drawing.svg = mapDrawing.svg;
+ drawing.x = mapDrawing.x;
+ drawing.y = mapDrawing.y;
+ drawing.z = mapDrawing.z;
+ drawing.element = mapDrawing.element;
+ return drawing;
+ }
}
diff --git a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts
index 812c3a22..cc1cb9b4 100644
--- a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts
+++ b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts
@@ -7,25 +7,37 @@ import { EllipseElement } from '../../models/drawings/ellipse-element';
import { LineElement } from '../../models/drawings/line-element';
import { TextElement } from '../../models/drawings/text-element';
-
@Injectable()
export class MapDrawingToSvgConverter implements Converter {
- constructor(
- ) {}
+ constructor() {}
- convert(mapDrawing: MapDrawing) {
- let elem = ``;
+ convert(mapDrawing: MapDrawing) {
+ let elem = ``;
- if (mapDrawing.element instanceof RectElement) {
- elem = ``;
- } else if (mapDrawing.element instanceof EllipseElement) {
- elem = ``;
- } else if (mapDrawing.element instanceof LineElement) {
- elem = ``
- } else if (mapDrawing.element instanceof TextElement) {
- elem = `${mapDrawing.element.text}`;
- } else return "";
+ if (mapDrawing.element instanceof RectElement) {
+ elem = ``;
+ } else if (mapDrawing.element instanceof EllipseElement) {
+ elem = ``;
+ } else if (mapDrawing.element instanceof LineElement) {
+ elem = ``;
+ } else if (mapDrawing.element instanceof TextElement) {
+ elem = `${
+ mapDrawing.element.text
+ }`;
+ } else return '';
- return ``;
- }
-}
\ No newline at end of file
+ return ``;
+ }
+}
diff --git a/src/app/cartography/converters/map/map-label-to-label-converter.ts b/src/app/cartography/converters/map/map-label-to-label-converter.ts
index 821eaa54..d6aea518 100644
--- a/src/app/cartography/converters/map/map-label-to-label-converter.ts
+++ b/src/app/cartography/converters/map/map-label-to-label-converter.ts
@@ -1,13 +1,12 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
-import { Converter } from "../converter";
-import { Label } from "../../models/label";
-import { MapLabel } from "../../models/map/map-label";
+import { Converter } from '../converter';
+import { Label } from '../../models/label';
+import { MapLabel } from '../../models/map/map-label';
import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator';
import { CssFixer } from '../../helpers/css-fixer';
import { FontFixer } from '../../helpers/font-fixer';
-
@Injectable()
export class MapLabelToLabelConverter implements Converter {
constructor(
diff --git a/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts b/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts
index 1f8e5c98..7e2f739f 100644
--- a/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts
+++ b/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts
@@ -1,23 +1,20 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { MapLinkNode } from "../../models/map/map-link-node";
-import { MapLabelToLabelConverter } from "./map-label-to-label-converter";
-import { LinkNode } from "../../../models/link-node";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { MapLinkNode } from '../../models/map/map-link-node';
+import { MapLabelToLabelConverter } from './map-label-to-label-converter';
+import { LinkNode } from '../../../models/link-node';
@Injectable()
export class MapLinkNodeToLinkNodeConverter implements Converter {
- constructor(
- private mapLabelToLabel: MapLabelToLabelConverter
- ) {}
-
- convert(mapLinkNode: MapLinkNode) {
- const linkNode = new LinkNode();
- linkNode.node_id = mapLinkNode.nodeId;
- linkNode.adapter_number = mapLinkNode.adapterNumber;
- linkNode.port_number = mapLinkNode.portNumber;
- linkNode.label = this.mapLabelToLabel.convert(mapLinkNode.label);
- return linkNode;
- }
+ constructor(private mapLabelToLabel: MapLabelToLabelConverter) {}
+
+ convert(mapLinkNode: MapLinkNode) {
+ const linkNode = new LinkNode();
+ linkNode.node_id = mapLinkNode.nodeId;
+ linkNode.adapter_number = mapLinkNode.adapterNumber;
+ linkNode.port_number = mapLinkNode.portNumber;
+ linkNode.label = this.mapLabelToLabel.convert(mapLinkNode.label);
+ return linkNode;
+ }
}
diff --git a/src/app/cartography/converters/map/map-link-to-link-converter.ts b/src/app/cartography/converters/map/map-link-to-link-converter.ts
index b892d69f..e7db39dc 100644
--- a/src/app/cartography/converters/map/map-link-to-link-converter.ts
+++ b/src/app/cartography/converters/map/map-link-to-link-converter.ts
@@ -1,26 +1,23 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { MapLinkNodeToLinkNodeConverter } from "./map-link-node-to-link-node-converter";
-import { Link } from "../../../models/link";
-import { MapLink } from "../../models/map/map-link";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { MapLinkNodeToLinkNodeConverter } from './map-link-node-to-link-node-converter';
+import { Link } from '../../../models/link';
+import { MapLink } from '../../models/map/map-link';
@Injectable()
export class MapLinkToLinkConverter implements Converter {
- constructor(
- private mapLinkNodeToMapLinkNode: MapLinkNodeToLinkNodeConverter
- ) {}
+ constructor(private mapLinkNodeToMapLinkNode: MapLinkNodeToLinkNodeConverter) {}
- convert(mapLink: MapLink) {
- const link = new Link();
- link.link_id = mapLink.id;
- link.capture_file_name = mapLink.captureFileName;
- link.capture_file_path = mapLink.captureFilePath;
- link.capturing = mapLink.capturing;
- link.link_type = mapLink.linkType;
- link.nodes = mapLink.nodes.map((mapLinkNode) => this.mapLinkNodeToMapLinkNode.convert(mapLinkNode));
- link.project_id = mapLink.projectId;
- return link;
- }
+ convert(mapLink: MapLink) {
+ const link = new Link();
+ link.link_id = mapLink.id;
+ link.capture_file_name = mapLink.captureFileName;
+ link.capture_file_path = mapLink.captureFilePath;
+ link.capturing = mapLink.capturing;
+ link.link_type = mapLink.linkType;
+ link.nodes = mapLink.nodes.map(mapLinkNode => this.mapLinkNodeToMapLinkNode.convert(mapLinkNode));
+ link.project_id = mapLink.projectId;
+ return link;
+ }
}
diff --git a/src/app/cartography/converters/map/map-node-to-node-converter.ts b/src/app/cartography/converters/map/map-node-to-node-converter.ts
index b2cadb27..492d466b 100644
--- a/src/app/cartography/converters/map/map-node-to-node-converter.ts
+++ b/src/app/cartography/converters/map/map-node-to-node-converter.ts
@@ -1,19 +1,15 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { MapNode } from "../../models/map/map-node";
-import { MapLabelToLabelConverter } from "./map-label-to-label-converter";
-import { MapPortToPortConverter } from "./map-port-to-port-converter";
-import { Node } from "../../models/node";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { MapNode } from '../../models/map/map-node';
+import { MapLabelToLabelConverter } from './map-label-to-label-converter';
+import { MapPortToPortConverter } from './map-port-to-port-converter';
+import { Node } from '../../models/node';
@Injectable()
export class MapNodeToNodeConverter implements Converter {
- constructor(
- private mapLabelToLabel: MapLabelToLabelConverter,
- private mapPortToPort: MapPortToPortConverter
- ) {}
-
+ constructor(private mapLabelToLabel: MapLabelToLabelConverter, private mapPortToPort: MapPortToPortConverter) {}
+
convert(mapNode: MapNode) {
const node = new Node();
node.node_id = mapNode.id;
@@ -29,7 +25,7 @@ export class MapNodeToNodeConverter implements Converter {
node.node_type = mapNode.nodeType;
node.port_name_format = mapNode.portNameFormat;
node.port_segment_size = mapNode.portSegmentSize;
- node.ports = mapNode.ports ? mapNode.ports.map((mapPort) => this.mapPortToPort.convert(mapPort)) : [];
+ node.ports = mapNode.ports ? mapNode.ports.map(mapPort => this.mapPortToPort.convert(mapPort)) : [];
node.project_id = mapNode.projectId;
node.status = mapNode.status;
node.symbol = mapNode.symbol;
diff --git a/src/app/cartography/converters/map/map-port-to-port-converter.ts b/src/app/cartography/converters/map/map-port-to-port-converter.ts
index 0d40fec3..aecd4fde 100644
--- a/src/app/cartography/converters/map/map-port-to-port-converter.ts
+++ b/src/app/cartography/converters/map/map-port-to-port-converter.ts
@@ -1,19 +1,18 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { Port } from "../../../models/port";
-import { MapPort } from "../../models/map/map-port";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { Port } from '../../../models/port';
+import { MapPort } from '../../models/map/map-port';
@Injectable()
export class MapPortToPortConverter implements Converter {
- convert(mapPort: MapPort) {
- const port = new Port();
- port.adapter_number = mapPort.adapterNumber;
- port.link_type = mapPort.linkType;
- port.name = mapPort.name;
- port.port_number = mapPort.portNumber;
- port.short_name = mapPort.shortName;
- return port;
- }
+ convert(mapPort: MapPort) {
+ const port = new Port();
+ port.adapter_number = mapPort.adapterNumber;
+ port.link_type = mapPort.linkType;
+ port.name = mapPort.name;
+ port.port_number = mapPort.portNumber;
+ port.short_name = mapPort.shortName;
+ return port;
+ }
}
diff --git a/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts b/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts
index d48152e1..9503e80b 100644
--- a/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts
+++ b/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts
@@ -1,18 +1,17 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { MapSymbol } from "../../models/map/map-symbol";
-import { Symbol } from "../../../models/symbol";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { MapSymbol } from '../../models/map/map-symbol';
+import { Symbol } from '../../../models/symbol';
@Injectable()
export class MapSymbolToSymbolConverter implements Converter {
- convert(mapSymbol: MapSymbol) {
- const symbol = new Symbol();
- symbol.symbol_id = mapSymbol.id;
- symbol.builtin = mapSymbol.builtin;
- symbol.filename = mapSymbol.filename;
- symbol.raw = mapSymbol.raw;
- return symbol;
- }
+ convert(mapSymbol: MapSymbol) {
+ const symbol = new Symbol();
+ symbol.symbol_id = mapSymbol.id;
+ symbol.builtin = mapSymbol.builtin;
+ symbol.filename = mapSymbol.filename;
+ symbol.raw = mapSymbol.raw;
+ return symbol;
+ }
}
diff --git a/src/app/cartography/converters/map/node-to-map-node-converter.ts b/src/app/cartography/converters/map/node-to-map-node-converter.ts
index 5fa3e558..1a739069 100644
--- a/src/app/cartography/converters/map/node-to-map-node-converter.ts
+++ b/src/app/cartography/converters/map/node-to-map-node-converter.ts
@@ -1,15 +1,14 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
-import { Converter } from "../converter";
-import { MapNode } from "../../models/map/map-node";
-import { Node } from "../../models/node";
-import { LabelToMapLabelConverter } from "./label-to-map-label-converter";
-import { PortToMapPortConverter } from "./port-to-map-port-converter";
+import { Converter } from '../converter';
+import { MapNode } from '../../models/map/map-node';
+import { Node } from '../../models/node';
+import { LabelToMapLabelConverter } from './label-to-map-label-converter';
+import { PortToMapPortConverter } from './port-to-map-port-converter';
import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator';
import { CssFixer } from '../../helpers/css-fixer';
import { FontFixer } from '../../helpers/font-fixer';
-
@Injectable()
export class NodeToMapNodeConverter implements Converter {
constructor(
@@ -19,7 +18,7 @@ export class NodeToMapNodeConverter implements Converter {
private cssFixer: CssFixer,
private fontFixer: FontFixer
) {}
-
+
convert(node: Node) {
const mapNode = new MapNode();
mapNode.id = node.node_id;
@@ -35,7 +34,7 @@ export class NodeToMapNodeConverter implements Converter {
mapNode.nodeType = node.node_type;
mapNode.portNameFormat = node.port_name_format;
mapNode.portSegmentSize = node.port_segment_size;
- mapNode.ports = node.ports.map((port) => this.portToMapPort.convert(port));
+ mapNode.ports = node.ports.map(port => this.portToMapPort.convert(port));
mapNode.projectId = node.project_id;
mapNode.status = node.status;
mapNode.symbol = node.symbol;
@@ -45,17 +44,16 @@ export class NodeToMapNodeConverter implements Converter {
mapNode.y = node.y;
mapNode.z = node.z;
-
if (mapNode.label !== undefined) {
const fixedCss = this.cssFixer.fix(mapNode.label.style);
const fixedFont = this.fontFixer.fixStyles(fixedCss);
const box = this.fontBBoxCalculator.calculate(mapNode.label.text, fixedFont);
if (node.label.x === null || node.label.y === null) {
- mapNode.label.x = node.width / 2. - box.width / 2. + 3;
+ mapNode.label.x = node.width / 2 - box.width / 2 + 3;
mapNode.label.y = -8;
}
}
- return mapNode;
+ return mapNode;
}
}
diff --git a/src/app/cartography/converters/map/port-to-map-port-converter.ts b/src/app/cartography/converters/map/port-to-map-port-converter.ts
index 32fc12bc..8a348ae1 100644
--- a/src/app/cartography/converters/map/port-to-map-port-converter.ts
+++ b/src/app/cartography/converters/map/port-to-map-port-converter.ts
@@ -1,19 +1,18 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { Port } from "../../../models/port";
-import { MapPort } from "../../models/map/map-port";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { Port } from '../../../models/port';
+import { MapPort } from '../../models/map/map-port';
@Injectable()
export class PortToMapPortConverter implements Converter {
- convert(port: Port) {
- const mapPort = new MapPort();
- mapPort.adapterNumber = port.adapter_number;
- mapPort.linkType = port.link_type;
- mapPort.name = port.name;
- mapPort.portNumber = port.port_number;
- mapPort.shortName = port.short_name;
- return mapPort;
- }
+ convert(port: Port) {
+ const mapPort = new MapPort();
+ mapPort.adapterNumber = port.adapter_number;
+ mapPort.linkType = port.link_type;
+ mapPort.name = port.name;
+ mapPort.portNumber = port.port_number;
+ mapPort.shortName = port.short_name;
+ return mapPort;
+ }
}
diff --git a/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts b/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts
index c02f8964..46f1077d 100644
--- a/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts
+++ b/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts
@@ -1,18 +1,17 @@
-import { Injectable } from "@angular/core";
-
-import { Converter } from "../converter";
-import { Symbol } from "../../../models/symbol";
-import { MapSymbol } from "../../models/map/map-symbol";
+import { Injectable } from '@angular/core';
+import { Converter } from '../converter';
+import { Symbol } from '../../../models/symbol';
+import { MapSymbol } from '../../models/map/map-symbol';
@Injectable()
export class SymbolToMapSymbolConverter implements Converter {
- convert(symbol: Symbol) {
- const mapSymbol = new MapSymbol();
- mapSymbol.id = symbol.symbol_id;
- mapSymbol.builtin = symbol.builtin;
- mapSymbol.filename = symbol.filename;
- mapSymbol.raw = symbol.raw;
- return mapSymbol;
- }
+ convert(symbol: Symbol) {
+ const mapSymbol = new MapSymbol();
+ mapSymbol.id = symbol.symbol_id;
+ mapSymbol.builtin = symbol.builtin;
+ mapSymbol.filename = symbol.filename;
+ mapSymbol.raw = symbol.raw;
+ return mapSymbol;
+ }
}
diff --git a/src/app/cartography/converters/styles-to-font-converter.spec.ts b/src/app/cartography/converters/styles-to-font-converter.spec.ts
index 5eda7947..8726a6b1 100644
--- a/src/app/cartography/converters/styles-to-font-converter.spec.ts
+++ b/src/app/cartography/converters/styles-to-font-converter.spec.ts
@@ -1,7 +1,6 @@
-import { Font } from "../models/font";
+import { Font } from '../models/font';
import { StylesToFontConverter } from './styles-to-font-converter';
-
describe('StylesToFontConverter', () => {
let converter: StylesToFontConverter;
@@ -10,15 +9,14 @@ describe('StylesToFontConverter', () => {
});
it('should parse fonts from styles', () => {
- const styles = "font-family: TypeWriter; font-size: 10px; font-weight: bold";
+ const styles = 'font-family: TypeWriter; font-size: 10px; font-weight: bold';
const expectedFont: Font = {
- 'font_family': 'TypeWriter',
- 'font_size': 10,
- 'font_weight': 'bold'
+ font_family: 'TypeWriter',
+ font_size: 10,
+ font_weight: 'bold'
};
expect(converter.convert(styles)).toEqual(expectedFont);
});
-
});
diff --git a/src/app/cartography/converters/styles-to-font-converter.ts b/src/app/cartography/converters/styles-to-font-converter.ts
index 0c2f8826..8ca22442 100644
--- a/src/app/cartography/converters/styles-to-font-converter.ts
+++ b/src/app/cartography/converters/styles-to-font-converter.ts
@@ -1,41 +1,40 @@
import * as csstree from 'css-tree';
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
import { Converter } from './converter';
import { Font } from '../models/font';
-
@Injectable()
export class StylesToFontConverter implements Converter {
convert(styles: string) {
const font: Font = {
- 'font_family': undefined,
- 'font_size': undefined,
- 'font_weight': undefined
+ font_family: undefined,
+ font_size: undefined,
+ font_weight: undefined
};
const ast = csstree.parse(styles, {
- 'context': 'declarationList'
+ context: 'declarationList'
});
- ast.children.forEach((child) => {
+ ast.children.forEach(child => {
if (child.property === 'font-size') {
- child.value.children.forEach((value) => {
+ child.value.children.forEach(value => {
if (value.type === 'Dimension') {
font.font_size = parseInt(value.value);
}
});
}
if (child.property === 'font-family') {
- child.value.children.forEach((value) => {
- if (value.type === "Identifier") {
+ child.value.children.forEach(value => {
+ if (value.type === 'Identifier') {
font.font_family = value.name;
}
});
}
if (child.property === 'font-weight') {
- child.value.children.forEach((value) => {
- if (value.type === "Identifier") {
+ child.value.children.forEach(value => {
+ if (value.type === 'Identifier') {
font.font_weight = value.name;
}
});
diff --git a/src/app/cartography/d3-map.imports.ts b/src/app/cartography/d3-map.imports.ts
index 25aa4e27..ee956b81 100644
--- a/src/app/cartography/d3-map.imports.ts
+++ b/src/app/cartography/d3-map.imports.ts
@@ -19,23 +19,23 @@ import { DrawingWidget } from './widgets/drawing';
import { LabelWidget } from './widgets/label';
export const D3_MAP_IMPORTS = [
- GraphLayout,
- LinksWidget,
- NodesWidget,
- NodeWidget,
- LabelWidget,
- DrawingsWidget,
- DrawingLineWidget,
- SelectionTool,
- MovingTool,
- LayersWidget,
- LinkWidget,
- InterfaceStatusWidget,
- InterfaceLabelWidget,
- EllipseDrawingWidget,
- ImageDrawingWidget,
- LineDrawingWidget,
- RectDrawingWidget,
- TextDrawingWidget,
- DrawingWidget
+ GraphLayout,
+ LinksWidget,
+ NodesWidget,
+ NodeWidget,
+ LabelWidget,
+ DrawingsWidget,
+ DrawingLineWidget,
+ SelectionTool,
+ MovingTool,
+ LayersWidget,
+ LinkWidget,
+ InterfaceStatusWidget,
+ InterfaceLabelWidget,
+ EllipseDrawingWidget,
+ ImageDrawingWidget,
+ LineDrawingWidget,
+ RectDrawingWidget,
+ TextDrawingWidget,
+ DrawingWidget
];
diff --git a/src/app/cartography/datasources/datasource.spec.ts b/src/app/cartography/datasources/datasource.spec.ts
index 27588056..558b50dd 100644
--- a/src/app/cartography/datasources/datasource.spec.ts
+++ b/src/app/cartography/datasources/datasource.spec.ts
@@ -1,17 +1,15 @@
-import { DataSource } from "./datasource";
+import { DataSource } from './datasource';
class Item {
constructor(public id: string, public property1?: string, public property2?: string) {}
}
-
class TestDataSource extends DataSource- {
protected getItemKey(item: Item) {
return item.id;
- };
+ }
}
-
describe('TestDataSource', () => {
let dataSource: TestDataSource;
let data: Item[];
@@ -25,72 +23,65 @@ describe('TestDataSource', () => {
describe('Item can be added', () => {
beforeEach(() => {
- dataSource.add(new Item("test1", "property1"));
+ dataSource.add(new Item('test1', 'property1'));
});
it('item should be in data', () => {
- expect(data).toEqual([new Item("test1", "property1")]);
+ expect(data).toEqual([new Item('test1', 'property1')]);
});
});
-
describe('Item can be added when key duplocates', () => {
beforeEach(() => {
- dataSource.add(new Item("test1", "property1"));
- dataSource.add(new Item("test1", "property2"));
+ dataSource.add(new Item('test1', 'property1'));
+ dataSource.add(new Item('test1', 'property2'));
});
it('item should be in data', () => {
- expect(data).toEqual([new Item("test1", "property2")]);
+ expect(data).toEqual([new Item('test1', 'property2')]);
});
});
describe('Items can be set', () => {
beforeEach(() => {
- dataSource.set([new Item("test1", "property1"), new Item("test2", "property2")]);
+ dataSource.set([new Item('test1', 'property1'), new Item('test2', 'property2')]);
});
it('items should be in data', () => {
- expect(data).toEqual([new Item("test1", "property1"), new Item("test2", "property2")]);
+ expect(data).toEqual([new Item('test1', 'property1'), new Item('test2', 'property2')]);
});
});
describe('Items can be removed', () => {
beforeEach(() => {
- dataSource.set([new Item("test1", "property1"), new Item("test2", "property2")]);
- dataSource.remove(new Item("test1", "property1"));
+ dataSource.set([new Item('test1', 'property1'), new Item('test2', 'property2')]);
+ dataSource.remove(new Item('test1', 'property1'));
});
it('item should not be in data', () => {
- expect(data).toEqual([new Item("test2", "property2")]);
+ expect(data).toEqual([new Item('test2', 'property2')]);
});
});
describe('Item can be updated', () => {
beforeEach(() => {
- dataSource.set([new Item("test1", "property1", "another"), new Item("test2", "property2")]);
- dataSource.update(new Item("test1", "property3"));
+ dataSource.set([new Item('test1', 'property1', 'another'), new Item('test2', 'property2')]);
+ dataSource.update(new Item('test1', 'property3'));
});
it('item should be updated', () => {
- expect(data).toEqual([
- new Item("test1", "property3"),
- new Item("test2", "property2")
- ]);
+ expect(data).toEqual([new Item('test1', 'property3'), new Item('test2', 'property2')]);
});
-
});
describe('Items should be cleared', () => {
beforeEach(() => {
- dataSource.set([new Item("test1", "property1", "another"), new Item("test2", "property2")]);
+ dataSource.set([new Item('test1', 'property1', 'another'), new Item('test2', 'property2')]);
dataSource.clear();
});
it('items should be cleared', () => {
expect(data).toEqual([]);
});
-
});
-
});
diff --git a/src/app/cartography/datasources/datasource.ts b/src/app/cartography/datasources/datasource.ts
index a51819a0..ce5aaf06 100644
--- a/src/app/cartography/datasources/datasource.ts
+++ b/src/app/cartography/datasources/datasource.ts
@@ -1,4 +1,4 @@
-import { BehaviorSubject, Subject } from "rxjs";
+import { BehaviorSubject, Subject } from 'rxjs';
export abstract class DataSource {
protected data: T[] = [];
@@ -20,19 +20,20 @@ export abstract class DataSource {
}
public set(data: T[]) {
- data.forEach((item) => {
+ data.forEach(item => {
const index = this.findIndex(item);
if (index >= 0) {
const updated = Object.assign(this.data[index], item);
this.data[index] = updated;
- }
- else {
+ } else {
this.data.push(item);
}
});
-
- const toRemove = this.data.filter((item) => data.filter((i) => this.getItemKey(i) === this.getItemKey(item)).length === 0);
- toRemove.forEach((item) => this.remove(item));
+
+ const toRemove = this.data.filter(
+ item => data.filter(i => this.getItemKey(i) === this.getItemKey(item)).length === 0
+ );
+ toRemove.forEach(item => this.remove(item));
this.dataChange.next(this.data);
}
diff --git a/src/app/cartography/datasources/drawings-datasource.spec.ts b/src/app/cartography/datasources/drawings-datasource.spec.ts
index 8a5f4fb8..9404dfd6 100644
--- a/src/app/cartography/datasources/drawings-datasource.spec.ts
+++ b/src/app/cartography/datasources/drawings-datasource.spec.ts
@@ -1,6 +1,5 @@
-import { DrawingsDataSource } from "./drawings-datasource";
-import { Drawing } from "../models/drawing";
-
+import { DrawingsDataSource } from './drawings-datasource';
+import { Drawing } from '../models/drawing';
describe('DrawingsDataSource', () => {
let dataSource: DrawingsDataSource;
@@ -16,18 +15,17 @@ describe('DrawingsDataSource', () => {
describe('Drawing can be updated', () => {
beforeEach(() => {
const drawing = new Drawing();
- drawing.drawing_id = "1";
- drawing.project_id = "project1";
+ drawing.drawing_id = '1';
+ drawing.project_id = 'project1';
dataSource.add(drawing);
- drawing.project_id = "project2";
+ drawing.project_id = 'project2';
dataSource.update(drawing);
});
it('project_id should change', () => {
- expect(data[0].drawing_id).toEqual("1");
- expect(data[0].project_id).toEqual("project2");
+ expect(data[0].drawing_id).toEqual('1');
+ expect(data[0].project_id).toEqual('project2');
});
});
-
});
diff --git a/src/app/cartography/datasources/drawings-datasource.ts b/src/app/cartography/datasources/drawings-datasource.ts
index 1eae4e4b..a5f4c67f 100644
--- a/src/app/cartography/datasources/drawings-datasource.ts
+++ b/src/app/cartography/datasources/drawings-datasource.ts
@@ -1,8 +1,7 @@
-import { Injectable } from "@angular/core";
-
-import { DataSource } from "./datasource";
-import { Drawing } from "../models/drawing";
+import { Injectable } from '@angular/core';
+import { DataSource } from './datasource';
+import { Drawing } from '../models/drawing';
@Injectable()
export class DrawingsDataSource extends DataSource {
diff --git a/src/app/cartography/datasources/links-datasource.spec.ts b/src/app/cartography/datasources/links-datasource.spec.ts
index 54453716..107f49e6 100644
--- a/src/app/cartography/datasources/links-datasource.spec.ts
+++ b/src/app/cartography/datasources/links-datasource.spec.ts
@@ -1,6 +1,5 @@
-import { LinksDataSource } from "./links-datasource";
-import { Link } from "../../models/link";
-
+import { LinksDataSource } from './links-datasource';
+import { Link } from '../../models/link';
describe('LinksDataSource', () => {
let dataSource: LinksDataSource;
@@ -16,18 +15,17 @@ describe('LinksDataSource', () => {
describe('Link can be updated', () => {
beforeEach(() => {
const link = new Link();
- link.link_id = "1";
- link.project_id = "project-1";
+ link.link_id = '1';
+ link.project_id = 'project-1';
dataSource.add(link);
- link.project_id = "project-2";
+ link.project_id = 'project-2';
dataSource.update(link);
});
it('project_id should change', () => {
- expect(data[0].link_id).toEqual("1");
- expect(data[0].project_id).toEqual("project-2");
+ expect(data[0].link_id).toEqual('1');
+ expect(data[0].project_id).toEqual('project-2');
});
});
-
});
diff --git a/src/app/cartography/datasources/links-datasource.ts b/src/app/cartography/datasources/links-datasource.ts
index 0c743f11..ee626e19 100644
--- a/src/app/cartography/datasources/links-datasource.ts
+++ b/src/app/cartography/datasources/links-datasource.ts
@@ -1,8 +1,7 @@
-import { Injectable } from "@angular/core";
-
-import { DataSource } from "./datasource";
-import { Link } from "../../models/link";
+import { Injectable } from '@angular/core';
+import { DataSource } from './datasource';
+import { Link } from '../../models/link';
@Injectable()
export class LinksDataSource extends DataSource {
diff --git a/src/app/cartography/datasources/map-datasource.ts b/src/app/cartography/datasources/map-datasource.ts
index 21f9f31b..8fbe3466 100644
--- a/src/app/cartography/datasources/map-datasource.ts
+++ b/src/app/cartography/datasources/map-datasource.ts
@@ -1,9 +1,9 @@
-import { DataSource } from "./datasource";
-import { MapNode } from "../models/map/map-node";
-import { MapLink } from "../models/map/map-link";
-import { MapDrawing } from "../models/map/map-drawing";
-import { MapSymbol } from "../models/map/map-symbol";
-import { Injectable } from "@angular/core";
+import { DataSource } from './datasource';
+import { MapNode } from '../models/map/map-node';
+import { MapLink } from '../models/map/map-link';
+import { MapDrawing } from '../models/map/map-drawing';
+import { MapSymbol } from '../models/map/map-symbol';
+import { Injectable } from '@angular/core';
export interface Indexed {
id: number | string;
@@ -25,4 +25,4 @@ export class MapLinksDataSource extends MapDataSource {}
export class MapDrawingsDataSource extends MapDataSource {}
@Injectable()
-export class MapSymbolsDataSource extends MapDataSource {}
\ No newline at end of file
+export class MapSymbolsDataSource extends MapDataSource {}
diff --git a/src/app/cartography/datasources/nodes-datasource.spec.ts b/src/app/cartography/datasources/nodes-datasource.spec.ts
index 98f3d74b..f0f87fee 100644
--- a/src/app/cartography/datasources/nodes-datasource.spec.ts
+++ b/src/app/cartography/datasources/nodes-datasource.spec.ts
@@ -1,6 +1,5 @@
-import { NodesDataSource } from "./nodes-datasource";
-import { Node } from "../models/node";
-
+import { NodesDataSource } from './nodes-datasource';
+import { Node } from '../models/node';
describe('NodesDataSource', () => {
let dataSource: NodesDataSource;
@@ -16,18 +15,17 @@ describe('NodesDataSource', () => {
describe('Node can be updated', () => {
beforeEach(() => {
const node = new Node();
- node.node_id = "1";
- node.name = "Node 1";
+ node.node_id = '1';
+ node.name = 'Node 1';
dataSource.add(node);
- node.name = "Node 2";
+ node.name = 'Node 2';
dataSource.update(node);
});
it('name should change', () => {
- expect(data[0].node_id).toEqual("1");
- expect(data[0].name).toEqual("Node 2");
+ expect(data[0].node_id).toEqual('1');
+ expect(data[0].name).toEqual('Node 2');
});
});
-
});
diff --git a/src/app/cartography/datasources/nodes-datasource.ts b/src/app/cartography/datasources/nodes-datasource.ts
index f6a5b785..d6277283 100644
--- a/src/app/cartography/datasources/nodes-datasource.ts
+++ b/src/app/cartography/datasources/nodes-datasource.ts
@@ -1,8 +1,7 @@
-import { Injectable } from "@angular/core";
-
-import { Node } from "../models/node";
-import { DataSource } from "./datasource";
+import { Injectable } from '@angular/core';
+import { Node } from '../models/node';
+import { DataSource } from './datasource';
@Injectable()
export class NodesDataSource extends DataSource {
diff --git a/src/app/cartography/datasources/symbols-datasource.spec.ts b/src/app/cartography/datasources/symbols-datasource.spec.ts
index c709b07a..f9d3d461 100644
--- a/src/app/cartography/datasources/symbols-datasource.spec.ts
+++ b/src/app/cartography/datasources/symbols-datasource.spec.ts
@@ -1,6 +1,5 @@
-import { SymbolsDataSource } from "./symbols-datasource";
-import { Symbol } from "../../models/symbol";
-
+import { SymbolsDataSource } from './symbols-datasource';
+import { Symbol } from '../../models/symbol';
describe('SymbolsDataSource', () => {
let dataSource: SymbolsDataSource;
@@ -16,18 +15,17 @@ describe('SymbolsDataSource', () => {
describe('Symbol can be updated', () => {
beforeEach(() => {
const symbol = new Symbol();
- symbol.symbol_id = "1";
- symbol.filename = "test-1";
+ symbol.symbol_id = '1';
+ symbol.filename = 'test-1';
dataSource.add(symbol);
- symbol.filename = "test-2";
+ symbol.filename = 'test-2';
dataSource.update(symbol);
});
it('filename should change', () => {
- expect(data[0].symbol_id).toEqual("1");
- expect(data[0].filename).toEqual("test-2");
+ expect(data[0].symbol_id).toEqual('1');
+ expect(data[0].filename).toEqual('test-2');
});
});
-
});
diff --git a/src/app/cartography/datasources/symbols-datasource.ts b/src/app/cartography/datasources/symbols-datasource.ts
index a00b9492..599b5eb5 100644
--- a/src/app/cartography/datasources/symbols-datasource.ts
+++ b/src/app/cartography/datasources/symbols-datasource.ts
@@ -1,8 +1,7 @@
-import { Injectable } from "@angular/core";
-
-import { DataSource } from "./datasource";
-import { Symbol } from "../../models/symbol";
+import { Injectable } from '@angular/core';
+import { DataSource } from './datasource';
+import { Symbol } from '../../models/symbol';
@Injectable()
export class SymbolsDataSource extends DataSource {
diff --git a/src/app/cartography/events/draggable.ts b/src/app/cartography/events/draggable.ts
index e06237a6..3d39ab13 100644
--- a/src/app/cartography/events/draggable.ts
+++ b/src/app/cartography/events/draggable.ts
@@ -1,6 +1,6 @@
-import { EventEmitter } from "@angular/core";
-import { drag, DraggedElementBaseType } from "d3-drag";
-import { event } from "d3-selection";
+import { EventEmitter } from '@angular/core';
+import { drag, DraggedElementBaseType } from 'd3-drag';
+import { event } from 'd3-selection';
class DraggableEvent {
public x: number;
@@ -10,25 +10,19 @@ class DraggableEvent {
}
export class DraggableStart extends DraggableEvent {
- constructor(
- public datum: T
- ){
+ constructor(public datum: T) {
super();
}
}
export class DraggableDrag extends DraggableEvent {
- constructor(
- public datum: T
- ){
+ constructor(public datum: T) {
super();
}
}
export class DraggableEnd extends DraggableEvent {
- constructor(
- public datum: T
- ){
+ constructor(public datum: T) {
super();
}
}
@@ -73,4 +67,4 @@ export class Draggable {
this.end.emit(evt);
});
}
-}
\ No newline at end of file
+}
diff --git a/src/app/cartography/events/drawings-event-source.ts b/src/app/cartography/events/drawings-event-source.ts
index f2b1f136..fa4d09f5 100644
--- a/src/app/cartography/events/drawings-event-source.ts
+++ b/src/app/cartography/events/drawings-event-source.ts
@@ -1,7 +1,12 @@
-import { Injectable, EventEmitter } from "@angular/core";
-import { DraggedDataEvent, ResizedDataEvent, TextAddedDataEvent, TextEditedDataEvent, AddedDataEvent } from "./event-source";
-import { MapDrawing } from "../models/map/map-drawing";
-
+import { Injectable, EventEmitter } from '@angular/core';
+import {
+ DraggedDataEvent,
+ ResizedDataEvent,
+ TextAddedDataEvent,
+ TextEditedDataEvent,
+ AddedDataEvent
+} from './event-source';
+import { MapDrawing } from '../models/map/map-drawing';
@Injectable()
export class DrawingsEventSource {
@@ -10,7 +15,7 @@ export class DrawingsEventSource {
public selected = new EventEmitter();
public pointToAddSelected = new EventEmitter();
public saved = new EventEmitter();
-
+
public textAdded = new EventEmitter();
public textEdited = new EventEmitter();
public textSaved = new EventEmitter();
diff --git a/src/app/cartography/events/event-source.ts b/src/app/cartography/events/event-source.ts
index 49b6751b..a54e4d5d 100644
--- a/src/app/cartography/events/event-source.ts
+++ b/src/app/cartography/events/event-source.ts
@@ -1,52 +1,32 @@
import { TextElement } from '../models/drawings/text-element';
+import { MapDrawing } from '../models/map/map-drawing';
export class DataEventSource {
- constructor(
- public datum: T,
- public dx: number,
- public dy: number
- ) {}
+ constructor(public datum: T, public dx: number, public dy: number) {}
}
export class DraggedDataEvent extends DataEventSource {}
export class ResizedDataEvent {
- constructor(
- public datum: T,
- public x: number,
- public y: number,
- public width: number,
- public height: number
- ) {}
+ constructor(public datum: T, public x: number, public y: number, public width: number, public height: number) {}
}
export class AddedDataEvent {
- constructor(
- public x: number,
- public y: number
- ) {}
+ constructor(public x: number, public y: number) {}
}
export class ClickedDataEvent {
- constructor(
- public datum: T,
- public x: number,
- public y: number
- ) {}
+ constructor(public datum: T, public x: number, public y: number) {}
}
export class TextAddedDataEvent {
- constructor(
- public savedText: string,
- public x: number,
- public y: number
- ) {}
+ constructor(public savedText: string, public x: number, public y: number) {}
}
export class TextEditedDataEvent {
- constructor(
- public textDrawingId: string,
- public editedText: string,
- public textElement: TextElement
- ) {}
+ constructor(public textDrawingId: string, public editedText: string, public textElement: TextElement) {}
+}
+
+export class DrawingContextMenu {
+ constructor(public event: any, public drawing: MapDrawing) {}
}
diff --git a/src/app/cartography/events/links-event-source.ts b/src/app/cartography/events/links-event-source.ts
index 71d091cd..df1f2981 100644
--- a/src/app/cartography/events/links-event-source.ts
+++ b/src/app/cartography/events/links-event-source.ts
@@ -1,8 +1,7 @@
-import { Injectable, EventEmitter } from "@angular/core";
-import { MapLinkCreated } from "./links";
-import { MapLinkNode } from "../models/map/map-link-node";
-import { DraggedDataEvent } from "./event-source";
-
+import { Injectable, EventEmitter } from '@angular/core';
+import { MapLinkCreated } from './links';
+import { MapLinkNode } from '../models/map/map-link-node';
+import { DraggedDataEvent } from './event-source';
@Injectable()
export class LinksEventSource {
diff --git a/src/app/cartography/events/links.ts b/src/app/cartography/events/links.ts
index a110be62..17dae648 100644
--- a/src/app/cartography/events/links.ts
+++ b/src/app/cartography/events/links.ts
@@ -1,12 +1,11 @@
-import { MapNode } from "../models/map/map-node";
-import { MapPort } from "../models/map/map-port";
-
+import { MapNode } from '../models/map/map-node';
+import { MapPort } from '../models/map/map-port';
export class MapLinkCreated {
constructor(
- public sourceNode: MapNode,
- public sourcePort: MapPort,
- public targetNode: MapNode,
- public targetPort: MapPort
+ public sourceNode: MapNode,
+ public sourcePort: MapPort,
+ public targetNode: MapNode,
+ public targetPort: MapPort
) {}
}
diff --git a/src/app/cartography/events/nodes-event-source.ts b/src/app/cartography/events/nodes-event-source.ts
index 4f7d3c3e..02406606 100644
--- a/src/app/cartography/events/nodes-event-source.ts
+++ b/src/app/cartography/events/nodes-event-source.ts
@@ -1,8 +1,7 @@
-import { Injectable, EventEmitter } from "@angular/core";
-import { DraggedDataEvent, ClickedDataEvent } from "./event-source";
-import { MapNode } from "../models/map/map-node";
-import { MapLabel } from "../models/map/map-label";
-
+import { Injectable, EventEmitter } from '@angular/core';
+import { DraggedDataEvent, ClickedDataEvent } from './event-source';
+import { MapNode } from '../models/map/map-node';
+import { MapLabel } from '../models/map/map-label';
@Injectable()
export class NodesEventSource {
diff --git a/src/app/cartography/events/nodes.ts b/src/app/cartography/events/nodes.ts
index 9e98ac91..1ab79418 100644
--- a/src/app/cartography/events/nodes.ts
+++ b/src/app/cartography/events/nodes.ts
@@ -1,10 +1,7 @@
-import { MapNode } from "../models/map/map-node";
+import { MapNode } from '../models/map/map-node';
class NodeEvent {
- constructor(
- public event: any,
- public node: MapNode
- ) {}
+ constructor(public event: any, public node: MapNode) {}
}
export class NodeClicked extends NodeEvent {}
diff --git a/src/app/cartography/events/resizing.ts b/src/app/cartography/events/resizing.ts
index 7ce2cc1b..adb2f69a 100644
--- a/src/app/cartography/events/resizing.ts
+++ b/src/app/cartography/events/resizing.ts
@@ -1,7 +1,7 @@
export class ResizingEnd {
- public datum: T;
- public x: number;
- public y: number;
- public width: number;
- public height: number;
-}
\ No newline at end of file
+ public datum: T;
+ public x: number;
+ public y: number;
+ public width: number;
+ public height: number;
+}
diff --git a/src/app/cartography/events/selection-event-source.ts b/src/app/cartography/events/selection-event-source.ts
index c97aef44..0acc3c9e 100644
--- a/src/app/cartography/events/selection-event-source.ts
+++ b/src/app/cartography/events/selection-event-source.ts
@@ -1,9 +1,8 @@
-import { Injectable } from "@angular/core";
-import { Subject } from "rxjs";
-import { Rectangle } from "../models/rectangle";
-
+import { Injectable } from '@angular/core';
+import { Subject } from 'rxjs';
+import { Rectangle } from '../models/rectangle';
@Injectable()
export class SelectionEventSource {
public selected = new Subject();
-}
\ No newline at end of file
+}
diff --git a/src/app/cartography/helpers/canvas-size-detector.ts b/src/app/cartography/helpers/canvas-size-detector.ts
index 0efa347a..3d1e71a3 100644
--- a/src/app/cartography/helpers/canvas-size-detector.ts
+++ b/src/app/cartography/helpers/canvas-size-detector.ts
@@ -1,18 +1,17 @@
-import { Injectable } from "@angular/core";
-import { Size } from "../models/size";
-
+import { Injectable } from '@angular/core';
+import { Size } from '../models/size';
@Injectable()
export class CanvasSizeDetector {
- public getOptimalSize(minWidth: number, minHeight: number) {
- let width = document.documentElement.clientWidth;
- let height = document.documentElement.clientHeight;
- if (minWidth > width) {
- width = minWidth;
- }
- if (minHeight > height) {
- height = minHeight;
- }
- return new Size(width, height);
+ public getOptimalSize(minWidth: number, minHeight: number) {
+ let width = document.documentElement.clientWidth;
+ let height = document.documentElement.clientHeight;
+ if (minWidth > width) {
+ width = minWidth;
}
-}
\ No newline at end of file
+ if (minHeight > height) {
+ height = minHeight;
+ }
+ return new Size(width, height);
+ }
+}
diff --git a/src/app/cartography/helpers/css-fixer.spec.ts b/src/app/cartography/helpers/css-fixer.spec.ts
index 6350c48b..1adf7d56 100644
--- a/src/app/cartography/helpers/css-fixer.spec.ts
+++ b/src/app/cartography/helpers/css-fixer.spec.ts
@@ -1,5 +1,4 @@
-
-import { CssFixer } from "./css-fixer";
+import { CssFixer } from './css-fixer';
describe('CssFixer', () => {
let fixer: CssFixer;
@@ -9,22 +8,22 @@ describe('CssFixer', () => {
});
it('should fix font-size', () => {
- const css = "font-size: 10.0;";
- expect(fixer.fix(css)).toEqual("font-size:10.0pt");
+ const css = 'font-size: 10.0;';
+ expect(fixer.fix(css)).toEqual('font-size:10.0pt');
});
it('should not fix font-size when pt unit is defined', () => {
- const css = "font-size: 10.0pt;";
- expect(fixer.fix(css)).toEqual("font-size:10.0pt");
+ const css = 'font-size: 10.0pt;';
+ expect(fixer.fix(css)).toEqual('font-size:10.0pt');
});
it('should not fix font-size when px unit is defined', () => {
- const css = "font-size: 10.0px;";
- expect(fixer.fix(css)).toEqual("font-size:10.0px");
+ const css = 'font-size: 10.0px;';
+ expect(fixer.fix(css)).toEqual('font-size:10.0px');
});
it('should fix font-size with other attributes', () => {
- const css = "font: Verdana; font-size: 10.0;";
- expect(fixer.fix(css)).toEqual("font:Verdana;font-size:10.0pt");
+ const css = 'font: Verdana; font-size: 10.0;';
+ expect(fixer.fix(css)).toEqual('font:Verdana;font-size:10.0pt');
});
});
diff --git a/src/app/cartography/helpers/css-fixer.ts b/src/app/cartography/helpers/css-fixer.ts
index c5a8a226..15eb330d 100644
--- a/src/app/cartography/helpers/css-fixer.ts
+++ b/src/app/cartography/helpers/css-fixer.ts
@@ -1,23 +1,21 @@
import * as csstree from 'css-tree';
-import { Injectable } from "@angular/core";
-
+import { Injectable } from '@angular/core';
@Injectable()
export class CssFixer {
-
public fix(styles: string): string {
const ast = csstree.parse(styles, {
- 'context': 'declarationList'
+ context: 'declarationList'
});
// fixes font-size when unit (pt|px) is not defined
- ast.children.forEach((child) => {
+ ast.children.forEach(child => {
if (child.property === 'font-size') {
- child.value.children.forEach((value) => {
+ child.value.children.forEach(value => {
if (value.type === 'Number') {
const fontSize = value.value.toString();
- if (!(fontSize.indexOf("pt") >= 0 || fontSize.indexOf("px") >= 0)) {
+ if (!(fontSize.indexOf('pt') >= 0 || fontSize.indexOf('px') >= 0)) {
value.value = `${fontSize}pt`;
}
}
diff --git a/src/app/cartography/helpers/default-drawings-factory.ts b/src/app/cartography/helpers/default-drawings-factory.ts
index 197f6d9e..036679b4 100644
--- a/src/app/cartography/helpers/default-drawings-factory.ts
+++ b/src/app/cartography/helpers/default-drawings-factory.ts
@@ -1,4 +1,4 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
import { TextElementFactory } from './drawings-factory/text-element-factory';
import { EllipseElementFactory } from './drawings-factory/ellipse-element-factory';
import { RectangleElementFactory } from './drawings-factory/rectangle-element-factory';
@@ -8,29 +8,29 @@ import { MapDrawing } from '../models/map/map-drawing';
@Injectable()
export class DefaultDrawingsFactory {
- private factory: DrawingElementFactory;
- private availableFactories: {[ key: string]: DrawingElementFactory};
+ private factory: DrawingElementFactory;
+ private availableFactories: { [key: string]: DrawingElementFactory };
- constructor(
- private textElementFactory: TextElementFactory,
- private ellipseElementFactory: EllipseElementFactory,
- private rectangleElementFactory: RectangleElementFactory,
- private lineElementFactory: LineElementFactory
- ){
- this.availableFactories = {
- 'text': this.textElementFactory,
- 'ellipse': this.ellipseElementFactory,
- 'rectangle': this.rectangleElementFactory,
- 'line': this.lineElementFactory
- };
- }
+ constructor(
+ private textElementFactory: TextElementFactory,
+ private ellipseElementFactory: EllipseElementFactory,
+ private rectangleElementFactory: RectangleElementFactory,
+ private lineElementFactory: LineElementFactory
+ ) {
+ this.availableFactories = {
+ text: this.textElementFactory,
+ ellipse: this.ellipseElementFactory,
+ rectangle: this.rectangleElementFactory,
+ line: this.lineElementFactory
+ };
+ }
- getDrawingMock(drawingType: string){
- this.factory = this.availableFactories[drawingType];
+ getDrawingMock(drawingType: string) {
+ this.factory = this.availableFactories[drawingType];
- let mapDrawing = new MapDrawing();
- mapDrawing.element = this.factory.getDrawingElement();
+ let mapDrawing = new MapDrawing();
+ mapDrawing.element = this.factory.getDrawingElement();
- return mapDrawing;
- }
+ return mapDrawing;
+ }
}
diff --git a/src/app/cartography/helpers/drawings-factory/drawing-element-factory.ts b/src/app/cartography/helpers/drawings-factory/drawing-element-factory.ts
index cfbe51cc..75022dfa 100644
--- a/src/app/cartography/helpers/drawings-factory/drawing-element-factory.ts
+++ b/src/app/cartography/helpers/drawings-factory/drawing-element-factory.ts
@@ -1,5 +1,5 @@
import { DrawingElement } from '../../models/drawings/drawing-element';
-export interface DrawingElementFactory{
- getDrawingElement(): DrawingElement;
+export interface DrawingElementFactory {
+ getDrawingElement(): DrawingElement;
}
diff --git a/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts b/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts
index 845ef462..b2b6b7e7 100644
--- a/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts
+++ b/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts
@@ -4,20 +4,19 @@ import { EllipseElement } from '../../models/drawings/ellipse-element';
import { Injectable } from '@angular/core';
@Injectable()
-export class EllipseElementFactory implements DrawingElementFactory{
-
- getDrawingElement(): DrawingElement{
- let ellipseElement = new EllipseElement();
- ellipseElement.fill = "#ffffff";
- ellipseElement.fill_opacity = 1.0;
- ellipseElement.stroke = "#000000";
- ellipseElement.stroke_width = 2;
- ellipseElement.cx = 100;
- ellipseElement.cy = 100;
- ellipseElement.rx = 100;
- ellipseElement.ry = 100;
- ellipseElement.width = 200;
- ellipseElement.height = 200;
- return ellipseElement;
- }
+export class EllipseElementFactory implements DrawingElementFactory {
+ getDrawingElement(): DrawingElement {
+ let ellipseElement = new EllipseElement();
+ ellipseElement.fill = '#ffffff';
+ ellipseElement.fill_opacity = 1.0;
+ ellipseElement.stroke = '#000000';
+ ellipseElement.stroke_width = 2;
+ ellipseElement.cx = 100;
+ ellipseElement.cy = 100;
+ ellipseElement.rx = 100;
+ ellipseElement.ry = 100;
+ ellipseElement.width = 200;
+ ellipseElement.height = 200;
+ return ellipseElement;
+ }
}
diff --git a/src/app/cartography/helpers/drawings-factory/line-element-factory.ts b/src/app/cartography/helpers/drawings-factory/line-element-factory.ts
index 3e176800..e5bf1fb7 100644
--- a/src/app/cartography/helpers/drawings-factory/line-element-factory.ts
+++ b/src/app/cartography/helpers/drawings-factory/line-element-factory.ts
@@ -4,18 +4,17 @@ import { LineElement } from '../../models/drawings/line-element';
import { Injectable } from '@angular/core';
@Injectable()
-export class LineElementFactory implements DrawingElementFactory{
-
- getDrawingElement(): DrawingElement{
- let lineElement = new LineElement();
- lineElement.stroke = "#000000";
- lineElement.stroke_width = 2;
- lineElement.x1 = 0;
- lineElement.x2 = 200;
- lineElement.y1 = 0;
- lineElement.y2 = 0;
- lineElement.width = 100;
- lineElement.height = 0;
- return lineElement;
- }
+export class LineElementFactory implements DrawingElementFactory {
+ getDrawingElement(): DrawingElement {
+ let lineElement = new LineElement();
+ lineElement.stroke = '#000000';
+ lineElement.stroke_width = 2;
+ lineElement.x1 = 0;
+ lineElement.x2 = 200;
+ lineElement.y1 = 0;
+ lineElement.y2 = 0;
+ lineElement.width = 100;
+ lineElement.height = 0;
+ return lineElement;
+ }
}
diff --git a/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts b/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts
index 1db569f9..96ea65fa 100644
--- a/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts
+++ b/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts
@@ -4,16 +4,15 @@ import { RectElement } from '../../models/drawings/rect-element';
import { Injectable } from '@angular/core';
@Injectable()
-export class RectangleElementFactory implements DrawingElementFactory{
-
- getDrawingElement() : DrawingElement {
- let rectElement = new RectElement();
- rectElement.fill = "#ffffff";
- rectElement.fill_opacity = 1.0;
- rectElement.stroke = "#000000";
- rectElement.stroke_width = 2;
- rectElement.width = 200;
- rectElement.height = 100;
- return rectElement;
- }
+export class RectangleElementFactory implements DrawingElementFactory {
+ getDrawingElement(): DrawingElement {
+ let rectElement = new RectElement();
+ rectElement.fill = '#ffffff';
+ rectElement.fill_opacity = 1.0;
+ rectElement.stroke = '#000000';
+ rectElement.stroke_width = 2;
+ rectElement.width = 200;
+ rectElement.height = 100;
+ return rectElement;
+ }
}
diff --git a/src/app/cartography/helpers/drawings-factory/text-element-factory.ts b/src/app/cartography/helpers/drawings-factory/text-element-factory.ts
index 24aeb672..48449a3f 100644
--- a/src/app/cartography/helpers/drawings-factory/text-element-factory.ts
+++ b/src/app/cartography/helpers/drawings-factory/text-element-factory.ts
@@ -4,17 +4,16 @@ import { TextElement } from '../../models/drawings/text-element';
import { Injectable } from '@angular/core';
@Injectable()
-export class TextElementFactory implements DrawingElementFactory{
-
- getDrawingElement(): DrawingElement {
- let textElement = new TextElement();
- textElement.height = 100;
- textElement.width = 100;
- textElement.fill = "#000000";
- textElement.fill_opacity = 0;
- textElement.font_family = "Noto Sans";
- textElement.font_size = 11;
- textElement.font_weight = "bold";
- return textElement;
- }
+export class TextElementFactory implements DrawingElementFactory {
+ getDrawingElement(): DrawingElement {
+ let textElement = new TextElement();
+ textElement.height = 100;
+ textElement.width = 100;
+ textElement.fill = '#000000';
+ textElement.fill_opacity = 0;
+ textElement.font_family = 'Noto Sans';
+ textElement.font_size = 11;
+ textElement.font_weight = 'bold';
+ return textElement;
+ }
}
diff --git a/src/app/cartography/helpers/font-bbox-calculator.spec.ts b/src/app/cartography/helpers/font-bbox-calculator.spec.ts
index 42d295d0..aa608add 100644
--- a/src/app/cartography/helpers/font-bbox-calculator.spec.ts
+++ b/src/app/cartography/helpers/font-bbox-calculator.spec.ts
@@ -1,5 +1,4 @@
-import { FontBBoxCalculator } from "./font-bbox-calculator";
-
+import { FontBBoxCalculator } from './font-bbox-calculator';
describe('FontBBoxCalculator', () => {
let calculator: FontBBoxCalculator;
@@ -9,14 +8,14 @@ describe('FontBBoxCalculator', () => {
});
it('should calculate font width and height', () => {
- const box = calculator.calculate("My text", "font-family:Arial; font-size: 12px; font-weight:bold");
+ const box = calculator.calculate('My text', 'font-family:Arial; font-size: 12px; font-weight:bold');
expect(box.height).toEqual(14);
expect(box.width).toEqual(41.34375);
});
xit('should calculate font width and height for different font', () => {
- const box = calculator.calculate("My text", "font-family:Tahoma; font-size: 14px; font-weight:bold");
+ const box = calculator.calculate('My text', 'font-family:Tahoma; font-size: 14px; font-weight:bold');
expect(box.height).toEqual(15);
expect(box.width).toEqual(46.25);
diff --git a/src/app/cartography/helpers/font-bbox-calculator.ts b/src/app/cartography/helpers/font-bbox-calculator.ts
index cf689e9b..69a6dee7 100644
--- a/src/app/cartography/helpers/font-bbox-calculator.ts
+++ b/src/app/cartography/helpers/font-bbox-calculator.ts
@@ -1,13 +1,13 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
@Injectable()
export class FontBBoxCalculator {
calculate(text: string, styles: string) {
- const element = document.createElement("text");
+ const element = document.createElement('text');
element.innerText = text;
- element.setAttribute("fill", "#00000");
- element.setAttribute("fill-opacity", "0");
- element.setAttribute("style", styles);
+ element.setAttribute('fill', '#00000');
+ element.setAttribute('fill-opacity', '0');
+ element.setAttribute('style', styles);
document.documentElement.appendChild(element);
const bbox = element.getBoundingClientRect();
document.documentElement.removeChild(element);
@@ -15,6 +15,6 @@ export class FontBBoxCalculator {
return {
width: bbox.width,
height: bbox.height
- }
+ };
}
-}
\ No newline at end of file
+}
diff --git a/src/app/cartography/helpers/font-fixer.spec.ts b/src/app/cartography/helpers/font-fixer.spec.ts
index bab7fa33..273b8756 100644
--- a/src/app/cartography/helpers/font-fixer.spec.ts
+++ b/src/app/cartography/helpers/font-fixer.spec.ts
@@ -1,6 +1,5 @@
-import { FontFixer } from "./font-fixer";
-import { Font } from "../models/font";
-
+import { FontFixer } from './font-fixer';
+import { Font } from '../models/font';
describe('FontFixer', () => {
let fixer: FontFixer;
@@ -11,41 +10,41 @@ describe('FontFixer', () => {
it('should fix TypeWriter font and 10px size', () => {
const font: Font = {
- 'font_family': 'TypeWriter',
- 'font_size': 10,
- 'font_weight': 'bold'
+ font_family: 'TypeWriter',
+ font_size: 10,
+ font_weight: 'bold'
};
- expect(fixer.fix(font)).toEqual( {
- 'font_family': 'Noto Sans',
- 'font_size': 11,
- 'font_weight': 'bold'
+ expect(fixer.fix(font)).toEqual({
+ font_family: 'Noto Sans',
+ font_size: 11,
+ font_weight: 'bold'
});
});
it('should not fix other fonts', () => {
const font: Font = {
- 'font_family': 'OtherFont',
- 'font_size': 11,
- 'font_weight': 'bold'
+ font_family: 'OtherFont',
+ font_size: 11,
+ font_weight: 'bold'
};
- expect(fixer.fix(font)).toEqual( {
- 'font_family': 'OtherFont',
- 'font_size': 11,
- 'font_weight': 'bold'
+ expect(fixer.fix(font)).toEqual({
+ font_family: 'OtherFont',
+ font_size: 11,
+ font_weight: 'bold'
});
});
it('should fix TypeWriter font and 10px size in styles', () => {
- const styles = "font-family: TypeWriter; font-size: 10px; font-weight: bold";
+ const styles = 'font-family: TypeWriter; font-size: 10px; font-weight: bold';
- expect(fixer.fixStyles(styles)).toEqual( 'font-family:Noto Sans;font-size:11px;font-weight:bold');
+ expect(fixer.fixStyles(styles)).toEqual('font-family:Noto Sans;font-size:11px;font-weight:bold');
});
it('should fix TypeWriter font and 10px size in styles with quotes', () => {
const styles = 'font-family: "TypeWriter"; font-size: 10px; font-weight: bold';
- expect(fixer.fixStyles(styles)).toEqual( 'font-family:Noto Sans;font-size:11px;font-weight:bold');
+ expect(fixer.fixStyles(styles)).toEqual('font-family:Noto Sans;font-size:11px;font-weight:bold');
});
});
diff --git a/src/app/cartography/helpers/font-fixer.ts b/src/app/cartography/helpers/font-fixer.ts
index b44545f3..0c3c0f2c 100644
--- a/src/app/cartography/helpers/font-fixer.ts
+++ b/src/app/cartography/helpers/font-fixer.ts
@@ -1,16 +1,15 @@
import * as csstree from 'css-tree';
-import { Injectable } from "@angular/core";
-import { Font } from "../models/font";
-
+import { Injectable } from '@angular/core';
+import { Font } from '../models/font';
/**
* GNS3 GUI doesn't update font when cannot find font in user system, this fixer fixes it
*/
@Injectable()
export class FontFixer {
- static DEFAULT_FONT = "TypeWriter";
+ static DEFAULT_FONT = 'TypeWriter';
static DEFAULT_SIZE = 10;
- static REPLACE_BY_FONT = "Noto Sans";
+ static REPLACE_BY_FONT = 'Noto Sans';
static REPLACE_BY_SIZE = 11;
public fix(font: Font): Font {
@@ -22,17 +21,17 @@ export class FontFixer {
}
public fixStyles(styles: string) {
- const ast = csstree.parse(styles, {
- 'context': 'declarationList'
+ const ast = csstree.parse(styles, {
+ context: 'declarationList'
});
let fontFamilyPointer = null;
let fontSizePointer = null;
let isByIdentifier = true;
- ast.children.forEach((child) => {
+ ast.children.forEach(child => {
if (child.property === 'font-family') {
- child.value.children.forEach((value) => {
+ child.value.children.forEach(value => {
if (value.type === 'Identifier') {
fontFamilyPointer = value;
}
@@ -43,7 +42,7 @@ export class FontFixer {
});
}
if (child.property === 'font-size') {
- child.value.children.forEach((value) => {
+ child.value.children.forEach(value => {
if (value.type === 'Dimension') {
fontSizePointer = value;
}
@@ -62,8 +61,8 @@ export class FontFixer {
}
const fixedFont = this.fix({
- 'font_family': fontFamilyValue.split('"').join(''),
- 'font_size': parseInt(fontSizeValue, 10),
+ font_family: fontFamilyValue.split('"').join(''),
+ font_size: parseInt(fontSizeValue, 10)
} as Font);
if (isByIdentifier) {
diff --git a/src/app/cartography/helpers/in-rectangle-helper.spec.ts b/src/app/cartography/helpers/in-rectangle-helper.spec.ts
index 0eed6901..06414819 100644
--- a/src/app/cartography/helpers/in-rectangle-helper.spec.ts
+++ b/src/app/cartography/helpers/in-rectangle-helper.spec.ts
@@ -1,7 +1,5 @@
-import { InRectangleHelper } from "./in-rectangle-helper";
-import { Rectangle } from "../models/rectangle";
-
-
+import { InRectangleHelper } from './in-rectangle-helper';
+import { Rectangle } from '../models/rectangle';
describe('InRectangleHelper', () => {
let inRectangleHelper: InRectangleHelper;
diff --git a/src/app/cartography/helpers/in-rectangle-helper.ts b/src/app/cartography/helpers/in-rectangle-helper.ts
index a4d732b2..98c86239 100644
--- a/src/app/cartography/helpers/in-rectangle-helper.ts
+++ b/src/app/cartography/helpers/in-rectangle-helper.ts
@@ -1,12 +1,12 @@
-import { Injectable } from "@angular/core";
-
-import { Rectangle } from "../models/rectangle";
+import { Injectable } from '@angular/core';
+import { Rectangle } from '../models/rectangle';
@Injectable()
export class InRectangleHelper {
public inRectangle(rectangle: Rectangle, x: number, y: number): boolean {
- return (rectangle.x <= x && x < (rectangle.x + rectangle.width)
- && rectangle.y <= y && y < (rectangle.y + rectangle.height));
+ return (
+ rectangle.x <= x && x < rectangle.x + rectangle.width && rectangle.y <= y && y < rectangle.y + rectangle.height
+ );
}
}
diff --git a/src/app/cartography/helpers/multi-link-calculator-helper.ts b/src/app/cartography/helpers/multi-link-calculator-helper.ts
index d519bfa0..11c5c99e 100644
--- a/src/app/cartography/helpers/multi-link-calculator-helper.ts
+++ b/src/app/cartography/helpers/multi-link-calculator-helper.ts
@@ -1,6 +1,5 @@
-import { Injectable } from "@angular/core";
-import { MapLink } from "../models/map/map-link";
-
+import { Injectable } from '@angular/core';
+import { MapLink } from '../models/map/map-link';
@Injectable()
export class MultiLinkCalculatorHelper {
@@ -8,9 +7,9 @@ export class MultiLinkCalculatorHelper {
public linkTranslation(
distance: number,
- point0: {x: number, y: number},
- point1: {x: number, y: number}): {dx: number, dy: number} {
-
+ point0: { x: number; y: number },
+ point1: { x: number; y: number }
+ ): { dx: number; dy: number } {
const x1_x0 = point1.x - point0.x;
const y1_y0 = point1.y - point0.y;
let x2_x0;
@@ -20,7 +19,7 @@ export class MultiLinkCalculatorHelper {
x2_x0 = 0;
y2_y0 = distance;
} else {
- const angle = Math.atan((x1_x0) / (y1_y0));
+ const angle = Math.atan(x1_x0 / y1_y0);
x2_x0 = -distance * Math.cos(angle);
y2_y0 = distance * Math.sin(angle);
}
@@ -35,14 +34,14 @@ export class MultiLinkCalculatorHelper {
links.forEach((l: MapLink, i: number) => {
const sid = l.source.id;
const tid = l.target.id;
- const key = (sid < tid ? sid + "," + tid : tid + "," + sid);
+ const key = sid < tid ? sid + ',' + tid : tid + ',' + sid;
let idx = 1;
if (!(key in links_from_nodes)) {
links_from_nodes[key] = [i];
} else {
idx = links_from_nodes[key].push(i);
}
- l.distance = (idx % 2 === 0 ? idx * this.LINK_WIDTH : (-idx + 1) * this.LINK_WIDTH);
+ l.distance = idx % 2 === 0 ? idx * this.LINK_WIDTH : (-idx + 1) * this.LINK_WIDTH;
});
}
}
diff --git a/src/app/cartography/helpers/qt-dasharray-fixer.spec.ts b/src/app/cartography/helpers/qt-dasharray-fixer.spec.ts
index 60cabad5..68c488d8 100644
--- a/src/app/cartography/helpers/qt-dasharray-fixer.spec.ts
+++ b/src/app/cartography/helpers/qt-dasharray-fixer.spec.ts
@@ -1,5 +1,4 @@
-import { QtDasharrayFixer } from "./qt-dasharray-fixer";
-
+import { QtDasharrayFixer } from './qt-dasharray-fixer';
describe('QtDashArrayFixer', () => {
let fixer: QtDasharrayFixer;
diff --git a/src/app/cartography/helpers/qt-dasharray-fixer.ts b/src/app/cartography/helpers/qt-dasharray-fixer.ts
index 7f204fe2..54f1ced6 100644
--- a/src/app/cartography/helpers/qt-dasharray-fixer.ts
+++ b/src/app/cartography/helpers/qt-dasharray-fixer.ts
@@ -1,5 +1,5 @@
-import { Injectable } from "@angular/core";
-import { Font } from "../models/font";
+import { Injectable } from '@angular/core';
+import { Font } from '../models/font';
/**
* GNS3 GUI performs mapping from QT styles to SVG dasharray, but styles don't match
diff --git a/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts
index faf21bf8..05f00655 100644
--- a/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts
+++ b/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts
@@ -1,6 +1,5 @@
-import { SvgToDrawingConverter } from "./svg-to-drawing-converter";
-import { TextElement } from "../models/drawings/text-element";
-
+import { SvgToDrawingConverter } from './svg-to-drawing-converter';
+import { TextElement } from '../models/drawings/text-element';
describe('SvgToDrawingHelper', () => {
let svgToDrawingConverter: SvgToDrawingConverter;
@@ -10,19 +9,20 @@ describe('SvgToDrawingHelper', () => {
});
it('should raise Error on empty string', () => {
- expect(() => svgToDrawingConverter.convert("")).toThrowError(Error);
+ expect(() => svgToDrawingConverter.convert('')).toThrowError(Error);
});
it('should raise Error on no children', () => {
- expect(() => svgToDrawingConverter.convert("")).toThrowError(Error);
+ expect(() => svgToDrawingConverter.convert('')).toThrowError(Error);
});
it('should raise Error on unknown parser', () => {
- expect(() => svgToDrawingConverter.convert("")).toThrowError(Error);
+ expect(() => svgToDrawingConverter.convert('')).toThrowError(Error);
});
it('should parse width and height if defined', () => {
- const svg = '