From e09e4a8e24e5daf899d24314d0ffc218bbb2a97d Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 1 Jun 2012 11:51:16 -0700 Subject: Fixing Google Map component Pulled in from components branch. --- node_modules/montage-google/map.reel/map.js | 82 ++++++++++++++++------------- 1 file changed, 46 insertions(+), 36 deletions(-) (limited to 'node_modules/montage-google') diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js index fc104df5..879a80d4 100644 --- a/node_modules/montage-google/map.reel/map.js +++ b/node_modules/montage-google/map.reel/map.js @@ -20,8 +20,9 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ didCreate: { value: function() { var self = this; + + this._latLng = this.defaultLatLng; window.initialize = function initialize() { - console.log('google maps api loaded'); self._mapLoaded = true; self._geoCoder = new google.maps.Geocoder(); self.needsDraw = true; @@ -32,7 +33,10 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ _geoCoder: {value: null}, // HTMLElement to load the Map into - mapEl: {value: null}, + mapEl: { + serializable: true, + value: null + }, _mapLoaded: { enumerable: false, @@ -49,9 +53,9 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ }, _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; }, @@ -78,10 +83,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ 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); } @@ -101,15 +108,17 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ }, 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._mapLoaded && this.latLng) { + this._getPlaces(this._category); + this.needsDraw = true; + } } } }, @@ -159,12 +168,12 @@ 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; }); } }, @@ -252,35 +261,36 @@ 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(10); - var latLng = new window.google.maps.LatLng(latLng.lat, latLng.lng); - map.setCenter(latLng); - var marker = new google.maps.Marker({ - map: map, - position: latLng - }); - - 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); - } - } + this.center = this._center; + this.category = this._category; + } + + var map = this._map; + map.setZoom(10); + var latLng = new window.google.maps.LatLng(latLng.lat, latLng.lng); + map.setCenter(latLng); + var marker = new google.maps.Marker({ + map: map, + position: latLng + }); + + 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); + } + } } //window.google.maps.event.addDomListener(window, 'load', initialize); @@ -294,4 +304,4 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ serializer.set("center", this.center); } } -}); +}); \ No newline at end of file -- cgit v1.2.3 From f34752a034c7bf9060c7a286975df51f4e1a1e04 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 1 Jun 2012 13:48:20 -0700 Subject: Map fixes --- node_modules/montage-google/map.reel/map.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'node_modules/montage-google') diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js index 879a80d4..4e3a6d70 100644 --- a/node_modules/montage-google/map.reel/map.js +++ b/node_modules/montage-google/map.reel/map.js @@ -21,10 +21,10 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ value: function() { var self = this; - this._latLng = this.defaultLatLng; window.initialize = function initialize() { self._mapLoaded = true; self._geoCoder = new google.maps.Geocoder(); + self.center = self._center; self.needsDraw = true; }; } @@ -115,7 +115,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ set: function(value) { if(value) { this._category = value; - if (this._mapLoaded && this.latLng) { + if (this._map && this.latLng) { this._getPlaces(this._category); this.needsDraw = true; } @@ -139,7 +139,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ zoomValue: { - value: 8 + value: 13 }, __places: {value: null}, @@ -249,9 +249,17 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ draw: { enumerable: false, value: function () { - if(this._mapLoaded) { - var latLng = this.latLng || this.defaultLatLng; + var latLng = this.latLng; + + if (!latLng) { + if (this._center) { + return; + } else { + latLng = this.defaultLatLng; + } + } + if(!this._map) { var map; var myOptions = { @@ -266,7 +274,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ } var map = this._map; - map.setZoom(10); + //map.setZoom(10); var latLng = new window.google.maps.LatLng(latLng.lat, latLng.lng); map.setCenter(latLng); var marker = new google.maps.Marker({ @@ -276,7 +284,7 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/ var places = this._places; if(places && places.length > 0) { - map.setZoom(13); + //map.setZoom(13); this._removeAllMarkers(); for (var i = 0; i < places.length; i++) { this._createMarker(places[i]); -- cgit v1.2.3 From 745c39fb9460e882f5c6c5cfeedc0b3edf85f8eb Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 1 Jun 2012 15:28:05 -0700 Subject: Fixing feedread component --- .../montage-google/feed-reader/feed-entry.reel/feed-entry.html | 3 +-- .../montage-google/feed-reader/feed-reader.reel/feed-reader.js | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'node_modules/montage-google') diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 8e9b3371..b8b9f39a 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html @@ -76,8 +76,7 @@
- -

+

diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js index c066220e..34533d6d 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js @@ -184,6 +184,14 @@ exports.FeedReader = Montage.create(Component, { value: function() { } + }, + + serializeProperties: { + value: function(serializer) { + serializer.set("element", this.element); + serializer.set("feedURL", this.feedURL); + serializer.set("feedDisplayMode", this.feedDisplayMode); + } } }); -- cgit v1.2.3