#6 - Info layer on map should be open by default - Info on images bug…

… fix (was not showing any text and should be closed by default)
GeographicaGS · Apr 19, 2017 · e6fdc14 · e6fdc14
1 parent b3dd9b7
commit e6fdc14
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 25 deletions.
diff --git a/src/css/shared/elements/info/styles.less b/src/css/shared/elements/info/styles.less
@@ -125,6 +125,7 @@ info {
     .allMapLayers {
       max-height: 92%;
       overflow-y: auto;
+      width: 350px;
       .mapLayerWrapper {
         width: 320px;
         &:not(:last-child) {

diff --git a/src/css/styles.css b/src/css/styles.css
@@ -4638,6 +4638,7 @@ info > .component-container .info.hidden {
 info > .component-container .allMapLayers {
   max-height: 92%;
   overflow-y: auto;
+  width: 350px;
 }
 info > .component-container .allMapLayers .mapLayerWrapper {
   width: 320px;

diff --git a/src/shared/steps/map/MapStep.js b/src/shared/steps/map/MapStep.js
diff --git a/src/shared/steps/map/MapStep.js.map b/src/shared/steps/map/MapStep.js.map
diff --git a/src/shared/steps/map/MapStep.ts b/src/shared/steps/map/MapStep.ts
@@ -69,16 +69,7 @@ export class MapStepComponent extends BaseStepComponent {
         });
         this.mapService.map.scrollZoom.disable();
 
-        this.setActiveLayer();
-    }
-
-    setActiveLayer() {
-        for (let layer in this.step.info) {
-            if (this.step.info[layer].collapsed === false) {
-                this.activeLayer = this.step.info[layer];
-                break;
-            }
-        }
+        this.activeLayer = this.step.info[0];
         this.mapService.map.on('load', () => {
             this.updateLayers(this.activeLayer);
         });

diff --git a/src/templates/shared/elements/info/view.html b/src/templates/shared/elements/info/view.html
@@ -12,8 +12,8 @@
 	</div>
 </div>
 
-<div class="component-container">
-	<div class="allMapLayers" *ngIf="item.length > 1">
+<div class="component-container" (click)="toggleVisibility()">
+	<div class="allMapLayers" *ngIf="item.length > 1" (click)="$event.stopPropagation()">
 		<div class="mapLayerWrapper" *ngFor="let info of item|| []; let i=index">
 			<div class="titleWrapper">
 			    <div
@@ -35,12 +35,12 @@
 		    <div class="credit" [ngClass]="{hidden: info.collapsed === true}">{{info.credit}}</div>
 	    </div>
     </div>
-    <div *ngIf="item.length === 1">
+    <div *ngIf="!item.length"  (click)="$event.stopPropagation()">
 		<div class="title" (click)="toggleLayer(item)">{{item.title}}</div>
 	    <div class="info" [ngClass]="{hidden: item.collapsed === true}">
 	        <element-block [elements]="item.elements"></element-block>
 	    </div>
-	    <div class="credit">
+	    <div class="credit" [ngClass]="{hidden: item.collapsed === true}">
 	        {{item.credit}}
 	    </div>
     </div>

diff --git a/src/templates/shared/steps/map/view.html b/src/templates/shared/steps/map/view.html
@@ -3,6 +3,7 @@
         <info
             *ngIf="hasInfo()"
             [item]="step.info"
+            [collapsed]="false"
             (manageLayers)="updateLayers($event)"
             (downloadShp)="getShpFile($event)"
         ></info>