From 0e83bf47a042892ed8c442a0d68ddcac8cd4903c Mon Sep 17 00:00:00 2001
From: cbourget <cbourget@mapgears.com>
Date: Tue, 7 Mar 2017 16:57:31 -0500
Subject: [PATCH 1/5] feat(map editor): Basics for the map editor tool

---
 .../context-list/context-list.component.html  |  3 +-
 .../context-list/context-list.component.ts    |  2 +-
 src/app/context/shared/context.service.ts     |  8 ++--
 .../layer-editor/layer-editor.component.html  |  3 ++
 .../layer-editor.component.spec.ts            | 35 ++++++++++++++
 .../layer-editor/layer-editor.component.styl  |  0
 .../layer-editor/layer-editor.component.ts    | 34 ++++++++++++++
 .../layer-list-item.component.html            | 13 +++++
 .../layer-list-item.component.spec.ts         | 33 +++++++++++++
 .../layer-list-item.component.styl            |  0
 .../layer-list-item.component.ts              | 19 ++++++++
 .../map/layer-list/layer-list.component.html  | 10 ++++
 .../layer-list/layer-list.component.spec.ts   | 40 ++++++++++++++++
 .../map/layer-list/layer-list.component.styl  |  0
 .../map/layer-list/layer-list.component.ts    | 43 +++++++++++++++++
 .../map/map-editor/map-editor.component.html  |  1 +
 .../map-editor/map-editor.component.spec.ts   | 44 +++++++++++++++++
 .../map/map-editor/map-editor.component.styl  |  0
 .../map/map-editor/map-editor.component.ts    | 35 ++++++++++++++
 src/app/map/map.module.ts                     | 14 +++++-
 src/app/map/map/map.component.ts              | 11 +++--
 src/app/map/shared/layer.service.spec.ts      |  2 +-
 src/app/map/shared/layer.service.ts           | 14 +++++-
 src/app/map/shared/layers/layer-osm.ts        | 13 ++---
 src/app/map/shared/layers/layer-tile.ts       | 14 +++---
 src/app/map/shared/layers/layer-vector.ts     | 15 +++---
 src/app/map/shared/layers/layer-wms.ts        | 47 +++++++++----------
 src/app/map/shared/layers/layer-wmts.ts       | 43 +++++++++--------
 src/app/map/shared/layers/layer-xyz.ts        | 13 ++---
 src/app/map/shared/layers/layer.ts            | 23 +++++----
 src/app/map/shared/map.ts                     | 24 +++++++---
 .../search-bar/search-bar.component.html      |  3 +-
 .../search-bar/search-bar.component.styl      |  2 +-
 .../search/search-bar/search-bar.component.ts |  8 ++++
 .../search-tool/search-tool.component.html    |  3 +-
 .../store/reducers/edited-layer.reducer.ts    | 10 ++++
 src/app/store/reducers/index.ts               |  7 +--
 ...ap-layers.reducer.ts => layers.reducer.ts} |  2 +-
 src/app/store/reducers/map-view.reducer.ts    |  8 ----
 src/app/store/reducers/map.reducer.ts         | 10 ++++
 ...tools-list.reducer.ts => tools.reducer.ts} |  2 +-
 src/app/store/store.module.ts                 | 16 ++++---
 src/app/store/store.ts                        |  9 ++--
 src/assets/locale/en.json                     |  2 +
 src/assets/locale/fr.json                     |  2 +
 src/contexts/_default.json                    |  9 ++--
 src/contexts/qc911.json                       |  6 +--
 src/css/theme.styl                            |  2 +-
 48 files changed, 508 insertions(+), 149 deletions(-)
 create mode 100644 src/app/map/layer-editor/layer-editor.component.html
 create mode 100644 src/app/map/layer-editor/layer-editor.component.spec.ts
 create mode 100644 src/app/map/layer-editor/layer-editor.component.styl
 create mode 100644 src/app/map/layer-editor/layer-editor.component.ts
 create mode 100644 src/app/map/layer-list-item/layer-list-item.component.html
 create mode 100644 src/app/map/layer-list-item/layer-list-item.component.spec.ts
 create mode 100644 src/app/map/layer-list-item/layer-list-item.component.styl
 create mode 100644 src/app/map/layer-list-item/layer-list-item.component.ts
 create mode 100644 src/app/map/layer-list/layer-list.component.html
 create mode 100644 src/app/map/layer-list/layer-list.component.spec.ts
 create mode 100644 src/app/map/layer-list/layer-list.component.styl
 create mode 100644 src/app/map/layer-list/layer-list.component.ts
 create mode 100644 src/app/map/map-editor/map-editor.component.html
 create mode 100644 src/app/map/map-editor/map-editor.component.spec.ts
 create mode 100644 src/app/map/map-editor/map-editor.component.styl
 create mode 100644 src/app/map/map-editor/map-editor.component.ts
 create mode 100644 src/app/store/reducers/edited-layer.reducer.ts
 rename src/app/store/reducers/{map-layers.reducer.ts => layers.reducer.ts} (68%)
 delete mode 100644 src/app/store/reducers/map-view.reducer.ts
 create mode 100644 src/app/store/reducers/map.reducer.ts
 rename src/app/store/reducers/{tools-list.reducer.ts => tools.reducer.ts} (71%)

diff --git a/src/app/context/context-list/context-list.component.html b/src/app/context/context-list/context-list.component.html
index 11ecb56d5..2155417ae 100644
--- a/src/app/context/context-list/context-list.component.html
+++ b/src/app/context/context-list/context-list.component.html
@@ -1,8 +1,7 @@
 <igo-list [navigation]="true"> 
-  <template ngFor let-context [ngForOf]="contexts | async" let-i="index">
+  <template ngFor let-context [ngForOf]="contexts | async">
     <igo-context-list-item
       igoListItem
-      tabindex="{{i}}"
       [selected]="selectedContext && selectedContext.uri === context.uri"
       [context]="context"
       [edition]="edition"
diff --git a/src/app/context/context-list/context-list.component.ts b/src/app/context/context-list/context-list.component.ts
index cc07288e4..29c3d87bc 100644
--- a/src/app/context/context-list/context-list.component.ts
+++ b/src/app/context/context-list/context-list.component.ts
@@ -40,7 +40,7 @@ export class ContextListComponent implements ToolComponent, OnInit {
     this.store
       .select(s => s.tools)
       .subscribe((tools: Tool[]) =>
-          this.editTool = tools.find(t => t.name === 'contextEditor'));
+        this.editTool = tools.find(t => t.name === 'contextEditor'));
 
     this.store
       .select(s => s.activeContext)
diff --git a/src/app/context/shared/context.service.ts b/src/app/context/shared/context.service.ts
index 1cdde308e..7d5052114 100644
--- a/src/app/context/shared/context.service.ts
+++ b/src/app/context/shared/context.service.ts
@@ -53,11 +53,11 @@ export class ContextService {
     this.store.dispatch({type: 'SET_CONTEXT', payload: context});
 
     // TODO: Handle "useCurrentView" option
-    const view: MapViewOptions = context.map.view;
-    this.store.dispatch({type: 'SET_VIEW', payload: view});
+    const mapOptions: MapViewOptions = context.map;
+    this.store.dispatch({type: 'SET_MAP', payload: mapOptions});
 
-    const layers: Array<LayerOptions> = context.layers;
-    this.store.dispatch({type: 'SET_LAYERS', payload: layers});
+    const layerOptions: Array<LayerOptions> = context.layers;
+    this.store.dispatch({type: 'SET_LAYERS', payload: layerOptions});
 
     const tools: Array<Tool> = [];
     (context.tools || []).forEach((tool_: Tool) => {
diff --git a/src/app/map/layer-editor/layer-editor.component.html b/src/app/map/layer-editor/layer-editor.component.html
new file mode 100644
index 000000000..1df0d7bc3
--- /dev/null
+++ b/src/app/map/layer-editor/layer-editor.component.html
@@ -0,0 +1,3 @@
+<p>
+  {{layer.options.name}}
+</p>
diff --git a/src/app/map/layer-editor/layer-editor.component.spec.ts b/src/app/map/layer-editor/layer-editor.component.spec.ts
new file mode 100644
index 000000000..d352f2ba1
--- /dev/null
+++ b/src/app/map/layer-editor/layer-editor.component.spec.ts
@@ -0,0 +1,35 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestModule } from '../../test.module';
+
+import { OSMLayer } from '../shared/layers/layer-osm';
+import { LayerEditorComponent } from './layer-editor.component';
+import { LayerService } from '../shared/layer.service';
+
+describe('LayerEditorComponent', () => {
+  let component: LayerEditorComponent;
+  let fixture: ComponentFixture<LayerEditorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TestModule
+      ],
+      declarations: [ LayerEditorComponent ],
+      providers: [
+        LayerService
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LayerEditorComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    component.layer = new OSMLayer({name: 'foo', type: 'osm'});
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/map/layer-editor/layer-editor.component.styl b/src/app/map/layer-editor/layer-editor.component.styl
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/map/layer-editor/layer-editor.component.ts b/src/app/map/layer-editor/layer-editor.component.ts
new file mode 100644
index 000000000..5ff405d44
--- /dev/null
+++ b/src/app/map/layer-editor/layer-editor.component.ts
@@ -0,0 +1,34 @@
+import { Component, OnInit } from '@angular/core';
+
+import { Register } from '../../tool/shared/tool.service';
+
+import { Layer } from '../shared/layers/layer';
+import { LayerService } from '../shared/layer.service';
+
+@Register()
+@Component({
+  selector: 'igo-layer-editor',
+  templateUrl: './layer-editor.component.html',
+  styleUrls: ['./layer-editor.component.styl']
+})
+export class LayerEditorComponent implements OnInit {
+
+  static name_: string = 'layerEditor';
+  static title: string = 'Edit Layer';
+  static icon: string = 'layers';
+  static defaultOptions: any = {};
+
+  layer: Layer;
+
+  constructor(private layerService: LayerService) { }
+
+  ngOnInit() {
+    this.layerService.editedLayer
+      .subscribe((layer: Layer) => this.layer = layer);
+  }
+
+  updateLayer() {
+    console.log(this.layer);
+  }
+
+}
diff --git a/src/app/map/layer-list-item/layer-list-item.component.html b/src/app/map/layer-list-item/layer-list-item.component.html
new file mode 100644
index 000000000..95e5cb739
--- /dev/null
+++ b/src/app/map/layer-list-item/layer-list-item.component.html
@@ -0,0 +1,13 @@
+<md-list-item>
+  <md-icon md-list-avatar>layers</md-icon>
+  <h4 md-line>{{layer.options.name}}</h4>
+  <button
+    md-icon-button
+    class="igo-icon-button"
+    (click)="editLayer.emit(layer)"
+    *ngIf="edition"
+    [md-tooltip]="'Edit Layer' | translate"
+    tooltip-position="below">
+    <md-icon>settings</md-icon>
+  </button>
+</md-list-item>
\ No newline at end of file
diff --git a/src/app/map/layer-list-item/layer-list-item.component.spec.ts b/src/app/map/layer-list-item/layer-list-item.component.spec.ts
new file mode 100644
index 000000000..44b64be53
--- /dev/null
+++ b/src/app/map/layer-list-item/layer-list-item.component.spec.ts
@@ -0,0 +1,33 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestModule } from '../../test.module';
+import { SharedModule } from '../../shared/shared.module';
+
+import { OSMLayer } from '../shared/layers/layer-osm';
+import { LayerListItemComponent } from './layer-list-item.component';
+
+describe('LayerListItemComponent', () => {
+  let component: LayerListItemComponent;
+  let fixture: ComponentFixture<LayerListItemComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TestModule,
+        SharedModule
+      ],
+      declarations: [ LayerListItemComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LayerListItemComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    component.layer = new OSMLayer({name: 'foo', type: 'osm'});
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/map/layer-list-item/layer-list-item.component.styl b/src/app/map/layer-list-item/layer-list-item.component.styl
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/map/layer-list-item/layer-list-item.component.ts b/src/app/map/layer-list-item/layer-list-item.component.ts
new file mode 100644
index 000000000..08e48f9c7
--- /dev/null
+++ b/src/app/map/layer-list-item/layer-list-item.component.ts
@@ -0,0 +1,19 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+
+import { Layer } from '../shared/layers/layer';
+
+@Component({
+  selector: 'igo-layer-list-item',
+  templateUrl: './layer-list-item.component.html',
+  styleUrls: ['./layer-list-item.component.styl']
+})
+export class LayerListItemComponent {
+
+  @Input() layer: Layer;
+  @Input() edition: boolean = true;
+
+  @Output() editLayer: EventEmitter<Layer> = new EventEmitter();
+
+  constructor() { }
+
+}
diff --git a/src/app/map/layer-list/layer-list.component.html b/src/app/map/layer-list/layer-list.component.html
new file mode 100644
index 000000000..d5e0cd289
--- /dev/null
+++ b/src/app/map/layer-list/layer-list.component.html
@@ -0,0 +1,10 @@
+<igo-list [navigation]="true"> 
+  <template ngFor let-layer [ngForOf]="layers">
+    <igo-layer-list-item
+      igoListItem
+      [layer]="layer"
+      [edition]="edition"
+      (editLayer)="editLayer($event)">
+    </igo-layer-list-item>
+  </template>
+</igo-list>
diff --git a/src/app/map/layer-list/layer-list.component.spec.ts b/src/app/map/layer-list/layer-list.component.spec.ts
new file mode 100644
index 000000000..340443ece
--- /dev/null
+++ b/src/app/map/layer-list/layer-list.component.spec.ts
@@ -0,0 +1,40 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestModule } from '../../test.module';
+import { SharedModule } from '../../shared/shared.module';
+
+import { LayerService } from '../shared/layer.service';
+import { LayerListComponent } from './layer-list.component';
+import { LayerListItemComponent } from '../layer-list-item/layer-list-item.component';
+
+describe('LayerListComponent', () => {
+  let component: LayerListComponent;
+  let fixture: ComponentFixture<LayerListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TestModule,
+        SharedModule
+      ],
+      declarations: [
+        LayerListComponent,
+        LayerListItemComponent
+      ],
+      providers: [
+        LayerService
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LayerListComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    component.layers = [];
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/map/layer-list/layer-list.component.styl b/src/app/map/layer-list/layer-list.component.styl
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/map/layer-list/layer-list.component.ts b/src/app/map/layer-list/layer-list.component.ts
new file mode 100644
index 000000000..aeb4484b1
--- /dev/null
+++ b/src/app/map/layer-list/layer-list.component.ts
@@ -0,0 +1,43 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+import { Store } from '@ngrx/store';
+import { IgoStore } from '../../store/store';
+
+import { Tool } from '../../tool/shared/tool.interface';
+
+import { Layer } from '../shared/layers/layer';
+import { LayerService } from '../shared/layer.service';
+
+@Component({
+  selector: 'igo-layer-list',
+  templateUrl: './layer-list.component.html',
+  styleUrls: ['./layer-list.component.styl']
+})
+export class LayerListComponent implements OnInit {
+
+  @Input() layers: Layer[];
+
+  get edition (): boolean {
+    return this.editTool !== undefined;
+  }
+
+  private editTool: Tool;
+
+  constructor(private store: Store<IgoStore>,
+              private layerService: LayerService) { }
+
+  ngOnInit() {
+    this.store
+      .select(s => s.tools)
+      .subscribe((tools: Tool[]) =>
+        this.editTool = tools.find(t => t.name === 'layerEditor'));
+  }
+
+  editLayer(layer: Layer) {
+    if (this.editTool !== undefined) {
+      this.layerService.editLayer(layer);
+      this.store.dispatch({type: 'SELECT_TOOL', payload: this.editTool});
+    }
+  }
+
+}
diff --git a/src/app/map/map-editor/map-editor.component.html b/src/app/map/map-editor/map-editor.component.html
new file mode 100644
index 000000000..04ea7c324
--- /dev/null
+++ b/src/app/map/map-editor/map-editor.component.html
@@ -0,0 +1 @@
+<igo-layer-list [layers]="layers"></igo-layer-list>
\ No newline at end of file
diff --git a/src/app/map/map-editor/map-editor.component.spec.ts b/src/app/map/map-editor/map-editor.component.spec.ts
new file mode 100644
index 000000000..62a06c713
--- /dev/null
+++ b/src/app/map/map-editor/map-editor.component.spec.ts
@@ -0,0 +1,44 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestModule } from '../../test.module';
+import { SharedModule } from '../../shared/shared.module';
+
+import { MapService } from '../shared/map.service';
+import { LayerService } from '../shared/layer.service';
+import { MapEditorComponent } from './map-editor.component';
+import { LayerListComponent } from '../layer-list/layer-list.component';
+import { LayerListItemComponent } from '../layer-list-item/layer-list-item.component';
+
+describe('MapEditorComponent', () => {
+  let component: MapEditorComponent;
+  let fixture: ComponentFixture<MapEditorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TestModule,
+        SharedModule
+      ],
+      declarations: [
+        MapEditorComponent,
+        LayerListComponent,
+        LayerListItemComponent
+      ],
+      providers: [
+        MapService,
+        LayerService
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MapEditorComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    component.layers = [];
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/map/map-editor/map-editor.component.styl b/src/app/map/map-editor/map-editor.component.styl
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/map/map-editor/map-editor.component.ts b/src/app/map/map-editor/map-editor.component.ts
new file mode 100644
index 000000000..997bce276
--- /dev/null
+++ b/src/app/map/map-editor/map-editor.component.ts
@@ -0,0 +1,35 @@
+import { Component, OnInit } from '@angular/core';
+
+import { Register } from '../../tool/shared/tool.service';
+
+import { IgoMap } from '../shared/map';
+import { Layer } from '../shared/layers/layer';
+import { MapService } from '../shared/map.service';
+
+@Register()
+@Component({
+  selector: 'igo-map-editor',
+  templateUrl: './map-editor.component.html',
+  styleUrls: ['./map-editor.component.styl']
+})
+export class MapEditorComponent implements OnInit {
+
+  static name_: string = 'mapEditor';
+  static title: string = 'Map';
+  static icon: string = 'map';
+  static defaultOptions: any = {};
+
+  map: IgoMap;
+  layers: Layer[];
+
+  constructor(private mapService: MapService) { }
+
+  ngOnInit() {
+    this.map = this.mapService.getMap();
+
+    this.layers = this.map.getLayers();
+    this.map.layers
+      .subscribe((layers: Layer[]) => this.layers = layers);
+  }
+
+}
diff --git a/src/app/map/map.module.ts b/src/app/map/map.module.ts
index aa454ee08..9869429a9 100644
--- a/src/app/map/map.module.ts
+++ b/src/app/map/map.module.ts
@@ -5,6 +5,10 @@ import { MapService } from './shared/map.service';
 import { LayerService } from './shared/layer.service';
 import { MapComponent } from './map/map.component';
 import { ZoomComponent } from './zoom/zoom.component';
+import { MapEditorComponent } from './map-editor/map-editor.component';
+import { LayerListComponent } from './layer-list/layer-list.component';
+import { LayerListItemComponent } from './layer-list-item/layer-list-item.component';
+import { LayerEditorComponent } from './layer-editor/layer-editor.component';
 
 @NgModule({
   imports: [
@@ -13,7 +17,15 @@ import { ZoomComponent } from './zoom/zoom.component';
   exports: [MapComponent],
   declarations: [
     MapComponent,
-    ZoomComponent
+    ZoomComponent,
+    MapEditorComponent,
+    LayerListComponent,
+    LayerListItemComponent,
+    LayerEditorComponent
+  ],
+  entryComponents: [
+    MapEditorComponent,
+    LayerEditorComponent
   ],
   providers: [
     LayerService,
diff --git a/src/app/map/map/map.component.ts b/src/app/map/map/map.component.ts
index 4211bd48e..5c16fe353 100644
--- a/src/app/map/map/map.component.ts
+++ b/src/app/map/map/map.component.ts
@@ -11,7 +11,7 @@ import { MapService } from '../shared/map.service';
 import { LayerService } from '../shared/layer.service';
 import { LayerOptions } from '../shared/layers/layer';
 import { WMSLayerOptions } from '../shared/layers/layer-wms';
-import { MapViewOptions } from '../shared/map';
+import { MapOptions } from '../shared/map';
 
 
 @Component({
@@ -32,12 +32,13 @@ export class MapComponent implements OnInit, AfterViewInit {
     this.map = this.mapService.getMap();
 
     this.store
-      .select(s => s.mapView)
-      .subscribe((view: MapViewOptions) => this.map.setView(view));
+      .select(s => s.map)
+      .filter(s => s !== null)
+      .subscribe((mapOptions: MapOptions) => this.map.setView(mapOptions.view));
 
     this.store
-      .select(s => s.mapLayers)
-      .subscribe((layers: LayerOptions[]) => this.handleLayersChanged(layers));
+      .select(s => s.layers)
+      .subscribe((layerOptions: LayerOptions[]) => this.handleLayersChanged(layerOptions));
 
     this.store
       .select(s => s.focusedResult)
diff --git a/src/app/map/shared/layer.service.spec.ts b/src/app/map/shared/layer.service.spec.ts
index 7c789cb9a..6472c4048 100644
--- a/src/app/map/shared/layer.service.spec.ts
+++ b/src/app/map/shared/layer.service.spec.ts
@@ -47,7 +47,7 @@ describe('LayerService', () => {
 
     service.createLayer(layerOptions).subscribe(
         layer => {
-          const p: any = layer.olLayer.getProperties();
+          const p: any = layer.getOlLayer().getProperties();
           expect(layer).toBeTruthy();
           expect(p.opacity).toEqual(layerOptions.opacity);
           expect(p.type).toEqual(layerOptions.type);
diff --git a/src/app/map/shared/layer.service.ts b/src/app/map/shared/layer.service.ts
index 2e0bdde3c..7f6964be7 100644
--- a/src/app/map/shared/layer.service.ts
+++ b/src/app/map/shared/layer.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
+import { Http, URLSearchParams, Request, RequestMethod } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
-import { URLSearchParams, Request, RequestMethod } from '@angular/http';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 import { Layer, LayerOptions } from './layers/layer';
 import { OSMLayer } from './layers/layer-osm';
@@ -21,6 +21,8 @@ export class LayerService {
     wms: WMSLayer
   };
 
+  editedLayer = new BehaviorSubject<Layer>(undefined);
+
   public capabilitiesStore: any[] = [];
 
   constructor(private http: Http) { }
@@ -39,6 +41,14 @@ export class LayerService {
     }
   }
 
+  editLayer(layer: Layer) {
+    this.editedLayer.next(layer);
+  }
+
+  getEditedLayer() {
+    return this.editedLayer;
+  }
+
   getCapabilities(options): Observable<any> {
 
     const params = new URLSearchParams();
diff --git a/src/app/map/shared/layers/layer-osm.ts b/src/app/map/shared/layers/layer-osm.ts
index 798785640..c9a77da2a 100644
--- a/src/app/map/shared/layers/layer-osm.ts
+++ b/src/app/map/shared/layers/layer-osm.ts
@@ -7,17 +7,14 @@ export interface OSMLayerOptions extends LayerOptions {
 
 export class OSMLayer extends Layer {
 
-  olLayer: ol.layer.Tile;
+  options: OSMLayerOptions;
+  protected olLayer: ol.layer.Tile;
 
-  createOlLayer(options: OSMLayerOptions): ol.layer.Tile {
-    const olLayerOptions = Object.assign(options.view || {}, {
-      source: new ol.source.OSM(options.source)
+  protected createOlLayer(): ol.layer.Tile {
+    const olLayerOptions = Object.assign(this.options.view || {}, {
+      source: new ol.source.OSM(this.options.source)
     });
 
     return new ol.layer.Tile(olLayerOptions);
   }
-
-  constructor(options: OSMLayerOptions) {
-    super(options);
-  }
 }
diff --git a/src/app/map/shared/layers/layer-tile.ts b/src/app/map/shared/layers/layer-tile.ts
index 551070056..d43aaf95a 100644
--- a/src/app/map/shared/layers/layer-tile.ts
+++ b/src/app/map/shared/layers/layer-tile.ts
@@ -6,17 +6,15 @@ export interface TileLayerOptions extends LayerOptions {
 }
 
 export class TileLayer extends Layer {
-  olLayer: ol.layer.Tile;
 
-  createOlLayer(options: TileLayerOptions): ol.layer.Tile {
-    const olLayerOptions = Object.assign(options.view || {}, {
-      source: new ol.source.Tile(options.source)
+  options: TileLayerOptions;
+  protected olLayer: ol.layer.Tile;
+
+  protected createOlLayer(): ol.layer.Tile {
+    const olLayerOptions = Object.assign(this.options.view || {}, {
+      source: new ol.source.Tile(this.options.source)
     });
 
     return new ol.layer.Tile(olLayerOptions);
   }
-
-  constructor(options: TileLayerOptions) {
-    super(options);
-  }
 }
diff --git a/src/app/map/shared/layers/layer-vector.ts b/src/app/map/shared/layers/layer-vector.ts
index 367e815c1..61f95a7ad 100644
--- a/src/app/map/shared/layers/layer-vector.ts
+++ b/src/app/map/shared/layers/layer-vector.ts
@@ -8,18 +8,15 @@ export interface VectorLayerOptions extends LayerOptions {
 
 export class VectorLayer extends Layer {
 
-  olLayer: ol.layer.Vector;
+  options: VectorLayerOptions;
+  protected olLayer: ol.layer.Vector;
 
-  createOlLayer(options: VectorLayerOptions): ol.layer.Vector {
-    const olLayerOptions = Object.assign(options.view || {}, {
-      style: new ol.style.Style(options.style),
-      source: new ol.source.Vector(options.source)
+  protected createOlLayer(): ol.layer.Vector {
+    const olLayerOptions = Object.assign(this.options.view || {}, {
+      style: new ol.style.Style(this.options.style),
+      source: new ol.source.Vector(this.options.source)
     });
 
     return new ol.layer.Vector(olLayerOptions);
   }
-
-  constructor(options: VectorLayerOptions) {
-    super(options);
-  }
 }
diff --git a/src/app/map/shared/layers/layer-wms.ts b/src/app/map/shared/layers/layer-wms.ts
index e296bf59a..90080ab29 100644
--- a/src/app/map/shared/layers/layer-wms.ts
+++ b/src/app/map/shared/layers/layer-wms.ts
@@ -8,38 +8,37 @@ export interface WMSLayerOptions extends LayerOptions {
 
 export class WMSLayer extends Layer {
 
-  olLayer: ol.layer.Image;
+  options: WMSLayerOptions;
+  capabilities?: ol.format.XML;
+  protected olLayer: ol.layer.Tile;
 
   constructor(options: WMSLayerOptions, capabilities?: ol.format.XML) {
-    super(options, capabilities);
+    super(options);
+    this.capabilities = capabilities;
   }
 
-  createOlLayer(options: WMSLayerOptions,
-    capabilities: ol.format.WMSCapabilities): ol.layer.Image {
-
-    if (capabilities) {
-      const olLayerOptionsGetCapabilities = this.optionsFromCapabilities(capabilities,
-        options);
-      const olLayerOptions = Object.assign(options.view || {}, olLayerOptionsGetCapabilities, {
-        source: new ol.source.ImageWMS(olLayerOptionsGetCapabilities.source)
+  protected createOlLayer(): ol.layer.Image {
+    let layerOptions;
+    if (this.capabilities) {
+      const capabilityOptions = this.getOptionsFromCapabilities();
+      layerOptions = Object.assign(this.options.view || {}, capabilityOptions, {
+        source: new ol.source.ImageWMS(capabilityOptions.source)
       });
-      this.olLayer = new ol.layer.Image(olLayerOptions);
-
     } else {
-      const olLayerOptions = Object.assign(options.view || {}, options, {
-        source: new ol.source.ImageWMS(options.source)
+      layerOptions = Object.assign(this.options.view || {}, this.options, {
+        source: new ol.source.ImageWMS(this.options.source)
       });
-      this.olLayer = new ol.layer.Image(olLayerOptions);
     }
-    return this.olLayer;
+
+    return new ol.layer.Image(layerOptions);
   }
 
   /** Get layer's properties from capabilities */
-  optionsFromCapabilities(capabilities: any,
-    options: WMSLayerOptions): WMSLayerOptions {
-
-    const layer = this.findLayerInCapabilities(capabilities.Capability.Layer,
-      options.source.params['layers']);
+  getOptionsFromCapabilities(): WMSLayerOptions {
+    const capabilities = this.capabilities as any;
+    const layer = this.findLayerInCapabilities(
+      capabilities.Capability.Layer,
+      this.options.source.params['layers']);
 
     // TODO: getcapabilities attribution is not working
     // let attribution;
@@ -57,7 +56,7 @@ export class WMSLayer extends Layer {
     // }
     //
     // if (attribution) {
-    //   Object.assign(options.source, {
+    //   Object.assign(options.source, {
     //     'attributions': new ol.Attribution({
     //       html: '<a href="' + attribution.onlineResource +
     //       '" target="_blank">' +
@@ -94,13 +93,11 @@ export class WMSLayer extends Layer {
     //     layer.BoundingBox[0].extent[2], layer.BoundingBox[0].extent[3]];
     // }
 
-    Object.assign(optionsFromCapabilities, options);
-    return optionsFromCapabilities;
+    return Object.assign(optionsFromCapabilities, this.options);
   }
 
   /** Find a layer among capabilities's layers from it's name */
   findLayerInCapabilities(layerArray, name) {
-
     if (Array.isArray(layerArray)) {
       let layer;
       layerArray.find(value => {
diff --git a/src/app/map/shared/layers/layer-wmts.ts b/src/app/map/shared/layers/layer-wmts.ts
index 588560f00..75bfadee9 100644
--- a/src/app/map/shared/layers/layer-wmts.ts
+++ b/src/app/map/shared/layers/layer-wmts.ts
@@ -8,35 +8,34 @@ export interface WMTSLayerOptions extends LayerOptions {
 
 export class WMTSLayer extends Layer {
 
-  olLayer: ol.layer.Tile;
+  options: WMTSLayerOptions;
+  capabilities?: ol.format.XML;
+  protected olLayer: ol.layer.Tile;
 
   constructor(options: WMTSLayerOptions, capabilities?: ol.format.XML) {
-    super(options, capabilities);
+    super(options);
+    this.capabilities = capabilities;
   }
 
-  createOlLayer(options: WMTSLayerOptions,
-    capabilities: ol.format.WMTSCapabilities): ol.layer.Tile {
-
-    if (capabilities) {
-      const olLayerOptionsGetCapabilities = ol.source.WMTS.optionsFromCapabilities(capabilities,
-        options.source);
-
-      const olLayerOptions = Object.assign({}, options.view, {
-        source: new ol.source.WMTS(olLayerOptionsGetCapabilities)
-      });
-      this.olLayer = new ol.layer.Tile(olLayerOptions);
-
+  protected createOlLayer(): ol.layer.Tile {
+    let sourceOptions;
+    if (this.capabilities) {
+      sourceOptions = ol.source.WMTS.optionsFromCapabilities(
+        this.capabilities, this.options.source);
     } else {
-      const optionsSource = Object.assign({},
-        options.source,
-        { tileGrid: this.getDefaultTileGrid(options) }
-      );
-      this.olLayer = new ol.layer.Tile({ source: new ol.source.WMTS(optionsSource) });
+      sourceOptions = Object.assign({
+        tileGrid: this.getDefaultTileGrid(this.options)
+      }, this.options.source);
     }
-    return this.olLayer;
+
+    const layerOptions = Object.assign({}, this.options.view || {}, {
+      source: new ol.source.WMTS(sourceOptions)
+    });
+
+    return new ol.layer.Tile(layerOptions);
   }
 
-  // TODO Support others projections ?
+  // TODO Support other projections ?
   getDefaultTileGrid(options: WMTSLayerOptions): ol.tilegrid.WMTS {
 
     const projection = options.source.projection ?
@@ -51,7 +50,7 @@ export class WMTSLayer extends Layer {
       matrixIds[z] = z;
     }
 
-    return new ol.tilegrid.WMTS({
+    return new ol.tilegrid.WMTS({
       origin: ol.extent.getTopLeft(projectionExtent),
       resolutions: resolutions,
       matrixIds: matrixIds
diff --git a/src/app/map/shared/layers/layer-xyz.ts b/src/app/map/shared/layers/layer-xyz.ts
index a93e3b8e6..15f84f096 100644
--- a/src/app/map/shared/layers/layer-xyz.ts
+++ b/src/app/map/shared/layers/layer-xyz.ts
@@ -7,17 +7,14 @@ export interface XYZLayerOptions extends LayerOptions {
 
 export class XYZLayer extends Layer {
 
-  olLayer: ol.layer.Tile;
+  options: XYZLayerOptions;
+  protected olLayer: ol.layer.Tile;
 
-  createOlLayer(options: XYZLayerOptions): ol.layer.Tile {
-    const olLayerOptions = Object.assign(options.view || {}, {
-      source: new ol.source.XYZ(options.source)
+  protected createOlLayer(): ol.layer.Tile {
+    const olLayerOptions = Object.assign(this.options.view || {}, {
+      source: new ol.source.XYZ(this.options.source)
     });
 
     return new ol.layer.Tile(olLayerOptions);
   }
-
-  constructor(options: XYZLayerOptions) {
-    super(options);
-  }
 }
diff --git a/src/app/map/shared/layers/layer.ts b/src/app/map/shared/layers/layer.ts
index 77c3ce0eb..1149b8fdb 100644
--- a/src/app/map/shared/layers/layer.ts
+++ b/src/app/map/shared/layers/layer.ts
@@ -13,19 +13,24 @@ export interface LayerOptions extends olx.layer.BaseOptions {
 
 export abstract class Layer {
 
-  olLayer: ol.layer.Layer;
-  name: string;
-  type: string;
+  options: LayerOptions;
+  protected olLayer: ol.layer.Layer;
+
+  constructor(options: LayerOptions) {
+    this.options = options;
+  }
+
+  protected abstract createOlLayer(): ol.layer.Layer;
 
-  abstract createOlLayer(options: LayerOptions, capabilities?: ol.format.XML): ol.layer.Layer;
+  getOlLayer() {
+    if (this.olLayer === undefined) {
+      this.olLayer = this.createOlLayer();
+    }
 
-  constructor(options: LayerOptions, capabilities?: ol.format.XML) {
-    this.name = options.name;
-    this.type = options.type;
-    this.olLayer = this.createOlLayer(options, capabilities);
+    return this.olLayer;
   }
 
   getSource() {
-    return this.olLayer.getSource();
+    return this.getOlLayer().getSource();
   }
 }
diff --git a/src/app/map/shared/map.ts b/src/app/map/shared/map.ts
index fe6245105..ec7551e23 100644
--- a/src/app/map/shared/map.ts
+++ b/src/app/map/shared/map.ts
@@ -1,3 +1,5 @@
+import { Subject } from 'rxjs/Subject';
+
 import { Layer } from './layers/layer';
 import { VectorLayer } from './layers/layer-vector';
 
@@ -13,8 +15,9 @@ export interface MapOptions {
 export class IgoMap {
 
   olMap: ol.Map;
+  layers = new Subject<Layer[]>();
 
-  private layers: Layer[] = [];
+  private _layers: Layer[] = [];
   private overlayLayer: VectorLayer;
   private overlaySource: ol.source.Vector;
   private overlayStyle: ol.style.Style;
@@ -50,8 +53,8 @@ export class IgoMap {
       type: 'vector'
     });
     this.overlaySource = (this.overlayLayer.getSource() as ol.source.Vector);
-    this.olMap.addLayer(this.overlayLayer.olLayer);
-    this.overlayLayer.olLayer.setZIndex(999);
+    this.olMap.addLayer(this.overlayLayer.getOlLayer());
+    this.overlayLayer.getOlLayer().setZIndex(999);
   }
 
   getProjection() {
@@ -94,13 +97,20 @@ export class IgoMap {
   }
 
   addLayer(layer: Layer) {
-    this.layers.push(layer);
-    this.olMap.addLayer(layer.olLayer);
+    this._layers.push(layer);
+    this.olMap.addLayer(layer.getOlLayer());
+    this.layers.next(this._layers);
   }
 
   removeLayers() {
-    this.layers.forEach(layer =>
-      this.olMap.removeLayer(layer.olLayer), this);
+    this._layers.forEach(layer =>
+      this.olMap.removeLayer(layer.getOlLayer()), this);
+    this._layers = [];
+    this.layers.next(this._layers);
+  }
+
+  getLayers() {
+    return this._layers;
   }
 
   moveToExtent(extent: ol.Extent) {
diff --git a/src/app/search/search-bar/search-bar.component.html b/src/app/search/search-bar/search-bar.component.html
index 4e68332c2..ae1d02811 100644
--- a/src/app/search/search-bar/search-bar.component.html
+++ b/src/app/search/search-bar/search-bar.component.html
@@ -2,7 +2,8 @@
   <input
     #input
     mdInput
-    [placeholder]="'Search for an address or a place' | translate"
+    [disabled]="disabled"
+    [placeholder]="(disabled ? 'Search disabled' : 'Search for an address or a place') | translate"
     (keyup)="keyup($event)"
     [ngModel]="term">
   <button
diff --git a/src/app/search/search-bar/search-bar.component.styl b/src/app/search/search-bar/search-bar.component.styl
index 720f6fe74..37410627b 100644
--- a/src/app/search/search-bar/search-bar.component.styl
+++ b/src/app/search/search-bar/search-bar.component.styl
@@ -4,7 +4,7 @@ input {
   height: $igo-icon-button-height;
 }
 
-.igo-search-bar {
+input {
   background-color: $igo-background-color;
 }
 
diff --git a/src/app/search/search-bar/search-bar.component.ts b/src/app/search/search-bar/search-bar.component.ts
index 68bb13584..290308598 100644
--- a/src/app/search/search-bar/search-bar.component.ts
+++ b/src/app/search/search-bar/search-bar.component.ts
@@ -26,6 +26,10 @@ export class SearchBarComponent implements OnInit {
   private searchTermsStream = new Subject<string>();
   readonly preValidationSearch = ['Control', 'Shift', 'Alt'];
 
+  get disabled () {
+    return this.searchTool === undefined;
+  }
+
   constructor(private store: Store<IgoStore>,
               private searchService: SearchService) {}
 
@@ -79,6 +83,10 @@ export class SearchBarComponent implements OnInit {
   }
 
   search(term: string): void {
+    if (this.disabled) {
+      return;
+    }
+
     this.searchTermsStream.next(term);
   }
 
diff --git a/src/app/search/search-tool/search-tool.component.html b/src/app/search/search-tool/search-tool.component.html
index 88fd98279..aedeecd49 100644
--- a/src/app/search/search-tool/search-tool.component.html
+++ b/src/app/search/search-tool/search-tool.component.html
@@ -3,10 +3,9 @@
     <igo-collapsible
         title="{{sourceResult[0]}} ({{sourceResult[1].length}})">
 
-      <template ngFor let-result [ngForOf]="sourceResult[1]" let-i="index">
+      <template ngFor let-result [ngForOf]="sourceResult[1]">
         <igo-search-result
           igoListItem
-          tabindex="{{i}}"
           [focused]="focusedResult && focusedResult.id === result.id
                      && focusedResult.source === sourceResult[0]"
           [result]="result"
diff --git a/src/app/store/reducers/edited-layer.reducer.ts b/src/app/store/reducers/edited-layer.reducer.ts
new file mode 100644
index 000000000..6ca139a67
--- /dev/null
+++ b/src/app/store/reducers/edited-layer.reducer.ts
@@ -0,0 +1,10 @@
+import { LayerOptions } from '../../map/shared/layers/layer';
+
+export function editedLayer (state: LayerOptions = null, {type, payload}) {
+  switch (type) {
+    case 'EDIT_LAYER':
+      return Object.assign({}, payload);
+    default:
+      return state;
+  }
+};
diff --git a/src/app/store/reducers/index.ts b/src/app/store/reducers/index.ts
index ba7b273a5..d11ce90c8 100644
--- a/src/app/store/reducers/index.ts
+++ b/src/app/store/reducers/index.ts
@@ -1,8 +1,9 @@
 export * from './active-context.reducer';
 export * from './edited-context.reducer';
-export * from './tools-list.reducer';
-export * from './map-view.reducer';
-export * from './map-layers.reducer';
+export * from './edited-layer.reducer';
+export * from './tools.reducer';
+export * from './map.reducer';
+export * from './layers.reducer';
 export * from './selected-tool.reducer';
 export * from './search-results.reducer';
 export * from './selected-result.reducer';
diff --git a/src/app/store/reducers/map-layers.reducer.ts b/src/app/store/reducers/layers.reducer.ts
similarity index 68%
rename from src/app/store/reducers/map-layers.reducer.ts
rename to src/app/store/reducers/layers.reducer.ts
index 0d4258306..bc9652bd2 100644
--- a/src/app/store/reducers/map-layers.reducer.ts
+++ b/src/app/store/reducers/layers.reducer.ts
@@ -1,6 +1,6 @@
 import { LayerOptions } from '../../map/shared/layers/layer';
 
-export function mapLayers(state: Array<LayerOptions> = [], {type, payload}) {
+export function layers(state: Array<LayerOptions> = [], {type, payload}) {
   switch (type) {
     case 'SET_LAYERS':
       return payload;
diff --git a/src/app/store/reducers/map-view.reducer.ts b/src/app/store/reducers/map-view.reducer.ts
deleted file mode 100644
index ac1a01dfa..000000000
--- a/src/app/store/reducers/map-view.reducer.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export function mapView (state: olx.ViewOptions = null, {type, payload}) {
-  switch (type) {
-    case 'SET_VIEW':
-      return Object.assign({}, payload);
-    default:
-      return state;
-  }
-};
diff --git a/src/app/store/reducers/map.reducer.ts b/src/app/store/reducers/map.reducer.ts
new file mode 100644
index 000000000..935ef436c
--- /dev/null
+++ b/src/app/store/reducers/map.reducer.ts
@@ -0,0 +1,10 @@
+import { MapOptions } from '../../map/shared/map';
+
+export function map(state: MapOptions = null, {type, payload}) {
+  switch (type) {
+    case 'SET_MAP':
+      return Object.assign({}, payload);
+    default:
+      return state;
+  }
+};
diff --git a/src/app/store/reducers/tools-list.reducer.ts b/src/app/store/reducers/tools.reducer.ts
similarity index 71%
rename from src/app/store/reducers/tools-list.reducer.ts
rename to src/app/store/reducers/tools.reducer.ts
index b6e0aff70..d5b3b6075 100644
--- a/src/app/store/reducers/tools-list.reducer.ts
+++ b/src/app/store/reducers/tools.reducer.ts
@@ -1,6 +1,6 @@
 import { Tool } from '../../tool/shared/tool.interface';
 
-export function toolsList(state: Tool[] = [], {type, payload}) {
+export function tools(state: Tool[] = [], {type, payload}) {
   switch (type) {
     case 'SET_TOOLS':
       return payload;
diff --git a/src/app/store/store.module.ts b/src/app/store/store.module.ts
index 63ff6699d..e2c9ef365 100644
--- a/src/app/store/store.module.ts
+++ b/src/app/store/store.module.ts
@@ -7,10 +7,11 @@ import {throwIfAlreadyLoaded } from '../core/module-import.guard';
 import {
   activeContext,
   editedContext,
-  mapView,
-  mapLayers,
+  editedLayer,
+  map,
+  layers,
+  tools,
   selectedTool,
-  toolsList,
   searchResults,
   selectedResult,
   focusedResult
@@ -21,13 +22,14 @@ export function provideIgoStore() {
   return provideStore({
     activeContext: activeContext,
     editedContext: editedContext,
-    mapView: mapView,
-    mapLayers: mapLayers,
+    editedLayer: editedLayer,
+    map: map,
+    layers: layers,
+    tools: tools,
     selectedTool: selectedTool,
     searchResults: searchResults,
     selectedResult: selectedResult,
-    focusedResult: focusedResult,
-    tools: toolsList
+    focusedResult: focusedResult
   });
 }
 
diff --git a/src/app/store/store.ts b/src/app/store/store.ts
index 2ba533208..4c33a3c2b 100644
--- a/src/app/store/store.ts
+++ b/src/app/store/store.ts
@@ -2,16 +2,17 @@ import { Context } from '../context/shared/context.interface';
 import { Tool } from '../tool/shared/tool.interface';
 import { SearchResult } from '../search/shared/search-result.interface';
 import { LayerOptions } from '../map/shared/layers/layer';
-import { MapViewOptions } from '../map/shared/map';
+import { MapOptions } from '../map/shared/map';
 
 export interface IgoStore {
   activeContext: Context;
   editedContext: Context;
+  editedLayer: LayerOptions;
   selectedTool: Tool;
-  mapView: MapViewOptions;
-  mapLayers: Array<LayerOptions>;
+  map: MapOptions;
+  layers: Array<LayerOptions>;
+  tools: Tool[];
   searchResults: any;
   selectedResult: SearchResult;
   focusedResult: SearchResult;
-  tools: Tool[];
 }
diff --git a/src/assets/locale/en.json b/src/assets/locale/en.json
index 2caa6519f..ff138855e 100644
--- a/src/assets/locale/en.json
+++ b/src/assets/locale/en.json
@@ -3,6 +3,7 @@
   "Contexts": "Contexts",
   "Description": "Description",
   "Edit Context": "Edit Context",
+  "Edit Layer": "Edit Layer",
   "Map": "Map",
   "Go Back": "Go back",
   "Open Menu": "Show menu",
@@ -22,6 +23,7 @@
   "Save": "Save",
   "Search Results": "Search Results",
   "Search for an address or a place": "Search for an address, a place or a layer",
+  "Search disabled": "The search tool is disabled in this context",
   "Title": "Title",
 
   "contextTitleValidation": "Title is required (minimum 3 characters)."
diff --git a/src/assets/locale/fr.json b/src/assets/locale/fr.json
index 7934a5b98..e6353d1f6 100644
--- a/src/assets/locale/fr.json
+++ b/src/assets/locale/fr.json
@@ -3,6 +3,7 @@
   "Contexts": "Vos contextes",
   "Description": "Description",
   "Edit Context": "Modifier contexte",
+  "Edit Layer": "Modifier couche",
   "Map": "Carte",
   "Go Back": "Revenir",
   "Open Menu": "Afficher le menu",
@@ -22,6 +23,7 @@
   "Save": "Sauvegarder",
   "Search Results": "Résultats de recherche",
   "Search for an address or a place": "Rechercher une adresse, un lieu ou une couche",
+  "Search disabled": "L'outil de recherche est désactivé dans ce contexte",
   "Title": "Titre",
 
   "contextTitleValidation": "Un titre est requis (minimum 3 caractères)."
diff --git a/src/contexts/_default.json b/src/contexts/_default.json
index 25c359f1f..12bafe47a 100644
--- a/src/contexts/_default.json
+++ b/src/contexts/_default.json
@@ -17,7 +17,7 @@
   "toolbar": [
     "search",
     "context",
-    "map",
+    "mapEditor",
     "layers",
     "directions",
     "historicalAnalysis",
@@ -35,9 +35,10 @@
       "name": "contextEditor"
     },
     {
-      "name": "map",
-      "title": "Map",
-      "icon": "map"
+      "name": "mapEditor"
+    },
+    {
+      "name": "layerEditor"
     },
     {
       "name": "layers",
diff --git a/src/contexts/qc911.json b/src/contexts/qc911.json
index 6fa257c50..877cd102c 100644
--- a/src/contexts/qc911.json
+++ b/src/contexts/qc911.json
@@ -33,7 +33,7 @@
 	"toolbar": [
 		"search",
 		"context",
-		"map",
+		"mapEditor",
 		"layers",
 		"directions",
 		"historicalAnalysis",
@@ -47,9 +47,7 @@
 	}, {
 		"name": "contextEditor"
 	}, {
-		"name": "map",
-		"title": "Map",
-		"icon": "map"
+		"name": "mapEditor"
 	}, {
 		"name": "layers",
 		"title": "Add Layers",
diff --git a/src/css/theme.styl b/src/css/theme.styl
index 120ad0a5e..4d69bb854 100644
--- a/src/css/theme.styl
+++ b/src/css/theme.styl
@@ -9,7 +9,7 @@ $igo-primary-color-hover = rgba(25, 118, 210, 0.2);
 $igo-secondary-color = rgb(224, 224, 224);
 $igo-secondary-color-hover = rgba(224, 224, 224, 0.2);
 
-/* secondary - ($md-red, 700) */
+/* warn - ($md-red, 700) */
 $igo-warn-color = rgb(211, 47, 47);
 
 /* background - white */

From 7600e7ffede9476d2125cc0e50d1400af4f2860d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Tue, 7 Mar 2017 17:12:12 -0500
Subject: [PATCH 2/5] Delete edited-layer.reducer.ts

---
 src/app/store/reducers/edited-layer.reducer.ts | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 src/app/store/reducers/edited-layer.reducer.ts

diff --git a/src/app/store/reducers/edited-layer.reducer.ts b/src/app/store/reducers/edited-layer.reducer.ts
deleted file mode 100644
index 6ca139a67..000000000
--- a/src/app/store/reducers/edited-layer.reducer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { LayerOptions } from '../../map/shared/layers/layer';
-
-export function editedLayer (state: LayerOptions = null, {type, payload}) {
-  switch (type) {
-    case 'EDIT_LAYER':
-      return Object.assign({}, payload);
-    default:
-      return state;
-  }
-};

From 9cc652ccee929b30d0f566071d327cc13dd313c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Tue, 7 Mar 2017 17:12:29 -0500
Subject: [PATCH 3/5] Update index.ts

---
 src/app/store/reducers/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/store/reducers/index.ts b/src/app/store/reducers/index.ts
index d11ce90c8..4cbb513cf 100644
--- a/src/app/store/reducers/index.ts
+++ b/src/app/store/reducers/index.ts
@@ -1,6 +1,5 @@
 export * from './active-context.reducer';
 export * from './edited-context.reducer';
-export * from './edited-layer.reducer';
 export * from './tools.reducer';
 export * from './map.reducer';
 export * from './layers.reducer';

From e73cbeb2b436af213b0716925d7602760b8826a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Tue, 7 Mar 2017 17:13:02 -0500
Subject: [PATCH 4/5] Update store.module.ts

---
 src/app/store/store.module.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/store/store.module.ts b/src/app/store/store.module.ts
index e2c9ef365..63adc4d9b 100644
--- a/src/app/store/store.module.ts
+++ b/src/app/store/store.module.ts
@@ -7,7 +7,6 @@ import {throwIfAlreadyLoaded } from '../core/module-import.guard';
 import {
   activeContext,
   editedContext,
-  editedLayer,
   map,
   layers,
   tools,
@@ -22,7 +21,6 @@ export function provideIgoStore() {
   return provideStore({
     activeContext: activeContext,
     editedContext: editedContext,
-    editedLayer: editedLayer,
     map: map,
     layers: layers,
     tools: tools,

From f01a107d740c50239ee319598458f1ab7fd5149e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?=
 <marc-andre.barbeau@msp.gouv.qc.ca>
Date: Tue, 7 Mar 2017 17:14:29 -0500
Subject: [PATCH 5/5] Update store.ts

---
 src/app/store/store.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/store/store.ts b/src/app/store/store.ts
index 4c33a3c2b..a7e0df079 100644
--- a/src/app/store/store.ts
+++ b/src/app/store/store.ts
@@ -7,7 +7,6 @@ import { MapOptions } from '../map/shared/map';
 export interface IgoStore {
   activeContext: Context;
   editedContext: Context;
-  editedLayer: LayerOptions;
   selectedTool: Tool;
   map: MapOptions;
   layers: Array<LayerOptions>;