1 files changed, 40 insertions, 34 deletions

diff --git a/node_modules/montage/ui/map.reel/map.js b/node_modules/montage/ui/map.reel/map.js
index c03d51c5..cba08a42 100644
--- a/node_modules/montage/ui/map.reel/map.js
+++ b/node_modules/montage/ui/map.reel/map.js
@@ -42,37 +42,10 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
         enumerable: false,
         value: false
     },
-    _latitude: {
-        enumerable: false,
-        value: -34.397
-    },
-    latitude: {
-        enumerable: false,
-        set: function(value) {
-            this._latitude = value;
-            this.needsDraw = true;
-        },
-        get: function() {
-            return this._latitude;
-        }
-    },
-    _longitude: {
-        enumerable: false,
-        value: -34.397
-    },
-    longitude: {
-        enumerable: false,
-        set: function(value) {
-            this._longitude = value;
-            this.needsDraw = true;
-        },
-        get: function() {
-            return this._longitude;
-        }
-    },
-    
+   
+    // Sunnyvale, CA
     defaultLatLng: {
-        value: {lat: -34.397, lng: 150.644}
+        value: {lat: 37.37, lng: -122.03}
     },
 
     _latLng: {
@@ -132,6 +105,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             return this._category;
         },
         set: function(value) {
+            console.log('category set: ' + value);
             if(value) {
                 this._category = value;
                 this._getPlaces(this._category);
@@ -140,6 +114,21 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
         }
     },
     
+    trafficLayer: {value: null},
+    _traffic: {value: null},
+    traffic: {
+        get: function() {
+            return this._traffic;
+        },
+        set: function(value) {
+            if(value !== this._traffic) {
+                this._traffic = value;
+                this.needsDraw = true;
+            }
+        }
+    },
+    
+    
     zoomValue: {
         value: 8
     },
@@ -170,6 +159,7 @@ 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 {
@@ -192,12 +182,18 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 case 'hospital':
                 icon = '10-medical.png';
                 break;
-                case 'cafe':
-                icon = '34-coffee.png';
+                case 'bar':
+                icon = '88-beer-mug.png';
+                break;
+                case 'grocery_or_supermarket':
+                icon = '80-shopping-cart.png';
                 break;
                 case 'museum':
                 icon = '41-picture-frame.png';
                 break;
+                case 'gas_station':
+                icon = '47-fuel.png';                
+                break;
             };
             if(icon) {
                 image = new google.maps.MarkerImage('images/' + icon);
@@ -258,7 +254,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                     this._map = new window.google.maps.Map(this.mapEl, myOptions);
                  } else {
                       var map = this._map;
-                      map.setZoom(12);
+                      map.setZoom(10);
                       var latLng = new window.google.maps.LatLng(latLng.lat, latLng.lng);
                       map.setCenter(latLng);
                       var marker = new google.maps.Marker({
@@ -268,11 +264,21 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
 
                       var places = this._places;
                       if(places && places.length > 0) {
+                          map.setZoom(13);
                           this._removeAllMarkers();
                           for (var i = 0; i < places.length; i++) {
                               this._createMarker(places[i]);
                           }
-                      }                    
+                      } 
+                      
+                      if(this.traffic === true) {
+                          this.trafficLayer = new google.maps.TrafficLayer();
+                          this.trafficLayer.setMap(map);
+                      } else {
+                          if(this.trafficLayer) {
+                              this.trafficLayer.setMap(null);
+                          }
+                      }                  
                  }
                 
             }