Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper

13 files changed, 18 insertions, 9 deletions

diff --git a/node_modules/montage-google/map.reel/icons/airplane.png b/node_modules/montage-google/map.reel/icons/airplane.png
new file mode 100644
index 00000000..dfcbbc78
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/airplane.png
diff --git a/node_modules/montage-google/map.reel/icons/cafe.png b/node_modules/montage-google/map.reel/icons/cafe.png
new file mode 100644
index 00000000..4e9c517a
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/cafe.png
diff --git a/node_modules/montage-google/map.reel/icons/coffee.png b/node_modules/montage-google/map.reel/icons/coffee.png
new file mode 100644
index 00000000..4c4bedad
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/coffee.png
diff --git a/node_modules/montage-google/map.reel/icons/food.png b/node_modules/montage-google/map.reel/icons/food.png
new file mode 100644
index 00000000..81afd74a
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/food.png
diff --git a/node_modules/montage-google/map.reel/icons/fork-and-knife.png b/node_modules/montage-google/map.reel/icons/fork-and-knife.png
new file mode 100644
index 00000000..06d91088
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/fork-and-knife.png
diff --git a/node_modules/montage-google/map.reel/icons/map-marker.png b/node_modules/montage-google/map.reel/icons/map-marker.png
new file mode 100644
index 00000000..a5d99d69
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/map-marker.png
diff --git a/node_modules/montage-google/map.reel/icons/medical.png b/node_modules/montage-google/map.reel/icons/medical.png
new file mode 100644
index 00000000..ab78c783
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/medical.png
diff --git a/node_modules/montage-google/map.reel/icons/picture-frame.png b/node_modules/montage-google/map.reel/icons/picture-frame.png
new file mode 100644
index 00000000..6deee997
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/picture-frame.png
diff --git a/node_modules/montage-google/map.reel/icons/shopping.png b/node_modules/montage-google/map.reel/icons/shopping.png
new file mode 100644
index 00000000..03689f99
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/shopping.png
diff --git a/node_modules/montage-google/map.reel/icons/widescreen.png b/node_modules/montage-google/map.reel/icons/widescreen.png
new file mode 100644
index 00000000..2e5f1ba7
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/widescreen.png
diff --git a/node_modules/montage-google/map.reel/icons/wine-bottle.png b/node_modules/montage-google/map.reel/icons/wine-bottle.png
new file mode 100644
index 00000000..a7df9e97
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/wine-bottle.png
diff --git a/node_modules/montage-google/map.reel/icons/wine-glass.png b/node_modules/montage-google/map.reel/icons/wine-glass.png
new file mode 100644
index 00000000..b4d34474
--- /dev/null
+++ b/node_modules/montage-google/map.reel/icons/wine-glass.png
diff --git a/node_modules/montage-google/map.reel/map.js b/node_modules/montage-google/map.reel/map.js
index 4e3a6d70..1aeb97df 100644
--- a/node_modules/montage-google/map.reel/map.js
+++ b/node_modules/montage-google/map.reel/map.js
@@ -117,9 +117,12 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                 this._category = value;
                 if (this._map && this.latLng) {
                     this._getPlaces(this._category);
-                    this.needsDraw = true;
                 }
+            } else {
+                this._places = [];
             }
+
+            this.needsDraw = true;
         }
     },
 
@@ -186,26 +189,30 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
             var icon, image;
             switch(this.category) {
                 case 'restaurant':
-                icon = '48-fork-and-knife.png';
+                icon = 'fork-and-knife.png';
                 break;
                 case 'hospital':
-                icon = '10-medical.png';
+                icon = 'medical.png';
                 break;
                 case 'bar':
-                icon = '88-beer-mug.png';
+                icon = 'beer-mug.png';
                 break;
                 case 'grocery_or_supermarket':
-                icon = '80-shopping-cart.png';
+                icon = 'shopping.png';
                 break;
                 case 'museum':
-                icon = '41-picture-frame.png';
+                icon = 'picture-frame.png';
                 break;
                 case 'gas_station':
-                icon = '47-fuel.png';
+                icon = 'fuel.png';
                 break;
-            };
+                case 'cafe':
+                    icon = 'cafe.png';
+                    break;
+            }
+
             if(icon) {
-                image = new google.maps.MarkerImage('images/' + icon);
+                image = new google.maps.MarkerImage(this._montage_metadata.require.modules['map.reel/map'].directory + 'icons/' + icon);
             }
             var options = {
                 map: map,
@@ -289,6 +296,8 @@ var Map = exports.Map = Montage.create(Component, /** @lends module:"montage/ui/
                      for (var i = 0; i < places.length; i++) {
                          this._createMarker(places[i]);
                      }
+                 } else {
+                     this._removeAllMarkers();
                  }
 
                  if(this.traffic === true) {