Changes to Map and FeedReader

- Added traffic property to Map
- Support for show/hide traffic in the example
- Changed FeedReader to use only one DIV. No longer uses Repetition
- Support multiple modes in the Feed reader - timed/animated

1 files changed, 27 insertions, 2 deletions

diff --git a/node_modules/montage/ui/map.reel/map.js b/node_modules/montage/ui/map.reel/map.js
index 305ae181..42af218e 100644
--- a/node_modules/montage/ui/map.reel/map.js
+++ b/node_modules/montage/ui/map.reel/map.js
@@ -114,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
     },
@@ -239,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({
@@ -249,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);
+                          }
+                      }                  
                  }
                 
             }