merge with master
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 21:05:54 +0000 (22:05 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 21:05:54 +0000 (22:05 +0100)
1  2 
src/components/map/map.ts

@@@ -47,32 -47,73 +47,30 @@@ export class Map 
          this.hideModal = document.getElementById("divModal").style.visibility = "hidden";
      }
  
 -    showModal() {
 -        return this.hideModal = document.getElementById("divModal").style.visibility = "visible";
 -    }
 -
 -    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";
 -
 -        this.setRunned(false);
 +    setActiveId(id) { this.activeId = id; }
  
 -    }
 -
 -    html() {
 -        this.currentMarker.setMap(null);
 +    getMap() { return this.map; }
  
 -        this.closeModal();
 -    }
 +    getHttp() { return this.http; }
  
 -    setActiveId(id) {
 -        this.activeId = id;
 -    }
 +    setcurrentPos(latlng) { this.currentPos = latlng; }
  
 -    getMap() {
 -        return this.map;
 -    }
 +    getcurrentPos() { return this.currentPos; }
  
 -    getHttp() {
 -        return this.http;
 -    }
 -
 -    setcurrentPos(latlng) {
 -        this.currentPos = latlng;
 -    }
 -
 -    getcurrentPos() {
 -        return this.currentPos;
 -    }
 +    setParent(id) {  this.parent = id; }
  
 -    setParent(id) {
 -        this.parent = id;
 -    }
 +    getParent() { return this.parent; }
  
 -    getParent() {
 -        return this.parent;
 -    }
 +    setRunned(value) { this.runned = value; }
  
 -    setRunned(value) {
 -        this.runned = value;
 -    }
 +    setupRunned(value) { this.uprunned = value; }
  
 -    setupRunned(value) {
 -        this.uprunned = value;
 -    }
 +    setLevel(value) { this.LEVEL = value; }
  
-     getLevel(){ return this.LEVEL; }
 -    setLevel(value) {
 -        this.LEVEL = value;
 -    }
 +    addLevel() { this.LEVEL++; }
  
 -    addLevel() {
 -        this.LEVEL++;
 -    }
 +    upLevel() { this.LEVEL--; }
  
 -    upLevel() {
 -        this.LEVEL--;
 -    }
  
      init() {
  
  
      }
  
+     tempMarker(pos) {
+         let map = this.map;
+         if(this.currentMarker)
+             this.currentMarker.setMap(null);
+         this.currentMarker = new google.maps.Marker({
+             position: pos,
+             map: map,
+             title: 'neworg',
+             icon: {
+                 path: google.maps.SymbolPath.CIRCLE,
+                 scale: 3
+             }
+         });
+         this.currentMarker.setMap(map);
+     }
 +    showModal() {
 +        return this.hideModal = document.getElementById("divModal").style.visibility = "visible";
 +    }
 +
 +    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";
 +
 +        this.setRunned(false);
 +    }
 +
  }