not-to-lose commits

Author: allenhwkim

controllers/map-controller.js

@@ -55,7 +55,10 @@
       if (obj.map) {
         var objs = obj.map[groupName];
         for (var name in objs) {
-          objs[name] === obj && (delete objs[name]);
+          if (objs[name] === obj) {
+            google.maps.event.clearInstanceListeners(obj);
+            delete objs[name];
+          }
         }
 
         /* delete from map */
@@ -107,7 +110,7 @@
      * @param {String} group name of group e.g., markers
      */
     vm.objectChanged = function(group) {
-      if (
+      if ( vm.map &&
         (group == 'markers' || group == 'customMarkers') &&
         vm.map.zoomToIncludeMarkers == 'auto'
       ) {

services/ng-map-pool.js

@@ -0,0 +1,75 @@
+(function() {
+  var mapInstances = [];
+
+  var add = function(el) {
+    var ngMapDiv = getNgMapDiv(el);
+    el.appendChild(ngMapDiv);
+    var map = new google.maps.Map(ngMapDiv, {});
+    mapInstances.push(map);
+    return map;
+  };
+  
+  var find = function(el) {
+    getMapInstance.forEach(function(map) {
+      if (!map.inUse) {
+        var mapDiv = map.getDiv();
+        el.appendChild(mapDiv);
+        return map;
+      }
+    });
+    return;
+  };
+
+  var getMapInstance = function(el) {
+    var map = find(el) || add(el);
+    map.inUse = true;
+    return map;
+  };
+
+
+  /**
+   * @memberof NgMapPool
+   * @function getNgMapDiv
+   * @param {HTMLElemnet} el html element
+   * @returns map DIV elemnt
+   * @desc
+   * create a new `div` inside map tag, so that it does not touch map element
+   * and disable drag event for the elmement
+   */
+  var getNgMapDiv = function(ngMapEl) {
+    var el = $document.createElement("div");
+    var defaultStyle = ngMapEl.getAttribute('default-style');
+    el.style.width = "100%";
+    el.style.height = "100%";
+
+    //if style is not given to the map element, set display and height
+    if (defaultStyle == "true") {
+        ngMapEl.style.display = 'block';
+        ngMapEl.style.height = '300px';
+    } else {
+      if (getStyle(ngMapEl, 'display') != "block") {
+        ngMapEl.style.display = 'block';
+      }
+      if (getStyle(ngMapEl, 'height').match(/^(0|auto)/)) {
+        ngMapEl.style.height = '300px';
+      }
+    }
+
+    // disable drag event
+    el.addEventListener('dragstart', function (event) {
+      event.preventDefault();
+      return false;
+    });
+    return el;
+  };
+
+  angular.module('ngMap').factory('NgMapPool', function() {
+    var NgMapPool = function(_$document_) {
+      $document = _$document_[0];
+
+      return {
+        getMapInstance: getMapInstance
+      };
+    };
+    NgMap.$inject = [ '$document' ]; 
+})();

services/ng-map.js

@@ -73,7 +73,12 @@
    */
   var deleteMap = function(mapCtrl) {
     var len = Object.keys(mapControllers).length - 1;
-    delete mapControllers[mapCtrl.map.id || len];
+    var mapController = mapControllers[mapCtrl.map.id || len];
+    var map = mapController.map;
+    var mapId = mapCtrl.map.id || len;
+
+    mapCtrl.map.inUse = false;
+    delete mapControllers[mapId];
   };
 
   /**
@@ -95,41 +100,6 @@
     return y;
   };
 
-  /**
-   * @memberof NgMap
-   * @function getNgMapDiv
-   * @param {HTMLElemnet} el html element
-   * @returns map DIV elemnt
-   * @desc
-   * create a new `div` inside map tag, so that it does not touch map element
-   * and disable drag event for the elmement
-   */
-  var getNgMapDiv = function(ngMapEl) {
-    var el = $document.createElement("div");
-    var defaultStyle = ngMapEl.getAttribute('default-style');
-    el.style.width = "100%";
-    el.style.height = "100%";
-
-    //if style is not given to the map element, set display and height
-    if (defaultStyle == "true") {
-        ngMapEl.style.display = 'block';
-        ngMapEl.style.height = '300px';
-    } else {
-      if (getStyle(ngMapEl, 'display') != "block") {
-        ngMapEl.style.display = 'block';
-      }
-      if (getStyle(ngMapEl, 'height').match(/^(0|auto)/)) {
-        ngMapEl.style.height = '300px';
-      }
-    }
-
-    // disable drag event
-    el.addEventListener('dragstart', function (event) {
-      event.preventDefault();
-      return false;
-    });
-    return el;
-  };
 
   /**
    * @memberof NgMap