@smarterplan/ngx-smarterplan-locations 0.2.44 → 0.2.45

package/src/lib/components/zones/add-zone/add-zone.component.ts

@@ -1,377 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import {
-  FormGroup,
-  FormBuilder,
-  Validators,
-  AbstractControl,
-  ValidatorFn,
-  ValidationErrors,
-} from '@angular/forms';
-import {
-  Zone,
-  Plan,
-  Layer,
-  ZoneService,
-  LayerService,
-  BaseUserService,
-  NavigationService,
-} from '@smarterplan/ngx-smarterplan-core';
-@Component({
-  selector: 'lib-add-zone',
-  templateUrl: './add-zone.component.html',
-  styleUrls: ['./add-zone.component.scss'],
-})
-export class AddZoneComponent implements OnInit {
-  @Input() zoneEdit: Zone;
-
-  @Input() spaceID: string;
-
-  @Input() images360: { path: string; filename: string }[];
-
-  @Input() navigationIDs: string[];
-
-  @Input() zones: Zone[];
-
-  @Input() newZoneDataFromEditor: any;
-
-  @Output() updatedZone = new EventEmitter<any>();
-
-  @Input() chosenPlan: Plan;
-
-  @Input() isMuseumVisit: boolean = false;
-
-  @Input() defaultZone: Zone;
-
-  parentZones: Zone[] = [];
-
-  carouselIsVisible = false;
-
-  zoneForm: FormGroup;
-
-  isSubmitted = false;
-
-  currentScanShowing: number;
-
-  chosenScans: number[] = [];
-
-  layers: Layer[];
-
-  fromPlan: boolean = false;
-
-  chosenScansOnPlan: string[] = [];
-
-  currentOrgId: string;
-
-  zoneInitialNavCount = 0;
-
-  zoneIsMatterportFloor = false;
-
-  multipleFloors = false;
-
-  constructor(
-    private fb: FormBuilder,
-    private zoneService: ZoneService,
-    private layerService: LayerService,
-    private userService: BaseUserService,
-    private navigationService: NavigationService
-  ) {}
-
-  async ngOnInit() {
-    this.parentZones = this.zones.filter(
-      (zone) => zone.layer && zone.layer.name === 'FLOOR'
-    );
-    if (!this.defaultZone) {
-      this.defaultZone = this.getDefaultZone();
-    }
-    this.parentZones.unshift(this.defaultZone);
-    await this.updateLayers();
-    this.initZoneForm();
-  }
-
-  async updateLayers() {
-    this.currentOrgId = this.userService.currentOrganisation(this.spaceID).id;
-    const layers = await this.layerService.getLayerForOrganisation(
-      this.currentOrgId
-    );
-    // filter out layers created by the system
-    this.layers = layers.filter(
-      (l) => l.name !== 'BUILDING' && l.name !== 'FLOOR'
-    );
-  }
-
-  async initZoneForm() {
-    if (this.zoneEdit) {
-      if (this.zoneEdit.metadata) {
-        const metadata = JSON.parse(this.zoneEdit.metadata);
-        this.zoneIsMatterportFloor = metadata.hasOwnProperty(
-          'matterportFloorSequence'
-        );
-      }
-      const isVirtual = this.zoneService.zoneIsVirtual(this.zoneEdit);
-      if (!isVirtual) {
-        await this.loadNavigations();
-      }
-      this.isMuseumVisit = this.zoneEdit.isMuseumVisitZone === true;
-      this.multipleFloors = this.zoneEdit.isMultipleFloorZone === true;
-      this.zoneForm = this.fb.group({
-        id: this.zoneEdit.id,
-        name: [this.zoneEdit.name, [Validators.required]],
-        code_ref: this.zoneEdit.code_ref ? this.zoneEdit.code_ref : null,
-        layerID: this.zoneEdit.layer ? this.zoneEdit.layer.id : null,
-        surface: this.zoneEdit.surface ? this.zoneEdit.surface : 0,
-        parentID: this.zoneEdit.parentID,
-        parent: { value: this.zoneEdit.parent.name, disabled: true },
-        newLayer: [null, [this.layerNameValidator()]],
-        isMuseumVisitZone: this.isMuseumVisit,
-        startSweepID: this.zoneEdit.startSweepID,
-      });
-      this.onChangeMultipleFloors();
-    } else {
-      this.zoneForm = this.fb.group({
-        name: [
-          this.newZoneDataFromEditor ? this.newZoneDataFromEditor.name : '',
-          [Validators.required],
-        ],
-        code_ref: null,
-        layerID: null,
-        surface: 0,
-        parentID: this.defaultZone.id,
-        newLayer: [null, [this.layerNameValidator()]],
-        isMuseumVisitZone: this.isMuseumVisit,
-        startSweepID: null,
-      });
-    }
-  }
-
-  async onSubmitZone() {
-    this.isSubmitted = true;
-    if (!this.zoneForm.valid) {
-      return;
-    }
-    const formValue = this.zoneForm.getRawValue(); //because we need values of disables controls as well
-    if (formValue.newLayer) {
-      await this.createLayer(formValue.newLayer).then((layer) => {
-        formValue.layerID = layer.id;
-      });
-    }
-
-    const zoneInput = {
-      name: formValue.name,
-      surface: Math.round(formValue.surface * 100) / 100,
-      spaceID: this.spaceID,
-      layerID: formValue.layerID,
-      parentID: formValue.parentID,
-      isMuseumVisitZone: this.isMuseumVisit,
-      isMultipleFloorZone: this.multipleFloors,
-      sweepIDs: [],
-      startSweepID: formValue.startSweepID,
-    } as Zone;
-
-    if (formValue.code_ref) {
-      zoneInput.code_ref = formValue.code_ref;
-    }
-
-    try {
-      this.zoneForm = null;
-      this.isSubmitted = false;
-      if (this.zoneEdit) {
-        const zoneUpdate = zoneInput;
-        zoneUpdate.sweepIDs = this.zoneEdit.sweepIDs;
-        zoneUpdate.id = formValue.id;
-        await this.setSweepsAndNodeForZoneInput(zoneUpdate);
-        await this.zoneService.updateZone(zoneUpdate);
-        this.zoneEdit = null;
-        this.updatedZone.emit(zoneUpdate.id);
-      } else {
-        await this.setSweepsAndNodeForZoneInput(zoneInput);
-        if (!zoneInput.parentID) {
-          // set building as parent
-          zoneInput.parentID = this.defaultZone.id;
-        }
-        await this.zoneService.create(zoneInput).then((zoneCreated) => {
-          this.updatedZone.emit(zoneCreated.id);
-        });
-      }
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  onCancel() {
-    this.isSubmitted = false;
-    this.zoneForm = null;
-    this.chosenScansOnPlan = [];
-    this.chosenScans = [];
-    this.updatedZone.emit(false);
-  }
-
-  get name(): AbstractControl {
-    return this.zoneForm.get('name');
-  }
-
-  get newLayer(): AbstractControl {
-    return this.zoneForm.get('newLayer');
-  }
-
-  toggleCarousel() {
-    this.carouselIsVisible = true;
-    this.chosenScansOnPlan = [];
-  }
-
-  togglePlan() {
-    this.fromPlan = true;
-    this.chosenScans = [];
-  }
-
-  onAddScan() {
-    if (!this.chosenScans.includes(this.currentScanShowing)) {
-      // console.log("adding scan", this.currentScanShowing);
-      this.chosenScans.push(this.currentScanShowing);
-    } else {
-      alert('Scan already added!');
-    }
-  }
-
-  onRemoveScanImage(scan: any) {
-    const index = this.chosenScans.indexOf(scan);
-    this.chosenScans.splice(index, 1);
-  }
-
-  onRemoveScanPlan(scan: any) {
-    const index = this.chosenScansOnPlan.indexOf(scan);
-    this.chosenScansOnPlan.splice(index, 1);
-  }
-
-  async setSweepsAndNodeForZoneInput(zoneInput: Zone) {
-    if (
-      this.chosenScans.length > 0 &&
-      this.chosenScans.length !== this.zoneInitialNavCount &&
-      !this.fromPlan
-    ) {
-      // if we chose scans from the carousel
-      const sweepIDs: string[] = [];
-      this.chosenScans.map(async (scan) => {
-        const imageUuid = this.images360[scan].filename.split('_')[0];
-        const sweepID = this.navigationIDs.find((nav) => {
-          return nav.includes(imageUuid);
-        });
-        if (sweepID) {
-          sweepIDs.push(sweepID);
-        }
-      });
-      zoneInput.sweepIDs = sweepIDs;
-    } else {
-      // we are not coming from gallery choice
-      if (this.chosenScansOnPlan.length > 0) {
-        zoneInput.sweepIDs = this.chosenScansOnPlan;
-      }
-    }
-
-    if (zoneInput.sweepIDs && zoneInput.sweepIDs.length > 0) {
-      const navForSweep =
-        await this.navigationService.getNavigationsForMatterportIDForSpace(
-          zoneInput.sweepIDs[0],
-          this.spaceID
-        );
-      zoneInput.nodeIDs = [navForSweep[0].nodeID];
-    }
-  }
-
-  async createLayer(name: string): Promise<Layer> {
-    return this.layerService.createLayerForOrganisation(
-      name,
-      this.currentOrgId
-    );
-  }
-
-  async loadNavigations(): Promise<any> {
-    if (this.zoneEdit.sweepIDs.length > 0) {
-      this.zoneInitialNavCount = this.zoneEdit.sweepIDs.length;
-      const navList: number[] = [];
-      const scansZoneEdit: string[] = [];
-      await Promise.all(
-        this.zoneEdit.sweepIDs.map(async (sweepID: string) => {
-          scansZoneEdit.push(sweepID);
-          const index = this.images360.findIndex((im) => {
-            return im.filename.includes(sweepID.slice(0, 8));
-          });
-          if (index !== -1) {
-            navList.push(index);
-          }
-        })
-      );
-      this.chosenScans = navList;
-      this.chosenScansOnPlan = scansZoneEdit;
-      return Promise.resolve();
-    }
-    return Promise.resolve();
-  }
-
-  // iniPlanForDraw() {
-  //     this.togglePlan();
-  //     setTimeout(() => {
-  //         this.onPlanClick();
-  //     }, 500);
-  // }
-
-  /**
-   * Adds all sweeps of the space
-   */
-  onAddAll() {
-    const defaultZone = this.getDefaultZone();
-    if (defaultZone) {
-      this.chosenScansOnPlan = defaultZone.sweepIDs;
-      this.zoneForm.get('parentID').setValue(defaultZone.id);
-      this.zoneForm.get('parentID').disable();
-      this.multipleFloors = true;
-    }
-  }
-
-  getDefaultZone(): Zone {
-    return this.zones.find(
-      (zone) =>
-        zone.layer &&
-        zone.layer.name === 'BUILDING' &&
-        zone.sweepIDs &&
-        zone.sweepIDs.length > 0
-    );
-  }
-  /**
-   * Multiple floors
-   */
-  onChangeMultipleFloors() {
-    if (this.multipleFloors) {
-      const defaultZone = this.getDefaultZone();
-      if (defaultZone) {
-        this.zoneForm.get('parentID').setValue(defaultZone.id);
-        this.zoneForm.get('parentID').disable();
-      }
-    } else {
-      this.zoneForm.get('parentID').enable();
-    }
-  }
-
-  onSelectedSweepsFromPlan(result: { sweeps: string[]; startSweepID: string }) {
-    if (result) {
-      if (result.sweeps) {
-        this.chosenScansOnPlan = result.sweeps;
-      }
-      if (result.startSweepID) {
-        this.zoneForm.controls.startSweepID.setValue(result.startSweepID);
-      }
-    }
-    this.fromPlan = false;
-  }
-
-  layerNameValidator(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      if (!control.value) {
-        return null;
-      }
-      const forbidden = this.layers
-        .map((l) => l.name.toLowerCase())
-        .includes(control.value.toLowerCase());
-      return forbidden ? { forbiddenName: { value: control.value } } : null;
-    };
-  }
-}

package/src/lib/components/zones/add-zone/selection/selection.component.html

@@ -1,3 +0,0 @@
-<ng-content></ng-content>
-
-<div id="selection"></div>

package/src/lib/components/zones/add-zone/selection/selection.component.scss

@@ -1,16 +0,0 @@
-#selection{
-    will-change: top, left, width, height;
-    top: 0px; 
-    left: 0px; 
-    position: fixed; 
-    display: block; 
-    margin-top: 0px; 
-    margin-left: 0px; 
-    width: 0px; 
-    height: 0px;
-
-    background: rgb(83 182 187 / 0.3);
-    border-radius: 0.15em;
-    border: 0.15em solid rgb(83 182 187 / 0.8);
-    pointer-events: none;
-}

package/src/lib/components/zones/add-zone/selection/selection.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectionComponent } from './selection.component';
-
-describe('SelectionComponent', () => {
-  let component: SelectionComponent;
-  let fixture: ComponentFixture<SelectionComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SelectionComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

package/src/lib/components/zones/add-zone/selection/selection.component.ts

@@ -1,95 +0,0 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { Rectangle } from '../../../../helper.service';
-
-@Component({
-  selector: 'lib-selection',
-  templateUrl: './selection.component.html',
-  styleUrls: ['./selection.component.scss']
-})
-export class SelectionComponent implements OnInit {
-    constructor(){}
-
-    /**Emit a new selection */
-    @Output() onSelectionChanged = new EventEmitter<Rectangle>();
-
-    /**Zone wich you can use a selection inside, must have the class ".selectZone" */
-    selectionableZone : HTMLElement;
-
-    /**HtmlElement use to display the selected zone (blue) */
-    selectionElement : HTMLElement;
-
-    isMousedown : boolean = false;
-
-    selection = {startX: 0, startY: 0, endX: 0, endY: 0};
-
-    selectionRectangle : Rectangle = {top : 0, left: 0, width: 0, height: 0};
-
-    ngOnInit(): void {
-        this.selectionableZone = document.querySelector(".selectZone");
-
-        this.selectionElement = document.querySelector("#selection");
-
-        this.selectionableZone.addEventListener("mousedown",this.mousedown.bind(this));
-
-        this.selectionableZone.addEventListener("mousemove",this.mousemove.bind(this));
-
-        this.selectionableZone.addEventListener("mouseup",this.mouseup.bind(this));
-    }
-    
-    /**
-     * Update the current selection
-     * Will update the selectionRectangle and Selection HTML element
-     * @param shouldEmit if true an event will be emitted through onSelectionChanged (true by default)
-     */
-    updateSelectionElement(shouldEmit=true){
-        this.selectionRectangle.width = Math.abs(this.selection.endX - this.selection.startX);
-        this.selectionRectangle.height = Math.abs(this.selection.endY - this.selection.startY);
-        this.selectionRectangle.top = Math.min(this.selection.endY, this.selection.startY);
-        this.selectionRectangle.left = Math.min(this.selection.endX, this.selection.startX);
-
-        this.selectionElement.style.top = `${this.selectionRectangle.top}px`;
-        this.selectionElement.style.left = `${this.selectionRectangle.left}px`;
-        this.selectionElement.style.width = `${this.selectionRectangle.width}px`;
-        this.selectionElement.style.height = `${this.selectionRectangle.height}px`;
-
-        if(shouldEmit){
-            this.onSelectionChanged.emit(this.selectionRectangle);
-        }
-    }
-
-    /**
-     * Trigger when mouse is press down on selectionableZone
-     * @param event 
-     */
-    mousedown(event : MouseEvent){
-        if(event.button !== 2){ /**Selection with the right click, so ignore all other event */
-            return;
-        }
-        this.isMousedown = true;
-        this.selection = {startY : event.clientY, startX : event.clientX, endX:event.clientX, endY:event.clientY};
-        this.updateSelectionElement();        
-    }
-
-    /**
-     * Trigger when mouse is release on selectionableZone
-     * @param event 
-     */
-    mouseup(event : MouseEvent){
-        this.isMousedown = false;
-        this.selection = {startX :0, startY : 0, endX:0, endY:0};
-        this.updateSelectionElement(false);        
-    }
-
-    /**
-     * Trigger when mouse is moving on selectionableZone
-     * @param event 
-     */
-    mousemove(event : MouseEvent){
-        if(this.isMousedown){
-            this.selection.endX = event.clientX;
-            this.selection.endY = event.clientY;
-            this.updateSelectionElement();
-        }
-    }
-
-}

package/src/lib/components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component.html

@@ -1,73 +0,0 @@
-<div ngbDropdown class="sp-row d-inline-block">
-    <div class="col-sm-3" *ngIf="plans">
-            <button type="button" class="btn btn-label-file rounded-pill" id="dropdownBasic1"
-                ngbDropdownToggle>{{chosenPlan ?
-                chosenPlan.name : ('Choose Plan' | translate) }}</button>
-            <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                <button type="button" ngbDropdownItem *ngFor="let plan of plans" (click)="onPlanClick(plan)"
-                    [disabled]="!plan.calibration">{{ plan.name }}
-                </button>
-            </div>
-    </div>
-</div>
-<div class="sp-row">
-    <lib-selection class="col-md-8" (onSelectionChanged)="onSelectionChanged($event)">
-        <lib-plan-legend [isAudioZone]="editingAudioZone" *ngIf="buttonElements.length > 0"></lib-plan-legend>
-        <div class="selectZone" oncontextmenu="return false;">
-            <div class="sp-row">
-                <div style="overflow: hidden;width:100%;">
-                    <div style="height: 400px; width: 100%;" id="planDiv">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </lib-selection>
-    
-    <div class="col-md-4 scanTool" *ngIf="buttonElements.length > 0">
-        <div class="sp-row d-inline-block">
-            <h2>{{'selectTool.title' | translate}}</h2>
-            <div class="protip">{{'selectTool.tip' | translate}}.</div>
-        </div>
-    
-        <div class="sp-row">
-            <div class="col-3" style="padding:0px">
-                <label class="tool-label" for="scanSize">{{'selectTool.size' | translate}}</label>
-            </div>
-            <div class="col-9">
-                <input type="range" class="form-range" min="0.001" max="5" step="0.01" value="1"
-                    id="scanSize" (input)="onChangeScanSize($event)">
-            </div>
-        </div>
-    
-        <div class="sp-row">
-            <button class="btn btn-primary rounded-pill" (click)="onSelectAll()">{{'selectTool.selectAll' | translate}}</button>
-        </div>
-    
-        <div *ngIf="buttonsInSelection.length > 0" class="edit-selected">
-            <span class="tool-label">{{'selectTool.edit' | translate}} : </span>
-            <div class="sp-row">
-                <button class="btn rounded-pill btn-primary ms-3 me-2" (click)="onSelectionAdd()">{{'selectTool.add' | translate}}</button>
-                <button class="btn btn-primary rounded-pill" (click)="onSelectionRemove()">{{'selectTool.undo' | translate}}</button>
-            </div>
-        </div>
-
-        <div class="sp-row">
-            <div *ngIf="multipleFloors"> 
-                {{ chosenSweepsPerFloor.get(chosenPlan.zoneID) ? chosenSweepsPerFloor.get(chosenPlan.zoneID).length : "0"}} {{'scan points selected on this floor' | translate}} 
-                <button class="btn btn-primary rounded-pill" (click)="onValidateForFloor()" [disabled]="!selectionChanged">{{'Update selection for this floor' | translate}}</button>
-            </div>
-            <div *ngIf="!multipleFloors">
-                {{ chosenScansOnPlan.length }} {{'scan points chosen' | translate}}  
-            </div>
-        </div>
-        <div *ngIf="!editingAudioZone" class="sp-row">
-            <lib-radio-button  label="{{ 'selectTool.chooseStartPoint'  | translate }}" (isCheckedEvent)="isSettingStartSweep=!isSettingStartSweep"></lib-radio-button>
-        </div>
-        <div class="sp-row">
-            <button class="btn btn-primary rounded-pill" (click)="onSaveSelection()">{{'selectTool.saveSelection' | translate}}</button>
-            <button class="btn btn-outline-primary rounded-pill" (click)="onCancel()">{{'selectTool.cancelSelection' | translate}}</button>
-        </div>
-    </div>
-
-</div>
-   

package/src/lib/components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component.scss

@@ -1,23 +0,0 @@
-.sp-row{
-  display: flex;
-  margin-bottom: 1rem;
-}
-.selectZone {
-    border-radius: 6px;
-    overflow: hidden;
-    background-color: var(--smarterplan-secondary);
-}
-
-.scanTool {
-    margin: 0px 1rem;
-}
-
-.protip {
-    color: gray;
-    padding: 0px;
-  }
-
-  
-.tool-label {
-    font-size: 1rem;
-  }

package/src/lib/components/zones/add-zone/sweep-plan-selection/sweep-plan-selection.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SweepPlanSelectionComponent } from './sweep-plan-selection.component';
-
-describe('SweepPlanSelectionComponent', () => {
-  let component: SweepPlanSelectionComponent;
-  let fixture: ComponentFixture<SweepPlanSelectionComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SweepPlanSelectionComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SweepPlanSelectionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});