Merge remote-tracking branch 'origin/master'

Yarik
2 parents dc9a0e3c 9a741780
Showing 4 changed files with 23 additions and 15 deletions Show diff stats
src/app/data/bus-stop/bus-stop.component.html
src/app/data/bus-stop/bus-stop.component.ts
src/app/data/map-items/map-items.component.ts
src/app/data/map-items/map-items.scss
@@ -7,6 +7,7 @@
     </ag-grid-ng2>
     <div class="control_button">
         <div *tdLoading="'loading'; mode:'indeterminate'; type:'circle'; strategy:'replace'; color:'accent'"></div>
+        <button md-fab color="accent" (click)="showOnMap()" type="button"><md-icon>map</md-icon></button>
         <button md-fab color="accent" [disabled]="isNew || isSelected" (click)="addNewRow()" type="button"><md-icon>add</md-icon></button>
         <button md-fab color="warn" [disabled]="!isSelected" (click)="deleteRows()" type="button"><md-icon>delete</md-icon></button>
     </div>
@@ -29,14 +29,13 @@ import { routerTransition } from &#39;../../../animations/router.animation&#39;;
     encapsulation: ViewEncapsulation.None,
 })
 export class BusStopComponent extends StatementBase {
-    @ViewChild(MapItemsComponent) mapItems: MapItemsComponent
+    @ViewChild(MapItemsComponent) mapItems: MapItemsComponent;
     public regions: RegionSelectList[];
     public states: StateCommonSelectList[];
     public surfaceTypes: SurfaceTypeSelectList[];
     public settlements: SettlementSelectList[];
     public roads: RoadSelectList[];
     public boolean: BooleanSelectList[];
-    public position: string;
     constructor(
         protected service: BusStopService,
@@ -45,9 +44,10 @@ export class BusStopComponent extends StatementBase {
         protected loadingService: TdLoadingService,
     ) {
         super();
-        this.position = '51.513015907156756,-0.10334014892578126';
     }
-
+    public showOnMap(): void {
+        this.mapItems.showMap();
+    }
   protected createColumnDefs(): any[] {
     return [
       {
@@ -3,7 +3,7 @@ import * as L from &#39;leaflet&#39;;
 @Component({
     selector: 'map-items',
     template:`
-        <div class="map-items">
+        <div class="map-items" [class.show]="show"> 
             <div id="mapItemsId"></div>
         </div>`,
     styleUrls: ['map-items.scss']
@@ -14,16 +14,9 @@ export class MapItemsComponent implements OnInit{
     public map: L.Map;
     public icon: L.Icon;
     public markersGroup: L.FeatureGroup;
+    public show = false;
     ngOnInit(){
-        this.icon = L.icon({
-            iconUrl: '/assets/icons/marker-icon.png',
-            iconSize:     [25, 41], // size of the icon
-            popupAnchor:  [-3, -76], // point from which the popup should open relative to the iconAnchor
-        });
-        this.map = L.map('mapItemsId').setView([51.505, -0.09], 13);
-        L.tileLayer('https://a.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            maxZoom: 18,
-        }).addTo(this.map);
+
         // if(this.position != null){
         //     let options = {
         //         draggable:true,
@@ -36,6 +29,18 @@ export class MapItemsComponent implements OnInit{
         // }
     }
+    showMap(){
+        this.show = true;
+        this.icon = L.icon({
+            iconUrl: '/assets/icons/marker-icon.png',
+            iconSize:     [25, 41], // size of the icon
+            popupAnchor:  [-3, -76], // point from which the popup should open relative to the iconAnchor
+        });
+        this.map = L.map('mapItemsId').setView([51.505, -0.09], 13);
+        L.tileLayer('https://a.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            maxZoom: 18,
+        }).addTo(this.map);
+    }
     refreshMap(rows): void{
         if(this.markersGroup != null){
             this.map.removeLayer(this.markersGroup);
 .map-items{
   height: 50%;
-  position: relative;
 }
 #mapItemsId{
   height: 100%;
   width: 100%;
+}
+.show{
+ // height: 50%;
 }
 \ No newline at end of file