Road fatality

Yarik
1 parent 0f50c3be
Showing 6 changed files with 112 additions and 4 deletions Show diff stats
src/app/data/road/road.component.html
src/app/data/road/road.component.ts
src/components/road-map.component.ts
src/models/node.ts
src/models/way.ts
src/services/road.service.ts
@@ -2,7 +2,7 @@
     <road-map [identificator]="'road-map'"></road-map>
     <ag-grid-ng2 #agGrid style="width: 100%; height: 100%;" class="ag-blue" [gridOptions]="gridOptions" [columnDefs]="columnDefs" [rowData]="rowData" enableColResize enableSorting enableFilter groupHeaders suppressRowClickSelection toolPanelSuppressGroups
         toolPanelSuppressValues debug rowHeight="22" rowSelection="multiple" (cellClicked)="onCellClicked($event)" (cellDoubleClicked)="onCellDoubleClicked($event)" (cellContextMenu)="onCellContextMenu($event)" (cellValueChanged)="onCellValueChanged($event)"
-        (cellFocused)="onCellFocused($event)" (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
+        (rowSelected)="onRowSelected($event)" (selectionChanged)="onSelectionChanged()" (beforeFilterChanged)="onBeforeFilterChanged()" (afterFilterChanged)="onAfterFilterChanged()" (filterModified)="onFilterModified()"
         (beforeSortChanged)="onBeforeSortChanged()" (afterSortChanged)="onAfterSortChanged($event)" (virtualRowRemoved)="onVirtualRowRemoved($event)" (rowClicked)="onRowClicked($event)">
     </ag-grid-ng2>
     <div class="control_button">
@@ -13,6 +13,7 @@ import { RendererComponent } from &#39;../../../helpers/renderer.component&#39;;
 import { RoadTypeSelectList } from '../../../models/road-type-select-list';
  
 import { routerTransition } from '../../../animations/router.animation';
+import {Way} from "../../../models/way";
  
 @Component({
     // tslint:disable-next-line:component-selector
@@ -35,8 +36,14 @@ export class RoadComponent extends StatementBase {
     }
  
     public showOnMap(): void {
-      console.log(this.gridOptions.api.getSelectedRows()[0].id);
-      this.mapComponent.showMap();
+      let selectedRows: any[] = this.gridOptions.api.getSelectedRows();
+        if (selectedRows.length) {
+            let id = selectedRows[0].id;
+            this.service.getRelation(id).then(x =>  {
+                this.mapComponent.setWays(x);
+                return x;
+            });
+        }
     }
  
   protected createColumnDefs(): any[] {
 import { Component, Input, AfterViewInit } from '@angular/core';
 import * as L from 'leaflet';
+import { Way } from '../models/way';
  
 @Component({
     // tslint:disable-next-line:component-selector
@@ -9,6 +10,7 @@ import * as L from &#39;leaflet&#39;;
 export class RoadMapComponent implements AfterViewInit {
     protected isVisible: boolean = false;
     protected map: L.Map;
+    protected ways: Way[];
     @Input() identificator: string = 'mapID';
  
     public ngAfterViewInit(): void {
@@ -21,6 +23,46 @@ export class RoadMapComponent implements AfterViewInit {
         this.isVisible = true;
     }
     public getHeight(): string {
-        return this.isVisible ? '100%' : '0';
+        return this.isVisible ? '100%' : '100%';
+    }
+    public setWays(ways: Way[]): void {
+        this.ways = ways;
+        this.showWays();
+    }
+    protected showWays(): void {
+        let minLat: number = 0;
+        let maxLat: number = 0;
+        let minLon: number = 0;
+        let maxLon: number = 0;
+        console.log(this.ways);
+        this.ways.forEach((way) => {
+            let nodes: L.LatLng[] = [];
+            way.nodes.forEach((node) => {
+                if (minLat == 0) {
+                    minLat = node.lat;
+                    maxLat = node.lat;
+                } else {
+                    minLat = (minLat > node.lat)?node.lat:minLat;
+                    maxLat = (maxLat < node.lat)?node.lat:maxLat;
+                }
+                if (minLon == 0) {
+                    minLon = node.lon;
+                    maxLon = node.lon;
+                } else {
+                    minLon = (minLon > node.lon)?node.lon:minLon;
+                    maxLon = (maxLon < node.lon)?node.lon:maxLon;
+                }
+                let latLng = node.getLatLng();
+                nodes.push(latLng);
+            });
+            way.polyline = L.polyline(nodes, {color: 'red'}).addTo(this.map);
+            console.log(way.polyline);
+        });
+        this.map.fitBounds([
+            [minLat, minLon],
+            [maxLat, maxLon]
+        ]);
+        console.log(minLat, maxLat, minLon, maxLon);
+        this.showMap();
     }
 }
+import * as L from 'leaflet';
+
+export class Node {
+    id: number;
+    index: number;
+    lat: number;
+    lon: number;
+    latLng: L.LatLng;
+    protected createLatLng(): void {
+        this.latLng = L.latLng(this.lat, this.lon);
+    }
+    public getLatLng(): L.LatLng {
+        if (this.latLng == undefined) {
+            this.createLatLng();
+        }
+        return this.latLng;
+    }
+    public setLatLng(lat: number, lon: number): void {
+        this.lat = lat;
+        this.lon = lon;
+        this.createLatLng();
+    }
+}
 \ No newline at end of file
+import { Node } from './node';
+import * as L from 'leaflet';
+
+export class Way {
+    id: number;
+    nodes: Node[];
+    polyline: L.Polyline;
+}
 \ No newline at end of file
@@ -4,6 +4,9 @@ import { Http } from &#39;@angular/http&#39;;
 import { StatementBaseService } from './statement.base.service';
  
 import { Road } from '../models/road';
+import {Way} from "../models/way";
+import {Node} from "../models/node";
+import {id} from "@swimlane/ngx-charts/release/utils/id";
  
 @Injectable()
 export class RoadService extends StatementBaseService {
@@ -14,10 +17,35 @@ export class RoadService extends StatementBaseService {
   public createModel(): Object {
     return new Road();
   }
+  public getRelation(id: number): Promise<any> {
+      return this.http.get(this.url + '/relation?id=' + id, { headers: this.headers })
+          .toPromise()
+          .then(x => this.decodeWays(x.json()))
+          .catch(this.handleError);
+  }
   protected parseModels(json: any): any[] {
      return json.roadEditDsM as Road[];
   };
   protected parseModel(json: any): any {
      return json as Road;
   };
+  protected decodeWays(json: Object[]): Way[] {
+      let result: Way[] = [];
+      json.forEach((way: Way) => {
+          let nodes: Node[] = [];
+          way.nodes.forEach((node: Node) => {
+              let nodeObj: Node = new Node();
+              nodeObj.id = node.id;
+              nodeObj.index = node.index;
+              nodeObj.lat = node.lat;
+              nodeObj.lon = node.lon;
+              nodes.push(nodeObj);
+          });
+          let wayObj: Way = new Way();
+          wayObj.id = way.id;
+          wayObj.nodes = nodes;
+          result.push(wayObj);
+      });
+      return result;
+  }
 }