style: change accessibility of props in HTML/TS for AOT compilation

Author: dkocich

public_src/components/app/app.component.ts

@@ -20,7 +20,7 @@ import { EditService } from '../../services/edit.service';
 })
 export class AppComponent {
   public advancedMode: boolean = Boolean(localStorage.getItem('advancedMode'));
-  private editingMode: boolean;
+  public editingMode: boolean;
 
   @ViewChild(ToolbarComponent) public toolbarComponent: ToolbarComponent;
   @ViewChild(AuthComponent) public authComponent: AuthComponent;
@@ -80,16 +80,16 @@ export class AppComponent {
     this.toolbarComponent.Initialize();
   }
 
-  private showHelpModal(): void {
-    this.helpModal.show();
+  public isLoading(): boolean {
+    return this.loadSrv.isLoading();
   }
 
-  private hideHelpModal(): void {
+  public hideHelpModal(): void {
     this.helpModal.hide();
   }
 
-  private isLoading(): boolean {
-    return this.loadSrv.isLoading();
+  private showHelpModal(): void {
+    this.helpModal.show();
   }
 
   private getStatus(): string {

public_src/components/auth/auth.component.ts

@@ -22,6 +22,10 @@ export class AuthComponent {
     this.imgHref = this.storageSrv.getImgHref();
   }
 
+  public isAuthenticated(): void {
+    return this.authSrv.oauth.authenticated();
+  }
+
   private getDisplayName(): string {
     return this.storageSrv.getDisplayName();
   }
@@ -62,10 +66,6 @@ export class AuthComponent {
     // document.getElementById("display_name").innerHTML = userDetails["display_name"];
   }
 
-  private isAuthenticated(): void {
-    return this.authSrv.oauth.authenticated();
-  }
-
   private showDetails(): void {
     this.authSrv.oauth.xhr(
       {

public_src/components/editor/editor.component.ts

@@ -20,7 +20,7 @@ export class EditorComponent {
   @ViewChild('editModal') public editModal: ModalDirective;
   private totalEditSteps: number = 0;
   private currentEditStep: number = 0;
-  private editing: boolean = false;
+  public editing: boolean = false;
   private creatingElementOfType: string = '';
 
   constructor(
@@ -55,27 +55,27 @@ export class EditorComponent {
     console.log('LOG (editor) Current edits are: ', this.storageSrv.edits);
   }
 
-  private isAuthenticated(): void {
+  public isAuthenticated(): void {
     return this.authSrv.oauth.authenticated();
   }
 
   /**
-   * Deletes current edits create in the localStorage.
+   * Provides access to editing service function.
    */
-  private deleteEdits(): void {
-    localStorage.removeItem('edits');
-    alert(this.storageSrv.edits);
-    alert('LOG: LocalStorage changed to ' + localStorage.getItem('edits'));
+  public continueEditing(): void {
+    this.storageSrv.edits = this.storageSrv.getLocalStorageItem('edits');
     this.editModal.hide();
+    this.editSrv.continueEditing();
   }
 
   /**
-   * Provides access to editing service function.
+   * Deletes current edits create in the localStorage.
    */
-  private continueEditing(): void {
-    this.storageSrv.edits = this.storageSrv.getLocalStorageItem('edits');
+  public deleteEdits(): void {
+    localStorage.removeItem('edits');
+    alert(this.storageSrv.edits);
+    alert('LOG: LocalStorage changed to ' + localStorage.getItem('edits'));
     this.editModal.hide();
-    this.editSrv.continueEditing();
   }
 
   private showEditModal(): void {

public_src/components/lang/lang.component.ts

@@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class LangComponent {
   constructor(
-    private translate: TranslateService,
+    public translate: TranslateService,
   ) {
     translate.setDefaultLang('en');
     this.switchLanguage(translate.defaultLang);

public_src/components/sidebar/relation-browser.component.ts

@@ -18,9 +18,9 @@ import { IPtRouteMasterNew } from '../../core/ptRouteMasterNew.interface';
 })
 export class RelationBrowserComponent {
   private currentElement: IPtRouteMasterNew;
-  private listOfVariants = this.storageSrv.listOfVariants;
+  public listOfVariants = this.storageSrv.listOfVariants;
   private editingMode: boolean;
-  private listOfMasters = this.storageSrv.listOfMasters;
+  public listOfMasters = this.storageSrv.listOfMasters;
 
   constructor(
     private editSrv: EditService,
@@ -59,6 +59,21 @@ export class RelationBrowserComponent {
     });
   }
 
+  /**
+   * NgFor track function which helps to re-render rows faster.
+   *
+   * @param index
+   * @param item
+   * @returns {number}
+   */
+  public trackByFn(index: number, item: any): number {
+    return item.id;
+  }
+
+  public hideMasterModal(): void {
+    this.masterModal.hide();
+  }
+
   private isDownloaded(relId: number): boolean {
     return this.storageSrv.elementsDownloaded.has(relId) || relId < 0; // show created
   }
@@ -90,7 +105,6 @@ export class RelationBrowserComponent {
       this.editSrv.createMaster();
     }
   }
-
   private changeRouteMasterMembers(routeMasterId: number): void {
     this.editSrv.changeRouteMasterMembers(
       this.currentElement.id,
@@ -99,15 +113,12 @@ export class RelationBrowserComponent {
   }
 
   @ViewChild('masterModal') public masterModal: ModalDirective;
+
   public showMasterModal(): void {
     this.masterModal.show();
     // this.mapSrv.disableMouseEvent("modalDownload");
   }
 
-  private hideMasterModal(): void {
-    this.masterModal.hide();
-  }
-
   private isAlreadyAdded(relId: number): boolean {
     if (!this.currentElement) {
       return;
@@ -126,15 +137,4 @@ export class RelationBrowserComponent {
   private isSelected(relId: number): boolean {
     return this.processSrv.haveSameIds(relId, this.currentElement.id);
   }
-
-  /**
-   * NgFor track function which helps to re-render rows faster.
-   *
-   * @param index
-   * @param item
-   * @returns {number}
-   */
-  private trackByFn(index: number, item: any): number {
-    return item.id;
-  }
 }

public_src/components/sidebar/route-browser.component.ts

@@ -16,15 +16,15 @@ import { StorageService } from '../../services/storage.service';
   templateUrl: './route-browser.component.html',
 })
 export class RouteBrowserComponent {
-  private currentElement;
+  public currentElement;
   private listOfMasters: object[] = this.storageSrv.listOfMasters;
-  private listOfRelations: object[] = this.storageSrv.listOfRelations;
-  private listOfRelationsForStop: object[] = this.storageSrv.listOfRelationsForStop;
+  public listOfRelations: object[] = this.storageSrv.listOfRelations;
+  public listOfRelationsForStop: object[] = this.storageSrv.listOfRelationsForStop;
 
   private isRequesting: boolean;
-  private filteredView: boolean;
+  public filteredView: boolean;
   private idsHaveMaster = new Set();
-  private editingMode: boolean;
+  public editingMode: boolean;
   private membersEditing: boolean = false;
 
   constructor(

public_src/components/sidebar/stop-browser.component.ts

@@ -20,10 +20,10 @@ import { IPtStop } from '../../core/ptStop.interface';
 })
 export class StopBrowserComponent {
   public listOfStopsForRoute: object[] = this.storageSrv.listOfStopsForRoute;
-  private currentElement: any;
-  private listOfStops: object[] = this.storageSrv.listOfStops;
-  private filteredView: boolean;
-  private editingMode: boolean;
+  public currentElement: any;
+  public listOfStops: object[] = this.storageSrv.listOfStops;
+  public filteredView: boolean;
+  public editingMode: boolean;
 
   constructor(
     private dragulaSrv: DragulaService,
@@ -68,6 +68,14 @@ export class StopBrowserComponent {
     );
   }
 
+  public reorderingEnabled(): boolean {
+    if (this.currentElement) {
+      return this.currentElement.type === 'relation' && this.filteredView;
+    } else {
+      return false;
+    }
+  }
+
   private isDownloaded(nodeId: number): boolean {
     return this.storageSrv.elementsDownloaded.has(nodeId);
   }
@@ -105,14 +113,6 @@ export class StopBrowserComponent {
     this.processSrv.exploreStop(stop, true, true, true);
   }
 
-  private reorderingEnabled(): boolean {
-    if (this.currentElement) {
-      return this.currentElement.type === 'relation' && this.filteredView;
-    } else {
-      return false;
-    }
-  }
-
   private isSelected(relId: number): boolean {
     return this.processSrv.haveSameIds(relId, this.currentElement.id);
   }

public_src/components/sidebar/tag-browser.component.ts

@@ -24,7 +24,7 @@ import { IOsmEntity } from '../../core/osmEntity.interface';
 export class TagBrowserComponent {
   @Input() public tagKey: string = '';
   @Input() public tagValue: string = '';
-  private currentElement: IOsmEntity;
+  public currentElement: IOsmEntity;
   private editingMode: boolean;
 
   private expectedKeys = [

public_src/components/toolbar/toolbar.component.ts

@@ -26,10 +26,10 @@ export class ToolbarComponent {
   @ViewChild(TransporterComponent)
   public transporterComponent: TransporterComponent;
   @ViewChild(EditorComponent) public editorComponent: EditorComponent;
-  private filtering: boolean;
+  public filtering: boolean;
 
-  private currentElement: IOsmEntity;
-  private stats = { s: 0, r: 0, a: 0, m: 0 };
+  public currentElement: IOsmEntity;
+  public stats = { s: 0, r: 0, a: 0, m: 0 };
 
   constructor(
     private confSrv: ConfService,
@@ -70,6 +70,37 @@ export class ToolbarComponent {
     });
   }
 
+  public highlightIsActive(): boolean {
+    return this.mapSrv.highlightIsActive();
+  }
+
+  public isRelation(): boolean {
+    return this.currentElement && this.currentElement.type === 'relation';
+  }
+
+  public toggleDownloading(): void {
+    this.downloading = !this.downloading;
+    if (this.downloading) {
+      this.mapSrv.map.on('zoomend moveend', () => {
+        this.initDownloader();
+      });
+    } else if (!this.downloading) {
+      this.mapSrv.map.off('zoomend moveend');
+    }
+  }
+
+  public showOptions(): void {
+    document.getElementById('toggle-filter').style.display = 'inline';
+    setTimeout(() => {
+      document.getElementById('toggle-filter').style.display = 'none';
+    }, 5000);
+  }
+
+  public toggleLinesFilter(): void {
+    this.confSrv.cfgFilterLines = !this.confSrv.cfgFilterLines;
+    this.filtering = !this.filtering;
+  }
+
   private changeHighlight(): void {
     if (
       this.highlightIsActive() &&
@@ -106,17 +137,6 @@ export class ToolbarComponent {
     return this.checkMinZoomLevel() && this.checkMinDistance();
   }
 
-  private toggleDownloading(): void {
-    this.downloading = !this.downloading;
-    if (this.downloading) {
-      this.mapSrv.map.on('zoomend moveend', () => {
-        this.initDownloader();
-      });
-    } else if (!this.downloading) {
-      this.mapSrv.map.off('zoomend moveend');
-    }
-  }
-
   /**
    *
    * @param selection
@@ -131,30 +151,10 @@ export class ToolbarComponent {
     this.processSrv.cancelSelection();
   }
 
-  private isRelation(): boolean {
-    return this.currentElement && this.currentElement.type === 'relation';
-  }
-
   private zoomTo(selection: IOsmEntity): void {
     this.processSrv.zoomToElement(selection);
   }
 
-  private showOptions(): void {
-    document.getElementById('toggle-filter').style.display = 'inline';
-    setTimeout(() => {
-      document.getElementById('toggle-filter').style.display = 'none';
-    }, 5000);
-  }
-
-  private toggleLinesFilter(): void {
-    this.confSrv.cfgFilterLines = !this.confSrv.cfgFilterLines;
-    this.filtering = !this.filtering;
-  }
-
-  private highlightIsActive(): boolean {
-    return this.mapSrv.highlightIsActive();
-  }
-
   private clearHighlight(): void {
     return this.mapSrv.clearHighlight();
   }

public_src/components/transporter/transporter.component.html

@@ -1,13 +1,13 @@
 <button id="download-data" class="btn btn-default on-map hidden" container="body"
         tooltip="{{ 'Download data from Overpass API' | translate }}"
-        [class.btn-primary]="downloading"
+        [class.btn-primary]="downloading()"
         (click)="showDownloadModal()">
   <i class="fa fa-download" aria-hidden="true"></i>
 </button>
 
 <button *ngIf="isAuthenticated() && hasEdits()" id="upload-data" class="btn btn-default on-map" container="body"
         tooltip="{{ 'Save changes to OpenStreetMap' | translate }}"
-        [class.btn-primary]="downloading"
+        [class.btn-primary]="downloading()"
         (click)="showUploadModal()">
   <i class="fa fa-upload" aria-hidden="true"></i>
   &nbsp;{{ 'Save' | translate }}