1 files changed, 88 insertions, 62 deletions

diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js
index 3ba7fff7..4e3a6d70 100644
--- a/node_modules/montage-google/map.reel/map.js
+++ b/node_modules/montage-google/map.reel/map.js
@@ -20,20 +20,24 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
     didCreate: {
         value: function() {
             var self = this;
+
             window.initialize = function initialize() {
-                console.log('google maps api loaded');
                 self._mapLoaded = true;
                 self._geoCoder = new google.maps.Geocoder();
+                self.center = self._center;
                 self.needsDraw = true;
             };
         }
     },
-    
-    _geoCoder: {value: null}, 
-    
+
+    _geoCoder: {value: null},
+
     // HTMLElement to load the Map into
-    mapEl: {value: null},
-    
+    mapEl: {
+        serializable: true,
+        value: null
+    },
+
     _mapLoaded: {
         enumerable: false,
         value: false
@@ -42,16 +46,16 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
         enumerable: false,
         value: false
     },
-   
+
     // Sunnyvale, CA
     defaultLatLng: {
         value: {lat: 37.37, lng: -122.03}
     },
 
     _latLng: {
-        value: this.defaultLatLng, 
-        distinct: true
+        value: null
     },
+
     latLng: {
         get: function() {
             return this._latLng;
@@ -67,6 +71,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
 
     // {lat, lon} Or a String representing the location (eg: Paris, France)
     center: {
+        serializable: true,
         get: function() {
             return this._center;
         },
@@ -75,13 +80,15 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 var self = this, geocoder = this._geoCoder;
                 this._center = value;
                 if(this._mapLoaded) {
-                    
+
                     if(String.isString(value)) {
                         // geocode
+                        self.LatLng = null;
                         geocoder.geocode( { 'address': value}, function(results, status) {
                             if (status == google.maps.GeocoderStatus.OK) {
                                 var loc = results[0].geometry.location;
                                 self.latLng = {lat: loc.lat(), lng: loc.lng()};
+                                self.category = self._category;
                             } else {
                                 console.log('Geocode was not successful : ' + status);
                             }
@@ -92,28 +99,30 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                          // default location
                          this.latLng = this.defaultLatLng;
                     }
-                    
+
                 }
-                
+
             }
 
         }
     },
 
     category: {
+        serializable: true,
         get: function() {
             return this._category;
         },
         set: function(value) {
-            console.log('category set: ' + value);
             if(value) {
                 this._category = value;
-                this._getPlaces(this._category);
-                this.needsDraw = true;
+                if (this._map && this.latLng) {
+                    this._getPlaces(this._category);
+                    this.needsDraw = true;
+                }
             }
         }
     },
-    
+
     trafficLayer: {value: null},
     _traffic: {value: null},
     traffic: {
@@ -127,12 +136,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
-    
+
+
     zoomValue: {
-        value: 8
+        value: 13
     },
-    
+
     __places: {value: null},
     _places: {
         get: function() {
@@ -145,11 +154,11 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
         }
     },
-    
+
     _getPlaces: {
         value: function(type, keyword) {
             var self = this;
-            var request = {                
+            var request = {
                 location: new window.google.maps.LatLng(this.latLng.lat, this.latLng.lng),
                 radius: 5000,
                 types: [type]
@@ -159,16 +168,16 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             }
             var service = new google.maps.places.PlacesService(this._map);
             service.search(request, function(results, status) {
-                console.log('got places for ', self.category, status, results);
                 if (status == google.maps.places.PlacesServiceStatus.OK) {
                     self._places = results;
                 } else {
                     self._places = [];
                 }
+                self.needsDraw = true;
             });
         }
     },
-    
+
     _infoWindow: {value: null},
     _markers: {value: null},
     _createMarker: {
@@ -192,20 +201,20 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 icon = '41-picture-frame.png';
                 break;
                 case 'gas_station':
-                icon = '47-fuel.png';                
+                icon = '47-fuel.png';
                 break;
             };
             if(icon) {
                 image = new google.maps.MarkerImage('images/' + icon);
-            }            
+            }
             var options = {
                 map: map,
                 position: place.geometry.location
             };
             if(image) {
                 options.icon = image;