yay merge
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 21:45:54 +0000 (22:45 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 21:45:54 +0000 (22:45 +0100)
1  2 
src/components/map/map.ts

@@@ -53,76 -46,32 +53,32 @@@ export class Map 
          this.hideModal = document.getElementById("topLevel").style.visibility = "hidden";
          this.hideModal = document.getElementById("middleLevel").style.visibility = "hidden";
          this.hideModal = document.getElementById("bottomLevel").style.visibility = "hidden";
 -        this.hideModal = document.getElementById("divModal").style.visibility = "hidden";
 +        this.hideModal = document.getElementById("divModal").style.display = "none";
      }
  
-     showModal() {
-         return this.hideModal = document.getElementById("divModal").style.display = "block";
-     }
+     setActiveId(id) { this.activeId = id; }
  
-     closeModal() {
-         this.hideModal = document.getElementById("topLevel").style.visibility = "hidden";
-         this.hideModal = document.getElementById("middleLevel").style.visibility = "hidden";
-         this.hideModal = document.getElementById("bottomLevel").style.visibility = "hidden";
-         this.hideModal = document.getElementById("divModal").style.visibility = "hidden";
+     getMap() { return this.map; }
  
-         this.setRunned(false);
+     getHttp() { return this.http; }
  
-     }
+     setcurrentPos(latlng) { this.currentPos = latlng; }
  
-     html() {
-         this.currentMarker.setMap(null);
+     getcurrentPos() { return this.currentPos; }
  
-         this.closeModal();
-     }
+     setParent(id) {  this.parent = id; }
  
-     setActiveId(id) {
-         this.activeId = id;
-     }
+     getParent() { return this.parent; }
  
-     getMap() {
-         return this.map;
-     }
+     setRunned(value) { this.runned = value; }
  
-     getHttp() {
-         return this.http;
-     }
+     setupRunned(value) { this.uprunned = value; }
  
-     setcurrentPos(latlng) {
-         this.currentPos = latlng;
-     }
+     setLevel(value) { this.LEVEL = value; }
  
-     getcurrentPos() {
-         return this.currentPos;
-     }
+     addLevel() { this.LEVEL++; }
  
-     setParent(id) {
-         this.parent = id;
-     }
-     getParent() {
-         return this.parent;
-     }
-     setRunned(value) {
-         this.runned = value;
-     }
-     setupRunned(value) {
-         this.uprunned = value;
-     }
-     setLevel(value) {
-         this.LEVEL = value;
-     }
-     addLevel() {
-         this.LEVEL++;
-     }
-     upLevel() {
-         this.LEVEL--;
-     }
+     upLevel() { this.LEVEL--; }
  
      init() {