From c9bef6bcfec3719d8f078fe072d4588db0551113 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Tue, 18 Apr 2017 13:40:09 +0530
Subject: [PATCH 01/38] add additional marker colors and icons

---
 .../google-maps-markup/component.js           | 31 +++++++++++++++++++
 addon/utils/tools.js                          |  8 ++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 776c623..3e07570 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -201,6 +201,25 @@ export default Ember.Component.extend(ParentMixin, {
     });
   },
 
+  getMarkerIcon(marker){
+    let icon = {
+      point: {
+        red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+        yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+      },
+      pin: {
+        red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+        yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+      }
+    };
+
+    return {
+      url: icon[marker.icon][marker.color],
+    };
+  },
+
+
+
   actions: {
     updateOptionValue(tool, prop, value) {
       set(tool, prop, value);
@@ -680,7 +699,9 @@ export default Ember.Component.extend(ParentMixin, {
       let plotter;
 
       let onClick = run.bind(this, (event) => {
+        let activeLayer = this.get('activeLayer');
         let toolId = this.get('toolId');
+        let tool = this.getTool(toolId);
         let mode = this.get('mode');
         let mapDiv = map.getDiv();
         let target = event.target;
@@ -689,7 +710,17 @@ export default Ember.Component.extend(ParentMixin, {
         if (mode === 'draw') {
           if (withinMap && toolId === 'freeFormPolygon') {
             this.enableFreeFormPolygon();
+          } else if (withinMap && toolId === 'marker') {
+            let style = {
+              icon: this.getMarkerIcon({
+                icon: 'point',
+                color: 'red',
+              })
+            };
+
+            activeLayer.data.setStyle(style);
           }
+
           return;
         }
 
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index edb2a14..a00fa6d 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -19,7 +19,13 @@ export default {
     id: 'marker',
     dataId: 'Point',
     name: 'Marker',
-    title: 'Marker Tool'
+    title: 'Marker Tool',
+    options: [
+      { name: 'Color', type: 'color', id: 'style.color' }
+    ],
+    style: {
+      color: '#374046'
+    }
   },
   polyline: {
     id: 'polyline',

From 7475e503067cc815933e1449efee426371b587bb Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Tue, 18 Apr 2017 17:40:35 +0530
Subject: [PATCH 02/38] add additional marker colors and icons

---
 .../google-maps-markup/component.js           | 19 +++++++--
 .../google-maps-markup/template.hbs           | 26 ++++++++++++
 addon/utils/tools.js                          | 41 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 3e07570..ef09d61 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -204,10 +204,14 @@ export default Ember.Component.extend(ParentMixin, {
   getMarkerIcon(marker){
     let icon = {
       point: {
+        blue: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+        green: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
         red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
         yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
       },
       pin: {
+        blue: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+        green: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
         red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
         yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
       }
@@ -221,6 +225,10 @@ export default Ember.Component.extend(ParentMixin, {
 
 
   actions: {
+    toggleDropdown(name) {
+      this.toggleProperty(name);
+    },
+
     updateOptionValue(tool, prop, value) {
       set(tool, prop, value);
     },
@@ -713,12 +721,17 @@ export default Ember.Component.extend(ParentMixin, {
           } else if (withinMap && toolId === 'marker') {
             let style = {
               icon: this.getMarkerIcon({
-                icon: 'point',
-                color: 'red',
+                icon: tool.icon.id,
+                color: tool.customColor.id,
               })
             };
 
-            activeLayer.data.setStyle(style);
+            let isDefaultIcon = tool.icon.id === tool.default.icon.id;
+            let isDefaultColor = tool.customColor.id === tool.default.customColor.id;
+
+            if (! isDefaultIcon || ! isDefaultColor) {
+              activeLayer.data.setStyle(style);
+            }
           }
 
           return;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 26fe82d..a8047e4 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -38,6 +38,32 @@
           {{color-palette selected=(get activeTool opt.id) onselect=(action 'updateOptionValue' activeTool opt.id)}}
         </div>
       {{/if}}
+      {{#if (is-equal opt.type 'icon')}}
+        <div class="dropdown {{if iconDropDown 'open'}}">
+          <button class="btn btn-default dropdown-toggle" type="button" id="iconDropDown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" {{action 'toggleDropdown' 'iconDropDown'}}>
+            {{activeTool.icon.display}}
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" aria-labelledby="iconDropDown" {{action 'toggleDropdown' 'iconDropDown'}}>
+            {{#each activeTool.icons as |icon|}}
+              <li {{action 'updateOptionValue' activeTool 'icon' icon}}><a>{{icon.display}}</a></li>
+            {{/each}}
+          </ul>
+        </div>
+      {{/if}}
+      {{#if (is-equal opt.type 'customColor')}}
+        <div class="dropdown {{if customColorMenu 'open'}}">
+          <button class="btn btn-default dropdown-toggle" type="button" id="customColorMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" {{action 'toggleDropdown' 'customColorMenu'}}>
+            {{activeTool.customColor.display}}
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" aria-labelledby="customColorMenu" {{action 'toggleDropdown' 'customColorMenu'}}>
+            {{#each activeTool.customColors as |icon|}}
+              <li {{action 'updateOptionValue' activeTool 'customColor' icon}}><a>{{icon.display}}</a></li>
+            {{/each}}
+          </ul>
+        </div>
+      {{/if}}
     {{/each}}
     </form>
   {{/if}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index a00fa6d..6e12d01 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -21,10 +21,49 @@ export default {
     name: 'Marker',
     title: 'Marker Tool',
     options: [
-      { name: 'Color', type: 'color', id: 'style.color' }
+      { name: 'Icon', type: 'icon', id: 'icon.id', display: 'icon.display' },
+      { name: 'Icon', type: 'customColor', id: 'icon.id', display: 'icon.display' }
     ],
     style: {
       color: '#374046'
+    },
+    icons: [{
+      id: 'point',
+      display: 'Point'
+    }, {
+      id: 'pin',
+      display: 'Pin'
+    }],
+    icon:{
+      id: 'point',
+      display: 'Point'
+    },
+    customColors: [{
+      id: 'red',
+      display: 'Red',
+    }, {
+      id: 'green',
+      display: 'Green',
+    }, {
+      id: 'blue',
+      display: 'BLue',
+    }, {
+      id: 'yellow',
+      display: 'Yellow',
+    }],
+    customColor: {
+      id: 'red',
+      display: 'Red',
+    },
+    default: {
+      customColor: {
+        id: 'red',
+        display: 'Red',
+      },
+      icon:{
+        id: 'point',
+        display: 'Point'
+      }
     }
   },
   polyline: {

From d45a787471f3532acbced44b54c15e3b295fd0ec Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Tue, 18 Apr 2017 18:01:09 +0530
Subject: [PATCH 03/38] add additional marker colors and icons

---
 addon/components/google-maps-markup/component.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index ef09d61..a0ac741 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -238,6 +238,9 @@ export default Ember.Component.extend(ParentMixin, {
     },
 
     changeTool(toolId) {
+      this.resetAllLayers();
+      this.clearListeners();
+
       let markupDataService = this.get('markupData');
       let activeLayer = this.get('activeLayer');
       let map = this.get('map');
@@ -249,8 +252,7 @@ export default Ember.Component.extend(ParentMixin, {
       this.set('drawFinished', false);
       markupDataService.set('activeTool', tool.id);
 
-      this.resetAllLayers();
-      this.clearListeners();
+      
 
       if (activeLayer) {
         if (tool.id === 'pan') {
@@ -287,6 +289,8 @@ export default Ember.Component.extend(ParentMixin, {
             event.stop();
           });
           listeners.pushObjects([ mapListener, dataListener ]);
+        }else if (tool.dataId === 'Point') {
+          activeLayer.data.setDrawingMode(tool.dataId);
         } else if (tool.dataId) {
           activeLayer.data.setDrawingMode(tool.dataId);
           activeLayer.data.setStyle(tool.style);
@@ -731,6 +735,8 @@ export default Ember.Component.extend(ParentMixin, {
 
             if (! isDefaultIcon || ! isDefaultColor) {
               activeLayer.data.setStyle(style);
+            } else {
+              activeLayer.data.setStyle();
             }
           }
 

From 712b76be6fc4004a6b35906f373ea6d699318b9a Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Wed, 19 Apr 2017 15:18:26 +0530
Subject: [PATCH 04/38] custom color code removed

---
 .../google-maps-markup/component.js           |  8 ++---
 .../google-maps-markup/template.hbs           | 13 ---------
 addon/utils/tools.js                          | 29 +------------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index a0ac741..7c13abe 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -726,18 +726,14 @@ export default Ember.Component.extend(ParentMixin, {
             let style = {
               icon: this.getMarkerIcon({
                 icon: tool.icon.id,
-                color: tool.customColor.id,
               })
             };
 
-            let isDefaultIcon = tool.icon.id === tool.default.icon.id;
-            let isDefaultColor = tool.customColor.id === tool.default.customColor.id;
-
-            if (! isDefaultIcon || ! isDefaultColor) {
+            /*if (! isDefaultIcon || ! isDefaultColor) {
               activeLayer.data.setStyle(style);
             } else {
               activeLayer.data.setStyle();
-            }
+            }*/
           }
 
           return;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index a8047e4..6ae4857 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -51,19 +51,6 @@
           </ul>
         </div>
       {{/if}}
-      {{#if (is-equal opt.type 'customColor')}}
-        <div class="dropdown {{if customColorMenu 'open'}}">
-          <button class="btn btn-default dropdown-toggle" type="button" id="customColorMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" {{action 'toggleDropdown' 'customColorMenu'}}>
-            {{activeTool.customColor.display}}
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="customColorMenu" {{action 'toggleDropdown' 'customColorMenu'}}>
-            {{#each activeTool.customColors as |icon|}}
-              <li {{action 'updateOptionValue' activeTool 'customColor' icon}}><a>{{icon.display}}</a></li>
-            {{/each}}
-          </ul>
-        </div>
-      {{/if}}
     {{/each}}
     </form>
   {{/if}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 6e12d01..2e4d484 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -21,8 +21,8 @@ export default {
     name: 'Marker',
     title: 'Marker Tool',
     options: [
+      { name: 'Color', type: 'color', id: 'style.color' },
       { name: 'Icon', type: 'icon', id: 'icon.id', display: 'icon.display' },
-      { name: 'Icon', type: 'customColor', id: 'icon.id', display: 'icon.display' }
     ],
     style: {
       color: '#374046'
@@ -38,33 +38,6 @@ export default {
       id: 'point',
       display: 'Point'
     },
-    customColors: [{
-      id: 'red',
-      display: 'Red',
-    }, {
-      id: 'green',
-      display: 'Green',
-    }, {
-      id: 'blue',
-      display: 'BLue',
-    }, {
-      id: 'yellow',
-      display: 'Yellow',
-    }],
-    customColor: {
-      id: 'red',
-      display: 'Red',
-    },
-    default: {
-      customColor: {
-        id: 'red',
-        display: 'Red',
-      },
-      icon:{
-        id: 'point',
-        display: 'Point'
-      }
-    }
   },
   polyline: {
     id: 'polyline',

From 11691f0e2102712a308db929bfc4e21c9f47ff96 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Wed, 19 Apr 2017 20:35:46 +0530
Subject: [PATCH 05/38] Ember Bootstrap drop down component added and marker
 icon drop down completed

---
 .../google-maps-markup/template.hbs           | 24 +++++++++++--------
 addon/utils/tools.js                          | 17 +++++++++----
 app/styles/app.less                           |  2 ++
 package.json                                  |  2 ++
 public/images/ic_person_pin_black_24px.svg    |  4 ++++
 .../ic_person_pin_circle_black_24px.svg       |  9 +++++++
 public/images/ic_place_black_24px.svg         |  4 ++++
 7 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 app/styles/app.less
 create mode 100644 public/images/ic_person_pin_black_24px.svg
 create mode 100644 public/images/ic_person_pin_circle_black_24px.svg
 create mode 100644 public/images/ic_place_black_24px.svg

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 6ae4857..bb3cda7 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -39,16 +39,20 @@
         </div>
       {{/if}}
       {{#if (is-equal opt.type 'icon')}}
-        <div class="dropdown {{if iconDropDown 'open'}}">
-          <button class="btn btn-default dropdown-toggle" type="button" id="iconDropDown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" {{action 'toggleDropdown' 'iconDropDown'}}>
-            {{activeTool.icon.display}}
-            <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="iconDropDown" {{action 'toggleDropdown' 'iconDropDown'}}>
-            {{#each activeTool.icons as |icon|}}
-              <li {{action 'updateOptionValue' activeTool 'icon' icon}}><a>{{icon.display}}</a></li>
-            {{/each}}
-          </ul>
+        <div class="form-group">
+          <label>{{opt.name}}</label>
+          {{#bs-dropdown as |dd|}}
+            {{#dd.button}}{{activeTool.icon.display}} <img src={{activeTool.icon.path}} height="10px" width="10px"/>{{/dd.button}}
+            {{#dd.menu as |ddm|}}
+              {{#each activeTool.icons as |icon|}}
+                <div {{action 'updateOptionValue' activeTool 'icon' icon}}>
+                  <img src={{icon.path}} height="10px" width="10px">
+                  {{#ddm.item}}{{icon.display}}{{/ddm.item}}
+                  {{ddm.divider}}
+                </div>
+              {{/each}}
+            {{/dd.menu}}
+          {{/bs-dropdown}}
         </div>
       {{/if}}
     {{/each}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 2e4d484..0af6dff 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -28,15 +28,22 @@ export default {
       color: '#374046'
     },
     icons: [{
+      id: 'default',
+      display: 'Default',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
+    },{
       id: 'point',
-      display: 'Point'
+      display: 'Point',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
     }, {
       id: 'pin',
-      display: 'Pin'
+      display: 'Pin',
+      path: 'google-maps-markup/images/ic_place_black_24px.svg'
     }],
-    icon:{
-      id: 'point',
-      display: 'Point'
+    icon: {
+      id: 'default',
+      display: 'Default',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
     },
   },
   polyline: {
diff --git a/app/styles/app.less b/app/styles/app.less
new file mode 100644
index 0000000..ea8bf0c
--- /dev/null
+++ b/app/styles/app.less
@@ -0,0 +1,2 @@
+
+@import "ember-bootstrap/bootstrap";
diff --git a/package.json b/package.json
index c1e0f59..89093c0 100644
--- a/package.json
+++ b/package.json
@@ -31,9 +31,11 @@
     "ember-uuid": "1.0.0"
   },
   "devDependencies": {
+    "bootstrap": "3.3.7",
     "broccoli-asset-rev": "^2.4.5",
     "broccoli-merge-trees": "^1.2.1",
     "broccoli-static-compiler": "^0.2.1",
+    "ember-bootstrap": "1.0.0-alpha.10",
     "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-blanket": "^0.9.9",
diff --git a/public/images/ic_person_pin_black_24px.svg b/public/images/ic_person_pin_black_24px.svg
new file mode 100644
index 0000000..0cf5662
--- /dev/null
+++ b/public/images/ic_person_pin_black_24px.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M19 2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h4l3 3 3-3h4c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 3.3c1.49 0 2.7 1.21 2.7 2.7 0 1.49-1.21 2.7-2.7 2.7-1.49 0-2.7-1.21-2.7-2.7 0-1.49 1.21-2.7 2.7-2.7zM18 16H6v-.9c0-2 4-3.1 6-3.1s6 1.1 6 3.1v.9z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file
diff --git a/public/images/ic_person_pin_circle_black_24px.svg b/public/images/ic_person_pin_circle_black_24px.svg
new file mode 100644
index 0000000..f1ab0e0
--- /dev/null
+++ b/public/images/ic_person_pin_circle_black_24px.svg
@@ -0,0 +1,9 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <path d="M0 0h24v24H0V0z" id="a"/>
+    </defs>
+    <clipPath id="b">
+        <use overflow="visible" xlink:href="#a"/>
+    </clipPath>
+    <path clip-path="url(#b)" d="M12 2C8.14 2 5 5.14 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.86-3.14-7-7-7zm0 2c1.1 0 2 .9 2 2 0 1.11-.9 2-2 2s-2-.89-2-2c0-1.1.9-2 2-2zm0 10c-1.67 0-3.14-.85-4-2.15.02-1.32 2.67-2.05 4-2.05s3.98.73 4 2.05c-.86 1.3-2.33 2.15-4 2.15z"/>
+</svg>
\ No newline at end of file
diff --git a/public/images/ic_place_black_24px.svg b/public/images/ic_place_black_24px.svg
new file mode 100644
index 0000000..d7844b2
--- /dev/null
+++ b/public/images/ic_place_black_24px.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file

From e7e0a87b1641a1eb5689676004d215794d9aba5e Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Wed, 19 Apr 2017 20:44:27 +0530
Subject: [PATCH 06/38] comment update

---
 addon/components/google-maps-markup/component.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 7c13abe..b3afa2f 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -289,7 +289,7 @@ export default Ember.Component.extend(ParentMixin, {
             event.stop();
           });
           listeners.pushObjects([ mapListener, dataListener ]);
-        }else if (tool.dataId === 'Point') {
+        } else if (tool.dataId === 'Point') {
           activeLayer.data.setDrawingMode(tool.dataId);
         } else if (tool.dataId) {
           activeLayer.data.setDrawingMode(tool.dataId);
@@ -723,17 +723,12 @@ export default Ember.Component.extend(ParentMixin, {
           if (withinMap && toolId === 'freeFormPolygon') {
             this.enableFreeFormPolygon();
           } else if (withinMap && toolId === 'marker') {
-            let style = {
+            //Todo : Need to crete the functionality here to update the marker style
+            /*let style = {
               icon: this.getMarkerIcon({
                 icon: tool.icon.id,
               })
-            };
-
-            /*if (! isDefaultIcon || ! isDefaultColor) {
-              activeLayer.data.setStyle(style);
-            } else {
-              activeLayer.data.setStyle();
-            }*/
+            };*/
           }
 
           return;

From a4f6de281e778aef8722da56888c1d3bb7ebf093 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 20 Apr 2017 12:18:29 +0530
Subject: [PATCH 07/38] ember-bootstrap addon removed

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 89093c0..7c51df7 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
     "broccoli-asset-rev": "^2.4.5",
     "broccoli-merge-trees": "^1.2.1",
     "broccoli-static-compiler": "^0.2.1",
-    "ember-bootstrap": "1.0.0-alpha.10",
     "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-blanket": "^0.9.9",

From 5c2a92b74028976f4991057db14cda39fffb54e1 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 20 Apr 2017 13:43:05 +0530
Subject: [PATCH 08/38] Icon drop down updated with select tag

---
 .../components/google-maps-markup/template.hbs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index bb3cda7..88e1441 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -41,18 +41,16 @@
       {{#if (is-equal opt.type 'icon')}}
         <div class="form-group">
           <label>{{opt.name}}</label>
-          {{#bs-dropdown as |dd|}}
-            {{#dd.button}}{{activeTool.icon.display}} <img src={{activeTool.icon.path}} height="10px" width="10px"/>{{/dd.button}}
-            {{#dd.menu as |ddm|}}
-              {{#each activeTool.icons as |icon|}}
-                <div {{action 'updateOptionValue' activeTool 'icon' icon}}>
+          <select onchange={{action "updateOptionValue" activeTool 'icon' value="target.value"}}>
+            {{#each activeTool.icons as |icon|}}
+              <option value={{icon.display}}>
+                <div>
                   <img src={{icon.path}} height="10px" width="10px">
-                  {{#ddm.item}}{{icon.display}}{{/ddm.item}}
-                  {{ddm.divider}}
+                  {{icon.display}}
                 </div>
-              {{/each}}
-            {{/dd.menu}}
-          {{/bs-dropdown}}
+              </option>
+            {{/each}}
+          </select>
         </div>
       {{/if}}
     {{/each}}

From cdef4b32dc780e495065bc9ac3c97f5c3addb632 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 20 Apr 2017 21:20:09 +0530
Subject: [PATCH 09/38] Dynamic image marker added on map

---
 .../google-maps-markup/component.js           | 53 ++++++++-----------
 .../google-maps-markup/template.hbs           |  7 +--
 addon/utils/tools.js                          |  6 +--
 3 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index b3afa2f..26542e1 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -201,38 +201,16 @@ export default Ember.Component.extend(ParentMixin, {
     });
   },
 
-  getMarkerIcon(marker){
-    let icon = {
-      point: {
-        blue: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        green: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-      },
-      pin: {
-        blue: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        green: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        red: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-        yellow: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
-      }
-    };
-
-    return {
-      url: icon[marker.icon][marker.color],
-    };
-  },
-
-
-
   actions: {
-    toggleDropdown(name) {
-      this.toggleProperty(name);
-    },
 
     updateOptionValue(tool, prop, value) {
       set(tool, prop, value);
     },
 
+    updateSelectedIcon(icon) {
+      set(this.activeTool, 'icon', icon);
+    },
+
     changeMode(mode) {
       this.set('mode', mode.id);
     },
@@ -718,17 +696,30 @@ export default Ember.Component.extend(ParentMixin, {
         let mapDiv = map.getDiv();
         let target = event.target;
         let withinMap = mapDiv.contains(target);
+        let results = this.get('results');
 
         if (mode === 'draw') {
           if (withinMap && toolId === 'freeFormPolygon') {
             this.enableFreeFormPolygon();
           } else if (withinMap && toolId === 'marker') {
             //Todo : Need to crete the functionality here to update the marker style
-            /*let style = {
-              icon: this.getMarkerIcon({
-                icon: tool.icon.id,
-              })
-            };*/
+            var length = results.get('length');
+            var arrayIndexOffSet = 1;
+            var lastObjectIndex = length - arrayIndexOffSet;
+            var data = results.get('lastObject');
+
+            if (tool.icon !== 'default') {
+              let style = {
+                icon: {
+                  url: tool.icon,
+                  scaledSize: new google.maps.Size(22, 40)
+                }
+              };
+
+              data.style = style;
+              results[lastObjectIndex] = data;
+              activeLayer.data.overrideStyle(data.feature, style);
+            }
           }
 
           return;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 88e1441..1d4fb7a 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -41,13 +41,10 @@
       {{#if (is-equal opt.type 'icon')}}
         <div class="form-group">
           <label>{{opt.name}}</label>
-          <select onchange={{action "updateOptionValue" activeTool 'icon' value="target.value"}}>
+          <select onchange={{action "updateSelectedIcon" value="target.value"}}>
             {{#each activeTool.icons as |icon|}}
-              <option value={{icon.display}}>
-                <div>
-                  <img src={{icon.path}} height="10px" width="10px">
+              <option value={{icon.path}}>
                   {{icon.display}}
-                </div>
               </option>
             {{/each}}
           </select>
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 0af6dff..0729865 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -40,11 +40,7 @@ export default {
       display: 'Pin',
       path: 'google-maps-markup/images/ic_place_black_24px.svg'
     }],
-    icon: {
-      id: 'default',
-      display: 'Default',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
-    },
+    icon: 'default',
   },
   polyline: {
     id: 'polyline',

From 529c64293a57ca782490a209199c430279c5a89c Mon Sep 17 00:00:00 2001
From: Vidyadhar Bhatt <vidyadhar@webcontentor.com>
Date: Fri, 21 Apr 2017 13:05:42 +0530
Subject: [PATCH 10/38] default option value is not getting updated

---
 addon/components/google-maps-markup/component.js | 1 +
 addon/utils/tools.js                             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 26542e1..9178578 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -269,6 +269,7 @@ export default Ember.Component.extend(ParentMixin, {
           listeners.pushObjects([ mapListener, dataListener ]);
         } else if (tool.dataId === 'Point') {
           activeLayer.data.setDrawingMode(tool.dataId);
+          set(this.activeTool, 'icon', 'default');
         } else if (tool.dataId) {
           activeLayer.data.setDrawingMode(tool.dataId);
           activeLayer.data.setStyle(tool.style);
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 0729865..8f9b60e 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -30,7 +30,7 @@ export default {
     icons: [{
       id: 'default',
       display: 'Default',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
+      path: 'default'
     },{
       id: 'point',
       display: 'Point',

From bd2aad5f1ab88e3932c790de3abc23262ae13577 Mon Sep 17 00:00:00 2001
From: Vidyadhar Bhatt <vidyadhar@webcontentor.com>
Date: Fri, 21 Apr 2017 16:41:24 +0530
Subject: [PATCH 11/38] hover added

---
 .../google-maps-markup/component.js           | 19 ++++++++++++++++++-
 .../google-maps-markup/template.hbs           |  2 +-
 addon/utils/tools.js                          |  9 ++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 9178578..99105bf 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -446,6 +446,11 @@ export default Ember.Component.extend(ParentMixin, {
             scaledSize: new google.maps.Size(22, 40)
           }
         };
+
+        if(data.hoverStyle){
+          style = data.hoverStyle;
+        }
+
       } else if (data.type === 'text') {
         data.feature.highlight();
       } else {
@@ -709,14 +714,26 @@ export default Ember.Component.extend(ParentMixin, {
             var lastObjectIndex = length - arrayIndexOffSet;
             var data = results.get('lastObject');
 
+            var iconObj = tool.icons.find(function(iconObj){
+              return iconObj.id === tool.icon;
+            });
+
             if (tool.icon !== 'default') {
               let style = {
                 icon: {
-                  url: tool.icon,
+                  url: iconObj.path,
+                  scaledSize: new google.maps.Size(22, 40)
+                }
+              };
+
+              let hoverStyle = {
+                icon: {
+                  url: iconObj.hoverPath,
                   scaledSize: new google.maps.Size(22, 40)
                 }
               };
 
+              data.hoverStyle = hoverStyle;
               data.style = style;
               results[lastObjectIndex] = data;
               activeLayer.data.overrideStyle(data.feature, style);
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 1d4fb7a..8fd3b87 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -43,7 +43,7 @@
           <label>{{opt.name}}</label>
           <select onchange={{action "updateSelectedIcon" value="target.value"}}>
             {{#each activeTool.icons as |icon|}}
-              <option value={{icon.path}}>
+              <option value={{icon.id}}>
                   {{icon.display}}
               </option>
             {{/each}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 8f9b60e..ef62a46 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -30,15 +30,18 @@ export default {
     icons: [{
       id: 'default',
       display: 'Default',
-      path: 'default'
+      path: 'default',
+      hoverPath: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
     },{
       id: 'point',
       display: 'Point',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+      hoverPath: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
     }, {
       id: 'pin',
       display: 'Pin',
-      path: 'google-maps-markup/images/ic_place_black_24px.svg'
+      path: 'google-maps-markup/images/ic_place_black_24px.svg',
+      hoverPath: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
     }],
     icon: 'default',
   },

From e85481870987fd6cae726ac5d49b224fe58943bb Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 21 Apr 2017 16:45:39 +0530
Subject: [PATCH 12/38]  Marker icon color dynamically set

---
 addon/components/google-maps-markup/component.js | 10 +++++++---
 addon/components/google-maps-markup/template.hbs | 12 ++++++------
 addon/utils/tools.js                             | 10 +++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 9178578..e4f889e 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -712,9 +712,13 @@ export default Ember.Component.extend(ParentMixin, {
             if (tool.icon !== 'default') {
               let style = {
                 icon: {
-                  url: tool.icon,
-                  scaledSize: new google.maps.Size(22, 40)
-                }
+                  path: tool.icon,
+                  fillColor: tool.style.color,
+                  fillOpacity: 1,
+                  strokeColor: '',
+                  strokeWeight: 0
+                },
+                scaledSize: new google.maps.Size(22, 40)
               };
 
               data.style = style;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 1d4fb7a..02b00cb 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -32,12 +32,6 @@
     <h4>Options</h4>
     <form class="form options-group" onsubmit="return false">
     {{#each activeTool.options as |opt|}}
-      {{#if (is-equal opt.type 'color')}}
-        <div class="form-group">
-          <label>{{opt.name}}</label>
-          {{color-palette selected=(get activeTool opt.id) onselect=(action 'updateOptionValue' activeTool opt.id)}}
-        </div>
-      {{/if}}
       {{#if (is-equal opt.type 'icon')}}
         <div class="form-group">
           <label>{{opt.name}}</label>
@@ -50,6 +44,12 @@
           </select>
         </div>
       {{/if}}
+      {{#if (is-equal opt.type 'color')  (is-equal activeTool.icon 'default')}}
+        <div class="form-group">
+          <label>{{opt.name}}</label>
+          {{color-palette selected=(get activeTool opt.id) onselect=(action 'updateOptionValue' activeTool opt.id)}}
+        </div>
+      {{/if}}
     {{/each}}
     </form>
   {{/if}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 8f9b60e..2c77057 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -31,14 +31,14 @@ export default {
       id: 'default',
       display: 'Default',
       path: 'default'
-    },{
-      id: 'point',
-      display: 'Point',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png'
     }, {
       id: 'pin',
       display: 'Pin',
-      path: 'google-maps-markup/images/ic_place_black_24px.svg'
+      path: 'M0-48c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z'
+    }, {
+      id: 'squarePin',
+      display: 'Square Pin',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }],
     icon: 'default',
   },

From 92dca5b8fe3ddb850fe3f705f61d16b6fe341ed7 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 21 Apr 2017 17:19:26 +0530
Subject: [PATCH 13/38] Marker hoever path updated

---
 addon/utils/tools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 007a67e..242bc6c 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -23,7 +23,7 @@ export default {
     options: [
       { name: 'Icon', type: 'icon', id: 'icon.id', display: 'icon.display' },
       { name: 'Color', type: 'color', id: 'style.color' },
-      { name: 'Color', type: 'color', id: 'style.hoverColor' },
+      { name: 'Color Hover', type: 'color', id: 'style.hoverColor' },
     ],
     style: {
       color: '#374046',

From 1e8f60fa6427ac4fb02969799e4ea9ce5569bbdb Mon Sep 17 00:00:00 2001
From: Vidyadhar Bhatt <vidyadhar@webcontentor.com>
Date: Fri, 21 Apr 2017 18:09:21 +0530
Subject: [PATCH 14/38] default hover color

---
 addon/components/google-maps-markup/component.js | 11 +++++------
 addon/utils/tools.js                             |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 01050a5..14970d3 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -708,13 +708,12 @@ export default Ember.Component.extend(ParentMixin, {
           if (withinMap && toolId === 'freeFormPolygon') {
             this.enableFreeFormPolygon();
           } else if (withinMap && toolId === 'marker') {
-            //Todo : Need to crete the functionality here to update the marker style
-            var length = results.get('length');
-            var arrayIndexOffSet = 1;
-            var lastObjectIndex = length - arrayIndexOffSet;
-            var data = results.get('lastObject');
+            let length = results.get('length');
+            let arrayIndexOffSet = 1;
+            let lastObjectIndex = length - arrayIndexOffSet;
+            let data = results.get('lastObject');
 
-            var iconObj = tool.icons.find(function(iconObj){
+            let iconObj = tool.icons.find(function(iconObj){
               return iconObj.id === tool.icon;
             });
 
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 242bc6c..9514e68 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -27,7 +27,7 @@ export default {
     ],
     style: {
       color: '#374046',
-      hoverColor: '#374046',
+      hoverColor: '#f44336',
     },
     icons: [{
       id: 'default',

From 6a8aa72ec76ea20590cdd34683b34e7849862e9f Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 21 Apr 2017 18:15:48 +0530
Subject: [PATCH 15/38] Icon drop down color updated

---
 addon/components/google-maps-markup/template.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 8fd3b87..87ceb2b 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -40,7 +40,7 @@
       {{/if}}
       {{#if (is-equal opt.type 'icon')}}
         <div class="form-group">
-          <label>{{opt.name}}</label>
+          <div><label>{{opt.name}}</label></div>
           <select onchange={{action "updateSelectedIcon" value="target.value"}}>
             {{#each activeTool.icons as |icon|}}
               <option value={{icon.id}}>

From 16b628e29aee244e5f700cfa53c2789da61c7ba6 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Mon, 24 Apr 2017 15:28:11 +0530
Subject: [PATCH 16/38] Marker Icon custom hover removed + Marker Icon Hover
 color set to red

---
 addon/components/google-maps-markup/component.js | 2 +-
 addon/utils/tools.js                             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 14970d3..cbadd03 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -732,7 +732,7 @@ export default Ember.Component.extend(ParentMixin, {
               let hoverStyle = {
                 icon: {
                   path: iconObj.path,
-                  fillColor: tool.style.hoverColor,
+                  fillColor: 'red',
                   fillOpacity: 1,
                   strokeColor: '',
                   strokeWeight: 0,
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 9514e68..0f66491 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -23,11 +23,9 @@ export default {
     options: [
       { name: 'Icon', type: 'icon', id: 'icon.id', display: 'icon.display' },
       { name: 'Color', type: 'color', id: 'style.color' },
-      { name: 'Color Hover', type: 'color', id: 'style.hoverColor' },
     ],
     style: {
       color: '#374046',
-      hoverColor: '#f44336',
     },
     icons: [{
       id: 'default',

From d58cb39e394f16bc871e827fc5185cc44838573e Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Mon, 24 Apr 2017 15:41:04 +0530
Subject: [PATCH 17/38] Marker Icon last used to set default

---
 addon/components/google-maps-markup/component.js | 1 -
 addon/components/google-maps-markup/template.hbs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index cbadd03..9319177 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -269,7 +269,6 @@ export default Ember.Component.extend(ParentMixin, {
           listeners.pushObjects([ mapListener, dataListener ]);
         } else if (tool.dataId === 'Point') {
           activeLayer.data.setDrawingMode(tool.dataId);
-          set(this.activeTool, 'icon', 'default');
         } else if (tool.dataId) {
           activeLayer.data.setDrawingMode(tool.dataId);
           activeLayer.data.setStyle(tool.style);
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 87ceb2b..68cd4db 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -43,7 +43,7 @@
           <div><label>{{opt.name}}</label></div>
           <select onchange={{action "updateSelectedIcon" value="target.value"}}>
             {{#each activeTool.icons as |icon|}}
-              <option value={{icon.id}}>
+              <option value={{icon.id}} selected={{is-equal icon.id activeTool.icon}}>
                   {{icon.display}}
               </option>
             {{/each}}

From ce48af945804d0c2182a9bdb1902adc2d73242f3 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Tue, 25 Apr 2017 13:17:45 +0530
Subject: [PATCH 18/38] color dropdown removed when default icon on marker

---
 addon/components/google-maps-markup/template.hbs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 68cd4db..c46e509 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -34,8 +34,10 @@
     {{#each activeTool.options as |opt|}}
       {{#if (is-equal opt.type 'color')}}
         <div class="form-group">
+        {{#unless (is-equal activeTool.icon 'default')}}
           <label>{{opt.name}}</label>
           {{color-palette selected=(get activeTool opt.id) onselect=(action 'updateOptionValue' activeTool opt.id)}}
+        {{/unless}}
         </div>
       {{/if}}
       {{#if (is-equal opt.type 'icon')}}

From 0043f71aa58a0fc5b72af27b5f7b457ee21942e8 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Tue, 25 Apr 2017 13:17:45 +0530
Subject: [PATCH 19/38] color dropdown removed when default icon on marker

---
 addon/components/google-maps-markup/template.hbs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 68cd4db..c46e509 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -34,8 +34,10 @@
     {{#each activeTool.options as |opt|}}
       {{#if (is-equal opt.type 'color')}}
         <div class="form-group">
+        {{#unless (is-equal activeTool.icon 'default')}}
           <label>{{opt.name}}</label>
           {{color-palette selected=(get activeTool opt.id) onselect=(action 'updateOptionValue' activeTool opt.id)}}
+        {{/unless}}
         </div>
       {{/if}}
       {{#if (is-equal opt.type 'icon')}}

From 20f98a0bbd7707a1b334f0c6c3ab58b60834bf76 Mon Sep 17 00:00:00 2001
From: Vidyadhar Bhatt <vidyadhar@webcontentor.com>
Date: Wed, 26 Apr 2017 19:37:45 +0530
Subject: [PATCH 20/38] marker pin icon path updated

---
 addon/utils/tools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 0f66491..fd40d16 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -34,7 +34,7 @@ export default {
     }, {
       id: 'pin',
       display: 'Pin',
-      path: 'M0-48c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z'
+      path: 'M1.1,0A1.7,1.7,0,0,1,.7-.7C.3-1.9-.3-3-.8-4.2L-1.9-6.8l-1.3-3-1.1-2.6-1.9-4.3-1.1-2.5-1.3-3.1c-.4-.9-.7-1.7-1.1-2.6s-.5-1.2-.8-1.9a5.2,5.2,0,0,1-.3-1.7,9.2,9.2,0,0,1,.3-3.5,10.1,10.1,0,0,1,2-3.7,12.2,12.2,0,0,1,2.2-2,12.8,12.8,0,0,1,5-2.1,13.3,13.3,0,0,1,6.8.4,12.2,12.2,0,0,1,3.4,1.7,12.6,12.6,0,0,1,2.7,2.7,6.4,6.4,0,0,1,.6,1.1,8.3,8.3,0,0,1,.6,6.2A26.3,26.3,0,0,1,11.2-24l-.6,1.4c-.4.8-.7,1.7-1,2.5l-1.2,3L7.2-14.4,5.9-11.2,4.7-8.5,3.5-5.6,2.3-2.8Z'
     }, {
       id: 'squarePin',
       display: 'Square Pin',

From f0258d05857ab31f1a71bc5c5378b1b30da71084 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Sat, 29 Apr 2017 11:47:49 +0530
Subject: [PATCH 21/38] ember power selected applied

---
 addon/components/google-maps-markup/component.js |  3 ++-
 addon/components/google-maps-markup/template.hbs | 12 ++++++++++--
 app/styles/app.less                              |  2 ++
 package.json                                     |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 9319177..ba4be03 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -208,7 +208,8 @@ export default Ember.Component.extend(ParentMixin, {
     },
 
     updateSelectedIcon(icon) {
-      set(this.activeTool, 'icon', icon);
+      console.log('in updateSelectedIcon',this.get('activeTool.icon'),icon.id);
+      set(this.activeTool, 'icon', icon.id);
     },
 
     changeMode(mode) {
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index c46e509..ffc4097 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -43,13 +43,21 @@
       {{#if (is-equal opt.type 'icon')}}
         <div class="form-group">
           <div><label>{{opt.name}}</label></div>
-          <select onchange={{action "updateSelectedIcon" value="target.value"}}>
+          {{#power-select
+            options=activeTool.icons
+            selected=activeTool.icon
+            onchange=(action "updateSelectedIcon" )
+            as |icon|
+          }}
+          <strong>{{icon.display}}</strong>
+          {{/power-select}}
+        <!--   <select onchange={{action "updateSelectedIcon" value="target.value"}}>
             {{#each activeTool.icons as |icon|}}
               <option value={{icon.id}} selected={{is-equal icon.id activeTool.icon}}>
                   {{icon.display}}
               </option>
             {{/each}}
-          </select>
+          </select> -->
         </div>
       {{/if}}
     {{/each}}
diff --git a/app/styles/app.less b/app/styles/app.less
index ea8bf0c..a5379e8 100644
--- a/app/styles/app.less
+++ b/app/styles/app.less
@@ -1,2 +1,4 @@
 
 @import "ember-bootstrap/bootstrap";
+
+@import "ember-power-select";
diff --git a/package.json b/package.json
index 7c51df7..5827e26 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.6.3",
+    "ember-power-select": "1.8.2",
     "ember-resolver": "^2.0.3",
     "loader.js": "^4.0.10"
   },

From 19a83de636569bcebf609cb3a858e40945aed512 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Mon, 1 May 2017 20:50:07 +0530
Subject: [PATCH 22/38] ember power select applied

---
 addon/components/google-maps-markup/component.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index ba4be03..084d9fe 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -208,7 +208,6 @@ export default Ember.Component.extend(ParentMixin, {
     },
 
     updateSelectedIcon(icon) {
-      console.log('in updateSelectedIcon',this.get('activeTool.icon'),icon.id);
       set(this.activeTool, 'icon', icon.id);
     },
 

From 1af63b9b5b30af3ae32959a062de42a52ea69810 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Tue, 2 May 2017 20:24:41 +0530
Subject: [PATCH 23/38] ember power select applied on marker

---
 addon/components/google-maps-markup/component.js | 4 ++--
 addon/components/google-maps-markup/template.hbs | 2 +-
 addon/utils/tools.js                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 084d9fe..0aede61 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -207,8 +207,8 @@ export default Ember.Component.extend(ParentMixin, {
       set(tool, prop, value);
     },
 
-    updateSelectedIcon(icon) {
-      set(this.activeTool, 'icon', icon.id);
+    updateSelectedIcon(tool, id, icon) {
+      set(tool, id, icon.id);
     },
 
     changeMode(mode) {
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index ffc4097..f8f6084 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -46,7 +46,7 @@
           {{#power-select
             options=activeTool.icons
             selected=activeTool.icon
-            onchange=(action "updateSelectedIcon" )
+            onchange=(action "updateSelectedIcon" activeTool opt.id)
             as |icon|
           }}
           <strong>{{icon.display}}</strong>
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 0f66491..440d0c0 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -21,7 +21,7 @@ export default {
     name: 'Marker',
     title: 'Marker Tool',
     options: [
-      { name: 'Icon', type: 'icon', id: 'icon.id', display: 'icon.display' },
+      { name: 'Icon', type: 'icon', id: 'icon', display: 'icon.display' },
       { name: 'Color', type: 'color', id: 'style.color' },
     ],
     style: {

From 70f76f906a1e3fbc4bade5dfa08ebed3b18ae141 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Wed, 3 May 2017 12:05:48 +0530
Subject: [PATCH 24/38] Marker Icon dynamic hover color set

---
 .../google-maps-markup/component.js           |  3 +-
 addon/utils/hover-color.js                    | 81 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 addon/utils/hover-color.js

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 9319177..01e9fbf 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -10,6 +10,7 @@ import initMeasureLabel from '../../utils/init-measure-label';
 import MapLabel from '../../utils/map-label';
 import DynamicLabel from '../../utils/dynamic-label';
 import labelPlotter from '../../utils/label-plotter';
+import hoverColor from '../../utils/hover-color';
 
 if (!window.google) {
   throw new Error('Sorry, but `google` defined globally is required for this addon');
@@ -731,7 +732,7 @@ export default Ember.Component.extend(ParentMixin, {
               let hoverStyle = {
                 icon: {
                   path: iconObj.path,
-                  fillColor: 'red',
+                  fillColor: hoverColor(tool.style.color),
                   fillOpacity: 1,
                   strokeColor: '',
                   strokeWeight: 0,
diff --git a/addon/utils/hover-color.js b/addon/utils/hover-color.js
new file mode 100644
index 0000000..0592265
--- /dev/null
+++ b/addon/utils/hover-color.js
@@ -0,0 +1,81 @@
+import Ember from 'ember';
+/* hexToComplimentary : Converts hex value to HSL, shifts
+ * hue by 180 degrees and then converts hex, giving complimentary color
+ * as a hex value
+ * @param  [String] hex : hex value  
+ * @return [String] : complimentary color as hex value
+ */
+    // Credit to Denis http://stackoverflow.com/a/36253499/4939630
+export default function hoverColor(hex) {
+    // Convert hex to rgb
+    // Credit to Denis http://stackoverflow.com/a/36253499/4939630
+    var rgb = 'rgb(' + (hex = hex.replace('#', '')).match(new RegExp('(.{' + hex.length/3 + '})', 'g')).map(function(l) { return parseInt(hex.length%2 ? l+l : l, 16); }).join(',') + ')';
+
+    // Get array of RGB values
+    rgb = rgb.replace(/[^\d,]/g, '').split(',');
+
+    var r = rgb[0], g = rgb[1], b = rgb[2];
+
+    // Convert RGB to HSL
+    // Adapted from answer by 0x000f http://stackoverflow.com/a/34946092/4939630
+    r /= 255.0;
+    g /= 255.0;
+    b /= 255.0;
+    var max = Math.max(r, g, b);
+    var min = Math.min(r, g, b);
+    var h, s, l = (max + min) / 2.0;
+
+    if(max == min) {
+        h = s = 0;  //achromatic
+    } else {
+        var d = max - min;
+        s = (l > 0.5 ? d / (2.0 - max - min) : d / (max + min));
+
+        if(max == r && g >= b) {
+            h = 1.0472 * (g - b) / d ;
+        } else if(max == r && g < b) {
+            h = 1.0472 * (g - b) / d + 6.2832;
+        } else if(max == g) {
+            h = 1.0472 * (b - r) / d + 2.0944;
+        } else if(max == b) {
+            h = 1.0472 * (r - g) / d + 4.1888;
+        }
+    }
+
+    h = h / 6.2832 * 360.0 + 0;
+
+    // Shift hue to opposite side of wheel and convert to [0-1] value
+    h+= 180;
+    if (h > 360) { h -= 360; }
+    h /= 360;
+
+    // Convert h s and l values into r g and b values
+    // Adapted from answer by Mohsen http://stackoverflow.com/a/9493060/4939630
+    if(s === 0){
+        r = g = b = l; // achromatic
+    } else {
+        var hue2rgb = function hue2rgb(p, q, t){
+            if(t < 0) t += 1;
+            if(t > 1) t -= 1;
+            if(t < 1/6) return p + (q - p) * 6 * t;
+            if(t < 1/2) return q;
+            if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+            return p;
+        };
+
+        var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+        var p = 2 * l - q;
+
+        r = hue2rgb(p, q, h + 1/3);
+        g = hue2rgb(p, q, h);
+        b = hue2rgb(p, q, h - 1/3);
+    }
+
+    r = Math.round(r * 255);
+    g = Math.round(g * 255); 
+    b = Math.round(b * 255);
+
+    // Convert r b and g values to hex
+    rgb = b | (g << 8) | (r << 16); 
+    return "#" + (0x1000000 | rgb).toString(16).substring(1);
+}  
\ No newline at end of file

From 5e8fab4ad1a425fb57a25965b890dd2e50e5a7c4 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Wed, 3 May 2017 13:21:56 +0530
Subject: [PATCH 25/38] jsHint error removed from marker icon

---
 .../google-maps-markup/component.js           |  3 +-
 .../markup-result-item/component.js           |  1 -
 addon/utils/hover-color.js                    | 36 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 01e9fbf..3bbe060 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -188,7 +188,7 @@ export default Ember.Component.extend(ParentMixin, {
       poly.getPath().push(e.latLng);
     });
 
-    google.maps.event.addListenerOnce(map, 'mouseup', (e) => {
+    google.maps.event.addListenerOnce(map, 'mouseup', () => {
       google.maps.event.removeListener(move);
       poly.setMap(null);
 
@@ -241,7 +241,6 @@ export default Ember.Component.extend(ParentMixin, {
 
           let clickListener = activeLayer.data.addListener('click', event => {
             let childComponents = this.get('childComponents');
-            let results = this.get('results');
             let found = childComponents.find(function (comp) {
               return comp.get('data').feature.getId() === event.feature.getId();
             });
diff --git a/addon/components/markup-result-item/component.js b/addon/components/markup-result-item/component.js
index 94ba6e8..8f886ac 100644
--- a/addon/components/markup-result-item/component.js
+++ b/addon/components/markup-result-item/component.js
@@ -8,7 +8,6 @@ import featureCenter from '../../utils/feature-center';
 const {
   on,
   run,
-  set,
   computed
 } = Ember;
 
diff --git a/addon/utils/hover-color.js b/addon/utils/hover-color.js
index 0592265..36898d2 100644
--- a/addon/utils/hover-color.js
+++ b/addon/utils/hover-color.js
@@ -1,14 +1,12 @@
-import Ember from 'ember';
+
 /* hexToComplimentary : Converts hex value to HSL, shifts
  * hue by 180 degrees and then converts hex, giving complimentary color
  * as a hex value
  * @param  [String] hex : hex value  
  * @return [String] : complimentary color as hex value
  */
-    // Credit to Denis http://stackoverflow.com/a/36253499/4939630
 export default function hoverColor(hex) {
     // Convert hex to rgb
-    // Credit to Denis http://stackoverflow.com/a/36253499/4939630
     var rgb = 'rgb(' + (hex = hex.replace('#', '')).match(new RegExp('(.{' + hex.length/3 + '})', 'g')).map(function(l) { return parseInt(hex.length%2 ? l+l : l, 16); }).join(',') + ')';
 
     // Get array of RGB values
@@ -17,7 +15,6 @@ export default function hoverColor(hex) {
     var r = rgb[0], g = rgb[1], b = rgb[2];
 
     // Convert RGB to HSL
-    // Adapted from answer by 0x000f http://stackoverflow.com/a/34946092/4939630
     r /= 255.0;
     g /= 255.0;
     b /= 255.0;
@@ -25,19 +22,19 @@ export default function hoverColor(hex) {
     var min = Math.min(r, g, b);
     var h, s, l = (max + min) / 2.0;
 
-    if(max == min) {
+    if(max === min) {
         h = s = 0;  //achromatic
     } else {
         var d = max - min;
         s = (l > 0.5 ? d / (2.0 - max - min) : d / (max + min));
 
-        if(max == r && g >= b) {
+        if(max === r && g >= b) {
             h = 1.0472 * (g - b) / d ;
-        } else if(max == r && g < b) {
+        } else if(max === r && g < b) {
             h = 1.0472 * (g - b) / d + 6.2832;
-        } else if(max == g) {
+        } else if(max === g) {
             h = 1.0472 * (b - r) / d + 2.0944;
-        } else if(max == b) {
+        } else if(max === b) {
             h = 1.0472 * (r - g) / d + 4.1888;
         }
     }
@@ -50,16 +47,25 @@ export default function hoverColor(hex) {
     h /= 360;
 
     // Convert h s and l values into r g and b values
-    // Adapted from answer by Mohsen http://stackoverflow.com/a/9493060/4939630
     if(s === 0){
         r = g = b = l; // achromatic
     } else {
         var hue2rgb = function hue2rgb(p, q, t){
-            if(t < 0) t += 1;
-            if(t > 1) t -= 1;
-            if(t < 1/6) return p + (q - p) * 6 * t;
-            if(t < 1/2) return q;
-            if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
+            if(t < 0) {
+                t += 1;
+            }
+            if(t > 1){
+                t -= 1;
+            }
+            if(t < 1/6) {
+                return p + (q - p) * 6 * t;
+            }
+            if(t < 1/2) {
+                return q;
+            }
+            if(t < 2/3) {
+            return p + (q - p) * (2/3 - t) * 6;
+            }
             return p;
         };
 

From 95f75382b4ea592b487c7f181ec91a74a8ff203a Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 4 May 2017 12:10:26 +0530
Subject: [PATCH 26/38] power select updated

---
 addon/components/google-maps-markup/component.js | 8 ++------
 addon/components/google-maps-markup/template.hbs | 9 +--------
 addon/utils/tools.js                             | 6 +++++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 7f51d7d..c8b85c9 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -208,10 +208,6 @@ export default Ember.Component.extend(ParentMixin, {
       set(tool, prop, value);
     },
 
-    updateSelectedIcon(tool, id, icon) {
-      set(tool, id, icon.id);
-    },
-
     changeMode(mode) {
       this.set('mode', mode.id);
     },
@@ -714,10 +710,10 @@ export default Ember.Component.extend(ParentMixin, {
             let data = results.get('lastObject');
 
             let iconObj = tool.icons.find(function(iconObj){
-              return iconObj.id === tool.icon;
+              return iconObj.id === tool.icon.id;
             });
 
-            if (tool.icon !== 'default') {
+            if (tool.icon.id !== 'default') {
               let style = {
                 icon: {
                   path: iconObj.path,
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index f8f6084..16e65a4 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -46,18 +46,11 @@
           {{#power-select
             options=activeTool.icons
             selected=activeTool.icon
-            onchange=(action "updateSelectedIcon" activeTool opt.id)
+            onchange=(action "updateOptionValue" activeTool opt.id)
             as |icon|
           }}
           <strong>{{icon.display}}</strong>
           {{/power-select}}
-        <!--   <select onchange={{action "updateSelectedIcon" value="target.value"}}>
-            {{#each activeTool.icons as |icon|}}
-              <option value={{icon.id}} selected={{is-equal icon.id activeTool.icon}}>
-                  {{icon.display}}
-              </option>
-            {{/each}}
-          </select> -->
         </div>
       {{/if}}
     {{/each}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 6d3cc98..1442b38 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -40,7 +40,11 @@ export default {
       display: 'Square Pin',
       path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }],
-    icon: 'default',
+    icon: {
+      id: 'default',
+      display: 'Default',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+    },
   },
   polyline: {
     id: 'polyline',

From 163b8d77044c4c5e97018a6d51ac52d80536bae1 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Thu, 4 May 2017 12:59:49 +0530
Subject: [PATCH 27/38] ember power selection

---
 addon/components/google-maps-markup/component.js | 8 ++------
 addon/components/google-maps-markup/template.hbs | 2 +-
 addon/utils/tools.js                             | 6 +++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 0aede61..3ece79a 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -207,10 +207,6 @@ export default Ember.Component.extend(ParentMixin, {
       set(tool, prop, value);
     },
 
-    updateSelectedIcon(tool, id, icon) {
-      set(tool, id, icon.id);
-    },
-
     changeMode(mode) {
       this.set('mode', mode.id);
     },
@@ -713,10 +709,10 @@ export default Ember.Component.extend(ParentMixin, {
             let data = results.get('lastObject');
 
             let iconObj = tool.icons.find(function(iconObj){
-              return iconObj.id === tool.icon;
+              return iconObj.id === tool.icon.id;
             });
 
-            if (tool.icon !== 'default') {
+            if (tool.icon.id !== 'default') {
               let style = {
                 icon: {
                   path: iconObj.path,
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index f8f6084..c399c3c 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -46,7 +46,7 @@
           {{#power-select
             options=activeTool.icons
             selected=activeTool.icon
-            onchange=(action "updateSelectedIcon" activeTool opt.id)
+            onchange=(action "updateOptionValue" activeTool opt.id)
             as |icon|
           }}
           <strong>{{icon.display}}</strong>
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index 440d0c0..69ee433 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -40,7 +40,11 @@ export default {
       display: 'Square Pin',
       path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }],
-    icon: 'default',
+    icon: {
+      id: 'default',
+      display: 'Default',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+    },
   },
   polyline: {
     id: 'polyline',

From de9dce8af57085be8e547a9efad2a69a045323d6 Mon Sep 17 00:00:00 2001
From: Ganesh Ughade <ganesh@webcontentor.com>
Date: Thu, 4 May 2017 15:32:16 +0530
Subject: [PATCH 28/38] drop_down class added

---
 addon/components/google-maps-markup/template.hbs | 3 ++-
 vendor/google-maps-markup/styles.css             | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index c399c3c..c42d6c2 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -41,11 +41,12 @@
         </div>
       {{/if}}
       {{#if (is-equal opt.type 'icon')}}
-        <div class="form-group">
+        <div class="form-group drop_down">
           <div><label>{{opt.name}}</label></div>
           {{#power-select
             options=activeTool.icons
             selected=activeTool.icon
+            searchEnabled=false
             onchange=(action "updateOptionValue" activeTool opt.id)
             as |icon|
           }}
diff --git a/vendor/google-maps-markup/styles.css b/vendor/google-maps-markup/styles.css
index 7a9e6bf..8ddc476 100644
--- a/vendor/google-maps-markup/styles.css
+++ b/vendor/google-maps-markup/styles.css
@@ -55,3 +55,7 @@
 .google-maps-markup-map-label:placeholder-shown { /* Standard (https://drafts.csswg.org/selectors-4/#placeholder) */
   color: #444;
 }
+
+.drop_down .ember-power-select-trigger{
+  width: 200px;
+}

From 6c83041c840860e24fb095ace76877d235d33711 Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 11 May 2017 18:32:32 +0530
Subject: [PATCH 29/38] Marker Icon updated with dropdown option

---
 .../google-maps-markup/component.js           | 56 +++++++++++-----
 .../google-maps-markup/template.hbs           |  3 +-
 addon/utils/marker-label.js                   | 65 +++++++++++++++++++
 addon/utils/marker.js                         | 25 +++++++
 addon/utils/tools.js                          | 38 +++++++++--
 vendor/google-maps-markup/styles.css          | 38 +++++++++++
 6 files changed, 199 insertions(+), 26 deletions(-)
 create mode 100644 addon/utils/marker-label.js
 create mode 100644 addon/utils/marker.js

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index aafe497..ef58fc3 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -8,6 +8,8 @@ import overlayToFeature from '../../utils/overlay-to-feature';
 import featureCenter from '../../utils/feature-center';
 import initMeasureLabel from '../../utils/init-measure-label';
 import MapLabel from '../../utils/map-label';
+// import MarkerLabel from '../../utils/marker-label';
+import Marker from '../../utils/marker';
 import DynamicLabel from '../../utils/dynamic-label';
 import labelPlotter from '../../utils/label-plotter';
 import hoverColor from '../../utils/hover-color';
@@ -723,8 +725,33 @@ export default Ember.Component.extend(ParentMixin, {
               return iconObj.id === tool.icon.id;
             });
 
+            let style = {
+              icon: {
+                path: iconObj.path,
+                fillColor: tool.style.color,
+                fillOpacity: 1,
+                strokeColor: '',
+                strokeWeight: 0,
+                scaledSize: new google.maps.Size(22, 40)
+              },
+              map_icon_label: '<i class="material-icons">home</i>'
+            };
+
+            let hoverStyle = {
+              icon: {
+                path: iconObj.path,
+                fillColor: hoverColor(tool.style.color),
+                fillOpacity: 1,
+                strokeColor: '',
+                strokeWeight: 0,
+                scaledSize: new google.maps.Size(22, 40)
+              }
+            };
+
             if (tool.icon.id !== 'default') {
-              let style = {
+              var marker = new Marker({
+                position: calculateLatLng(map, event),
+                map: map,
                 icon: {
                   path: iconObj.path,
                   fillColor: tool.style.color,
@@ -732,25 +759,18 @@ export default Ember.Component.extend(ParentMixin, {
                   strokeColor: '',
                   strokeWeight: 0,
                   scaledSize: new google.maps.Size(22, 40)
-                }
-              };
+                },
+                map_icon_label: '<i class="material-icons">' + iconObj.id + '</i>'
+              })
 
-              let hoverStyle = {
-                icon: {
-                  path: iconObj.path,
-                  fillColor: hoverColor(tool.style.color),
-                  fillOpacity: 1,
-                  strokeColor: '',
-                  strokeWeight: 0,
-                  scaledSize: new google.maps.Size(22, 40)
-                }
-              };
-
-              data.hoverStyle = hoverStyle;
-              data.style = style;
-              results[lastObjectIndex] = data;
-              activeLayer.data.overrideStyle(data.feature, style);
+              // To add the marker to the map, call setMap();
+              marker.setMap(map);
             }
+
+            data.hoverStyle = hoverStyle;
+            data.style = style;
+            results[lastObjectIndex] = data;
+            activeLayer.data.overrideStyle(data.feature, style);
           }
 
           return;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index c3444c9..e95e8e2 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -53,7 +53,8 @@
             onchange=(action "updateOptionValue" activeTool opt.id)
             as |icon|
           }}
-          <strong>{{icon.display}}</strong>
+          <span>{{icon.display}}</span>
+          <i class="material-icons">{{ icon.id }}</i>
           {{/power-select}}
         </div>
       {{/if}}
diff --git a/addon/utils/marker-label.js b/addon/utils/marker-label.js
new file mode 100644
index 0000000..81da41d
--- /dev/null
+++ b/addon/utils/marker-label.js
@@ -0,0 +1,65 @@
+class MarkerLabel extends google.maps.OverlayView {
+  constructor(options) {
+    super(...arguments);
+
+    var self = this;
+    this.setValues(options);
+
+    this.position = options.position;
+    
+    // Create the label container
+    this.div = document.createElement('div');
+    this.div.className = '';
+   
+    // Trigger the marker click handler if clicking on the label
+    google.maps.event.addDomListener(this.div, 'click', function(e){
+      (e.stopPropagation) && e.stopPropagation();
+      google.maps.event.trigger(self.marker, 'click');
+    });
+  }
+
+  onAdd() {
+    var pane = this.getPanes().overlayImage.appendChild(this.div);
+    var self = this;
+
+    this.listeners = [
+      google.maps.event.addListener(this, 'position_changed', function() { self.draw(); }),
+      google.maps.event.addListener(this, 'text_changed', function() { self.draw(); }),
+      google.maps.event.addListener(this, 'zindex_changed', function() { self.draw(); })
+    ];
+  }
+
+  // Marker Label onRemove
+  onRemove() {
+    this.div.parentNode.removeChild(this.div);
+
+    for (var i = 0, I = this.listeners.length; i < I; ++i) {
+      google.maps.event.removeListener(this.listeners[i]);
+    }
+  }
+
+  // Implement draw
+  draw() {
+    var projection = this.getProjection();
+    var position = projection.fromLatLngToDivPixel(this.get('position'));
+    var div = this.div;
+
+    this.div.innerHTML = this.get('text').toString();
+
+    div.style.zIndex = this.get('zIndex'); // Allow label to overlay marker
+    div.style.position = 'absolute';
+    div.style.display = 'block';
+    div.style.left = (position.x - (div.offsetWidth / 2) + 10) + 'px';
+    div.style.top = (position.y - div.offsetHeight - 10) + 'px';
+  }
+
+  set position(value) {
+    this.latlng = value;
+  }
+
+  get position() {
+    return this.latlng;
+  }
+}
+
+export default MarkerLabel;
diff --git a/addon/utils/marker.js b/addon/utils/marker.js
new file mode 100644
index 0000000..bc60941
--- /dev/null
+++ b/addon/utils/marker.js
@@ -0,0 +1,25 @@
+import MarkerLabel from './marker-label';
+
+class Marker extends google.maps.OverlayView {
+  constructor(options) {
+    super(...arguments);
+
+    this.icon = options.icon;
+
+    if (options.map_icon_label) {
+      this.MarkerLabel = new MarkerLabel({
+        position: options.position,
+        map: this.map,
+        marker: this,
+        text: options.map_icon_label
+      });
+    }
+  }
+
+  // Custom Marker SetMap
+  setMap() {
+    (this.MarkerLabel) && this.MarkerLabel.setMap.apply(this.MarkerLabel, arguments);
+  }
+}
+
+export default Marker;
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index bf96c6b..9fbe457 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -30,20 +30,44 @@ export default {
     icons: [{
       id: 'default',
       display: 'Default',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'grade',
+      display: 'Grade',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'help',
+      display: 'Help',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'favorite',
+      display: 'Favorite',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }, {
-      id: 'pin',
-      display: 'Pin',
-      path: 'M1.1,0A1.7,1.7,0,0,1,.7-.7C.3-1.9-.3-3-.8-4.2L-1.9-6.8l-1.3-3-1.1-2.6-1.9-4.3-1.1-2.5-1.3-3.1c-.4-.9-.7-1.7-1.1-2.6s-.5-1.2-.8-1.9a5.2,5.2,0,0,1-.3-1.7,9.2,9.2,0,0,1,.3-3.5,10.1,10.1,0,0,1,2-3.7,12.2,12.2,0,0,1,2.2-2,12.8,12.8,0,0,1,5-2.1,13.3,13.3,0,0,1,6.8.4,12.2,12.2,0,0,1,3.4,1.7,12.6,12.6,0,0,1,2.7,2.7,6.4,6.4,0,0,1,.6,1.1,8.3,8.3,0,0,1,.6,6.2A26.3,26.3,0,0,1,11.2-24l-.6,1.4c-.4.8-.7,1.7-1,2.5l-1.2,3L7.2-14.4,5.9-11.2,4.7-8.5,3.5-5.6,2.3-2.8Z'
+      id: 'check_circle',
+      display: 'Check Circle',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'lens',
+      display: 'Lens',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'filter_vintage',
+      display: 'Filter Vintage',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }, {
+      id: 'photo_camera',
+      display: 'Photo Camera',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }, {
-      id: 'squarePin',
-      display: 'Square Pin',
+      id: 'place',
+      display: 'Place',
       path: 'M22-48h-44v43h16l6 5 6-5h16z'
     }],
     icon: {
       id: 'default',
       display: 'Default',
-      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z',
     },
   },
   polyline: {
diff --git a/vendor/google-maps-markup/styles.css b/vendor/google-maps-markup/styles.css
index 8ddc476..e6d0931 100644
--- a/vendor/google-maps-markup/styles.css
+++ b/vendor/google-maps-markup/styles.css
@@ -59,3 +59,41 @@
 .drop_down .ember-power-select-trigger{
   width: 200px;
 }
+
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Material Icons'), local('MaterialIcons-Regular'), url(https://fonts.gstatic.com/s/materialicons/v22/2fcrYFNaTjcS6g4U3t-Y5ZjZjT5FdEJ140U2DJYC3mY.woff2) format('woff2');
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  width: 48px;
+  line-height: 48px;
+  line-height: 1;
+  color: #FFFFFF;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  -moz-font-feature-settings: 'liga';
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.ember-power-select-option i.material-icons,
+.ember-power-select-selected-item i.material-icons {
+  color: #999999;
+  font-size: 15px;
+}
+
+.ember-power-select-option[aria-current="true"]:hover i.material-icons {
+  color: #FFFFFF;
+}
\ No newline at end of file

From e329b53ad465fedc4b85690d4cd8caa0f3480e7f Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 11 May 2017 19:16:59 +0530
Subject: [PATCH 30/38] code update

---
 addon/components/google-maps-markup/component.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 42b3640..8c23b4a 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -8,7 +8,6 @@ import overlayToFeature from '../../utils/overlay-to-feature';
 import featureCenter from '../../utils/feature-center';
 import initMeasureLabel from '../../utils/init-measure-label';
 import MapLabel from '../../utils/map-label';
-// import MarkerLabel from '../../utils/marker-label';
 import Marker from '../../utils/marker';
 import DynamicLabel from '../../utils/dynamic-label';
 import labelPlotter from '../../utils/label-plotter';

From 4800f39f257665cfdfb11f8db6b4da98ef497b5d Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Thu, 11 May 2017 19:21:30 +0530
Subject: [PATCH 31/38] code update

---
 addon/components/google-maps-markup/component.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 8c23b4a..cbd9818 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -250,8 +250,6 @@ export default Ember.Component.extend(ParentMixin, {
       this.set('drawFinished', false);
       markupDataService.set('activeTool', tool.id);
 
-      
-
       if (activeLayer) {
         if (tool.id === 'pan') {
           activeLayer.data.setDrawingMode(null);

From 6a3e0ac023bb81c45139911c657a830459f4847b Mon Sep 17 00:00:00 2001
From: vikasrana1989 <vidyadhar@webcontentor.com>
Date: Fri, 12 May 2017 16:23:09 +0530
Subject: [PATCH 32/38] style updated

---
 vendor/google-maps-markup/styles.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vendor/google-maps-markup/styles.css b/vendor/google-maps-markup/styles.css
index e6d0931..c657055 100644
--- a/vendor/google-maps-markup/styles.css
+++ b/vendor/google-maps-markup/styles.css
@@ -94,6 +94,14 @@
   font-size: 15px;
 }
 
+.ember-power-select-selected-item, .ember-power-select-option{
+  display: flex;
+  align-items: center;
+}
+.ember-power-select-selected-item .material-icons, .ember-power-select-option .material-icons{
+  margin-left: 8px;
+}
+
 .ember-power-select-option[aria-current="true"]:hover i.material-icons {
   color: #FFFFFF;
 }
\ No newline at end of file

From 3ae2bf4d0d5cf9e48d28d7928a1393a287c50841 Mon Sep 17 00:00:00 2001
From: Ganesh4 <ughadeganesh@gmail.com>
Date: Fri, 12 May 2017 20:01:04 +0530
Subject: [PATCH 33/38] New Marker drop down Added(#8)

* Marker DropDown Added

* marker dropdown code updated

* indent fixed
---
 .../google-maps-markup/component.js           | 79 ++++++++++---------
 .../google-maps-markup/template.hbs           | 29 +++++--
 addon/utils/tools.js                          | 48 ++++++-----
 3 files changed, 94 insertions(+), 62 deletions(-)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index cbd9818..780f5cd 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -738,52 +738,59 @@ export default Ember.Component.extend(ParentMixin, {
               return iconObj.id === tool.icon.id;
             });
 
-            let style = {
-              icon: {
-                path: iconObj.path,
-                fillColor: tool.style.color,
-                fillOpacity: 1,
-                strokeColor: '',
-                strokeWeight: 0,
-                scaledSize: new google.maps.Size(22, 40)
-              },
-              map_icon_label: '<i class="material-icons">home</i>'
-            };
-
-            let hoverStyle = {
-              icon: {
-                path: iconObj.path,
-                fillColor: hoverColor(tool.style.color),
-                fillOpacity: 1,
-                strokeColor: '',
-                strokeWeight: 0,
-                scaledSize: new google.maps.Size(22, 40)
-              }
-            };
+             let markerObj = tool.markers.find(function(markerObj){
+              return markerObj.id === tool.marker.id;
+            });
+
+            if (markerObj.id !== 'default') {
 
-            if (tool.icon.id !== 'default') {
-              var marker = new Marker({
-                position: calculateLatLng(map, event),
-                map: map,
+              let style = {
                 icon: {
-                  path: iconObj.path,
+                  path: markerObj.path,
                   fillColor: tool.style.color,
                   fillOpacity: 1,
                   strokeColor: '',
                   strokeWeight: 0,
                   scaledSize: new google.maps.Size(22, 40)
                 },
-                map_icon_label: '<i class="material-icons">' + iconObj.id + '</i>'
-              })
+                map_icon_label: '<i class="material-icons">' + markerObj.id + '</i>'
+              };
 
-              // To add the marker to the map, call setMap();
-              marker.setMap(map);
-            }
+              let hoverStyle = {
+                icon: {
+                  path: markerObj.path,
+                  fillColor: hoverColor(tool.style.color),
+                  fillOpacity: 1,
+                  strokeColor: '',
+                  strokeWeight: 0,
+                  scaledSize: new google.maps.Size(22, 40)
+                }
+              };
+
+              if (tool.icon.id !== 'default') {
+                var marker = new Marker({
+                  position: calculateLatLng(map, event),
+                  map: map,
+                  icon: {
+                    path: markerObj.path,
+                    fillColor: tool.style.color,
+                    fillOpacity: 1,
+                    strokeColor: '',
+                    strokeWeight: 0,
+                    scaledSize: new google.maps.Size(22, 40)
+                  },
+                  map_icon_label: '<i class="material-icons">' + iconObj.id + '</i>'
+                })
+
+                // To add the marker to the map, call setMap();
+                marker.setMap(map);
+              }
 
-            data.hoverStyle = hoverStyle;
-            data.style = style;
-            results[lastObjectIndex] = data;
-            activeLayer.data.overrideStyle(data.feature, style);
+              data.hoverStyle = hoverStyle;
+              data.style = style;
+              results[lastObjectIndex] = data;
+              activeLayer.data.overrideStyle(data.feature, style);
+            }
           }
 
           return;
diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index e2ae099..0b909bc 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -45,21 +45,38 @@
         {{/unless}}
         </div>
       {{/if}}
-      {{#if (is-equal opt.type 'icon')}}
+      {{#if (is-equal opt.type 'Marker')}}
         <div class="form-group drop_down">
           <div><label>{{opt.name}}</label></div>
           {{#power-select
-            options=activeTool.icons
-            selected=activeTool.icon
+            options=activeTool.markers
+            selected=activeTool.marker
             searchEnabled=false
             onchange=(action "updateOptionValue" activeTool opt.id)
-            as |icon|
+            as |marker|
           }}
-          <span>{{icon.display}}</span>
-          <i class="material-icons">{{ icon.id }}</i>
+            <span>{{marker.display}}</span>
           {{/power-select}}
           </div>
+      {{/if}}
+      {{#unless (is-equal activeTool.marker.id 'default')}}
+        {{#if (is-equal opt.type 'icon')}}
+          <div class="form-group drop_down">
+            <div><label>{{opt.name}}</label></div>
+            {{#power-select
+              options=activeTool.icons
+              selected=activeTool.icon
+              searchEnabled=false
+              onchange=(action "updateOptionValue" activeTool opt.id)
+              as |icon|
+            }}
+            <span>{{icon.display}}</span>
+            <i class="material-icons">{{ icon.id }}</i>
+            {{/power-select}}
+            </div>
         {{/if}}
+      {{/unless}}
+
       {{/each}}
     </form>
   {{/if}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index fd2d4bf..f7e23c3 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -21,6 +21,7 @@ export default {
     name: 'Marker',
     title: 'Marker Tool',
     options: [
+      { name: 'Marker', type: 'Marker', id: 'marker', display: 'marker.display' },
       { name: 'Icon', type: 'icon', id: 'icon', display: 'icon.display' },
       { name: 'Color', type: 'color', id: 'style.color' },
     ],
@@ -29,46 +30,53 @@ export default {
     },
     icons: [{
       id: 'default',
-      display: 'Default',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Default'
     }, {
       id: 'grade',
-      display: 'Grade',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Grade'
     }, {
       id: 'help',
-      display: 'Help',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Help'
     }, {
       id: 'favorite',
-      display: 'Favorite',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Favorite'
     }, {
       id: 'check_circle',
-      display: 'Check Circle',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Check Circle'
     }, {
       id: 'lens',
-      display: 'Lens',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Lens'
     }, {
       id: 'filter_vintage',
-      display: 'Filter Vintage',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Filter Vintage'
     }, {
       id: 'photo_camera',
-      display: 'Photo Camera',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Photo Camera'
     }, {
       id: 'place',
-      display: 'Place',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      display: 'Place'
     }],
     icon: {
       id: 'default',
-      display: 'Default',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z',
+      display: 'Default'
     },
+
+    markers: [{
+      id: 'default',
+      display: 'Default',
+    }, {
+      id: 'pin',
+      display: 'Pin',
+      path: 'M0-48c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z'
+    }, {
+      id: 'squarePin',
+      display: 'Square Pin',
+      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+    }],
+    marker: {
+      id: 'default',
+      display: 'Default',
+    }
   },
   polyline: {
     id: 'polyline',

From 40c0b12da8733b432bc833da3441d988f5b7cf8f Mon Sep 17 00:00:00 2001
From: Ganesh4 <ughadeganesh@gmail.com>
Date: Tue, 16 May 2017 11:21:26 +0530
Subject: [PATCH 34/38] Marker Dropdown icon style updated (#9)

* Marker DropDown Added

* marker dropdown code updated

* indent fixed

* marker icon style updated

* color value changed
---
 .../google-maps-markup/template.hbs           |  1 +
 addon/utils/tools.js                          |  6 +++--
 vendor/google-maps-markup/styles.css          | 24 +++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/addon/components/google-maps-markup/template.hbs b/addon/components/google-maps-markup/template.hbs
index 0b909bc..2a6f60d 100644
--- a/addon/components/google-maps-markup/template.hbs
+++ b/addon/components/google-maps-markup/template.hbs
@@ -56,6 +56,7 @@
             as |marker|
           }}
             <span>{{marker.display}}</span>
+            <svg baseProfile="basic" xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 48 48"><path d="{{marker.pathDropdown}}"></path></svg>
           {{/power-select}}
           </div>
       {{/if}}
diff --git a/addon/utils/tools.js b/addon/utils/tools.js
index f7e23c3..5da8ce9 100644
--- a/addon/utils/tools.js
+++ b/addon/utils/tools.js
@@ -67,11 +67,13 @@ export default {
     }, {
       id: 'pin',
       display: 'Pin',
-      path: 'M0-48c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z'
+      path: 'M0-48c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z',
+      pathDropdown: 'M24 0c-9.8 0-17.7 7.8-17.7 17.4 0 15.5 17.7 30.6 17.7 30.6s17.7-15.4 17.7-30.6c0-9.6-7.9-17.4-17.7-17.4z'
     }, {
       id: 'squarePin',
       display: 'Square Pin',
-      path: 'M22-48h-44v43h16l6 5 6-5h16z'
+      path: 'M22-48h-44v43h16l6 5 6-5h16z',
+      pathDropdown: 'M45.5 0h-43v43h16.2l5.9 5 5.8-5h15.1z'
     }],
     marker: {
       id: 'default',
diff --git a/vendor/google-maps-markup/styles.css b/vendor/google-maps-markup/styles.css
index c657055..d79828e 100644
--- a/vendor/google-maps-markup/styles.css
+++ b/vendor/google-maps-markup/styles.css
@@ -73,8 +73,6 @@
   font-style: normal;
   font-size: 24px;
   width: 48px;
-  line-height: 48px;
-  line-height: 1;
   color: #FFFFFF;
   letter-spacing: normal;
   text-transform: none;
@@ -82,15 +80,13 @@
   white-space: nowrap;
   word-wrap: normal;
   direction: ltr;
-  margin-top: 5px;
-  margin-bottom: 5px;
   -moz-font-feature-settings: 'liga';
   -moz-osx-font-smoothing: grayscale;
 }
 
 .ember-power-select-option i.material-icons,
 .ember-power-select-selected-item i.material-icons {
-  color: #999999;
+  color: #444444;
   font-size: 15px;
 }
 
@@ -98,10 +94,24 @@
   display: flex;
   align-items: center;
 }
-.ember-power-select-selected-item .material-icons, .ember-power-select-option .material-icons{
+.ember-power-select-selected-item .material-icons, .ember-power-select-option .material-icons,.ember-power-select-option svg{
   margin-left: 8px;
 }
 
 .ember-power-select-option[aria-current="true"]:hover i.material-icons {
   color: #FFFFFF;
-}
\ No newline at end of file
+}
+
+.ember-power-select-selected-item svg {
+  margin-left: 8px;
+}
+
+.ember-power-select-selected-item svg path,.ember-power-select-option svg path {
+    fill: #444444;
+}
+
+.ember-power-select-selected-item:hover svg path,.ember-power-select-option:hover svg path {
+    fill: #FFFFFF;
+}
+
+

From 35d7696e61df0835217da095223e1952a75e57bf Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 19 May 2017 15:17:27 +0530
Subject: [PATCH 35/38] code update

---
 addon/components/google-maps-markup/component.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index 780f5cd..ee6db6a 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -356,6 +356,9 @@ export default Ember.Component.extend(ParentMixin, {
       if (result.type === 'text') {
         result.feature.setMap(null);
         textGeoJson.removeObject(result.geojson);
+      } else if (result.type === 'marker') {
+        result.markerData.setMap(null);
+        layer.data.remove(result.feature);
       } else {
         layer.data.remove(result.feature);
       }
@@ -782,6 +785,8 @@ export default Ember.Component.extend(ParentMixin, {
                   map_icon_label: '<i class="material-icons">' + iconObj.id + '</i>'
                 })
 
+                data.markerData = marker;
+
                 // To add the marker to the map, call setMap();
                 marker.setMap(map);
               }

From a11ab0ec21c05ef4106c30315586a141b1a7a0ff Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 19 May 2017 15:39:55 +0530
Subject: [PATCH 36/38] Marker Icon position issue fixed

---
 addon/utils/marker-label.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/utils/marker-label.js b/addon/utils/marker-label.js
index 81da41d..978cf49 100644
--- a/addon/utils/marker-label.js
+++ b/addon/utils/marker-label.js
@@ -49,8 +49,8 @@ class MarkerLabel extends google.maps.OverlayView {
     div.style.zIndex = this.get('zIndex'); // Allow label to overlay marker
     div.style.position = 'absolute';
     div.style.display = 'block';
-    div.style.left = (position.x - (div.offsetWidth / 2) + 10) + 'px';
-    div.style.top = (position.y - div.offsetHeight - 10) + 'px';
+    div.style.left = (position.x - (div.offsetWidth / 2) + 12) + 'px';
+    div.style.top = (position.y - (div.offsetHeight/2) - 24) + 'px';
   }
 
   set position(value) {

From 31cc0bf6230cd362a8fcc6de14a7f75e354fd932 Mon Sep 17 00:00:00 2001
From: vikasrana1989 <vikas@webcontentor.com>
Date: Fri, 19 May 2017 15:47:09 +0530
Subject: [PATCH 37/38] marker removed on clear all button

---
 addon/components/google-maps-markup/component.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/components/google-maps-markup/component.js b/addon/components/google-maps-markup/component.js
index ee6db6a..da47cfc 100644
--- a/addon/components/google-maps-markup/component.js
+++ b/addon/components/google-maps-markup/component.js
@@ -336,6 +336,8 @@ export default Ember.Component.extend(ParentMixin, {
             if (result.type === 'text') {
               textGeoJson.removeObject(result.geojson);
             }
+          } else if (result.markerData) {
+              result.markerData.setMap(null);
           }
         });
 

From 4a99ac9ad4eb94aa62b41b8ee34d6f99cbe804ed Mon Sep 17 00:00:00 2001
From: Vikas Rana <vikas@webcontentor.com>
Date: Fri, 19 May 2017 16:01:50 +0530
Subject: [PATCH 38/38] hover marker selected style fixed

---
 vendor/google-maps-markup/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/google-maps-markup/styles.css b/vendor/google-maps-markup/styles.css
index d79828e..3fd8500 100644
--- a/vendor/google-maps-markup/styles.css
+++ b/vendor/google-maps-markup/styles.css
@@ -110,7 +110,7 @@
     fill: #444444;
 }
 
-.ember-power-select-selected-item:hover svg path,.ember-power-select-option:hover svg path {
+.ember-power-select-option:hover svg path {
     fill: #FFFFFF;
 }