Add additional marker colors and icons #17

vikasrana1989 · 2017-04-18T14:35:55Z

No description provided.

knownasilya · 2017-04-18T14:50:49Z

addon/components/google-maps-markup/component.js

@@ -260,6 +289,8 @@ export default Ember.Component.extend(ParentMixin, {
            event.stop();
          });
          listeners.pushObjects([ mapListener, dataListener ]);
+        }else if (tool.dataId === 'Point') {


Style nitpick

knownasilya · 2017-04-18T14:51:38Z

addon/components/google-maps-markup/component.js

+            let isDefaultIcon = tool.icon.id === tool.default.icon.id;
+            let isDefaultColor = tool.customColor.id === tool.default.customColor.id;
+
+            if (! isDefaultIcon || ! isDefaultColor) {


if (!isDefaultIcon || !isDefaultColor) {

knownasilya · 2017-04-18T14:52:36Z

addon/components/google-maps-markup/template.hbs

+        </div>
+      {{/if}}
+      {{#if (is-equal opt.type 'customColor')}}
+        <div class="dropdown {{if customColorMenu 'open'}}">


consistent naming between iconDropDown and customColorMenu, since both are dropdowns

knownasilya · 2017-04-18T14:54:38Z

addon/utils/tools.js

+      id: 'pin',
+      display: 'Pin'
+    }],
+    icon:{


Not sure about putting the defaults and the list items in this config.

knownasilya · 2017-04-18T15:09:08Z

Icons http://map-icons.com/

…ompleted

vikasrana1989 · 2017-04-19T15:25:14Z

@knownasilya

We have to add ember drop down component to add the customize drop down. Please check the latest code.
We added the drop down for color as same as it was for others.
We added a new drop down for marker icons. There are some style issue in icon drop. We will fix those by Tomorrow.
We tried http://map-icons.com/ but there were some problem in there. We checked and found that http://map-icons.com/ is not maintained any more. And owner suggested to use https://material.io/icons/
Now we are review https://material.io/icons/ to update icon color on map.

knownasilya · 2017-04-19T18:57:42Z

package.json

    "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",


I'd rather not use this heavy addon since we don't use it anywhere else in MapGeo, and most likely we'll be updating to material-design or BS4 in the near future.

knownasilya · 2017-04-19T19:00:54Z

I'd rather not use that addon, maybe just use a select instead of the dropdown.
Excellent!
Great!
See below.
https://material.io/icons/ is fine (I actually want to convert mapgeo to material icons/design eventually), just add the icons in the map section.

knownasilya · 2017-04-20T13:32:23Z

addon/components/google-maps-markup/template.hbs

+          <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">


You should be able to render the svgs directly without making a file.

knownasilya · 2017-04-20T13:32:32Z

addon/components/google-maps-markup/template.hbs

-            {{#dd.menu as |ddm|}}
-              {{#each activeTool.icons as |icon|}}
-                <div {{action 'updateOptionValue' activeTool 'icon' icon}}>
+          <select onchange={{action "updateOptionValue" activeTool 'icon' value="target.value"}}>


Looking good 👍

…-maps-markup into marker-icon

knownasilya · 2017-04-21T13:55:40Z

Just tried out the latest changes. Things look good. A few things came to mind:

The marker dropdown resets to the default after every use of the marker tool
The SVG markers could probably be scaled down a bit
I'm not sure about having a select for the hover color, we can talk about this in the meeting
We can probably remove the default marker, since it just clashes, and make the pin default

knownasilya · 2017-04-21T14:14:29Z

Complementary function: http://stackoverflow.com/a/37657940/483616
Select addon: http://www.ember-power-select.com/ (should work for marker display)

…markup into power-select

JsHint error removed from marker icon

…-maps-markup into marker-icon

knownasilya · 2017-05-04T14:28:49Z

addon/utils/tools.js

+    icon: {
+      id: 'default',
+      display: 'Default',
+      path: 'google-maps-markup/images/spotlight-poi-highlighted_hdpi.png',


This icon needs to be removed.

Marker Icon

* Marker DropDown Added * marker dropdown code updated * indent fixed

* Marker DropDown Added * marker dropdown code updated * indent fixed * marker icon style updated * color value changed

…-maps-markup into marker-icon

vikasrana1989 · 2017-05-19T10:36:05Z

Issues Description:-

Marker Icon position is not coming right some time and not properly centered.
When we are removing markers, Marker Icons are not getting remove from the map.

Both Issues are fixed and latest code have been updated here. This branch is ready to merge. We are clear now.

vikasrana1989 added 3 commits April 18, 2017 13:40

add additional marker colors and icons

c9bef6b

add additional marker colors and icons

7475e50

add additional marker colors and icons

d45a787

knownasilya requested changes Apr 18, 2017

View reviewed changes

vikasrana1989 added 3 commits April 19, 2017 15:18

custom color code removed

712b76b

Ember Bootstrap drop down component added and marker icon drop down c…

11691f0

…ompleted

comment update

e7e0a87

knownasilya requested changes Apr 19, 2017

View reviewed changes

vikasrana1989 added 2 commits April 20, 2017 12:18

ember-bootstrap addon removed

a4f6de2

Icon drop down updated with select tag

5c2a92b

knownasilya reviewed Apr 20, 2017

View reviewed changes

vikasrana1989 and others added 9 commits April 20, 2017 21:20

Dynamic image marker added on map

cdef4b3

default option value is not getting updated

529c642

hover added

bd2aad5

Marker icon color dynamically set

e854818

Marker hoever path updated

10d8440

Marker hoever path updated

92dca5b

default hover color

1e8f60f

Icon drop down color updated

6a8aa72

Merge branch 'marker-icon' of https://github.com/vikasrana1989/google…

47bbc78

…-maps-markup into marker-icon

vikasrana1989 and others added 4 commits April 24, 2017 15:28

Marker Icon custom hover removed + Marker Icon Hover color set to red

16b628e

Marker Icon last used to set default

d58cb39

color dropdown removed when default icon on marker

ce48af9

color dropdown removed when default icon on marker

0043f71

vikasrana1989 changed the title ~~No Merge: Add additional marker colors and icons~~ Add additional marker colors and icons Apr 26, 2017

Ganesh4 and others added 12 commits May 1, 2017 20:46

ember power selected applied

f0258d0

ember power select applied

19a83de

ember power select applied on marker

1af63b9

Marker Icon dynamic hover color set

70f76f9

Merge branch 'marker-icon' of https://github.com/Ganesh4/google-maps-…

af5cf3e

…markup into power-select

jsHint error removed from marker icon

5e8fab4

Merge pull request #5 from Ganesh4/jshinterr-marker

51e9b65

JsHint error removed from marker icon

power select updated

95f7538

ember power selection

163b8d7

Merge branch 'marker-icon' of https://github.com/vikasrana1989/google…

756b789

…-maps-markup into marker-icon

drop_down class added

de9dce8

code merged with vikas marker icon

b45a2c6

knownasilya requested changes May 4, 2017

View reviewed changes

vikasrana1989 and others added 15 commits May 8, 2017 11:27

code merged

2e94535

Marker Icon updated with dropdown option

6c83041

Merge pull request #7 from vikasrana1989/marker-icon-new

7d2c689

Marker Icon

code merged

8c930d3

code update

e329b53

code update

4800f39

style updated

6a3e0ac

New Marker drop down Added(#8)

3ae2bf4

* Marker DropDown Added * marker dropdown code updated * indent fixed

Marker Dropdown icon style updated (#9)

40c0b12

* Marker DropDown Added * marker dropdown code updated * indent fixed * marker icon style updated * color value changed

code update

35d7696

Marker Icon position issue fixed

a11ab0e

marker removed on clear all button

31cc0bf

Merge branch 'marker-icon' of https://github.com/vikasrana1989/google…

b826b8a

…-maps-markup into marker-icon

hover marker selected style fixed

4a99ac9

Merge branch 'marker-icon' of https://github.com/vikasrana1989/google…

349144e

…-maps-markup into marker-icon

knownasilya added this to the v3.0 milestone Oct 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add additional marker colors and icons #17

Add additional marker colors and icons #17

vikasrana1989 commented Apr 18, 2017

knownasilya Apr 18, 2017

knownasilya Apr 18, 2017

knownasilya Apr 18, 2017

knownasilya Apr 18, 2017

knownasilya Apr 18, 2017

knownasilya commented Apr 18, 2017

vikasrana1989 commented Apr 19, 2017 •

edited

Loading

knownasilya Apr 19, 2017

knownasilya commented Apr 19, 2017 •

edited

Loading

knownasilya Apr 20, 2017

knownasilya Apr 20, 2017

knownasilya commented Apr 21, 2017 •

edited

Loading

knownasilya commented Apr 21, 2017 •

edited

Loading

knownasilya May 4, 2017

vikasrana1989 commented May 19, 2017

Add additional marker colors and icons #17

Are you sure you want to change the base?

Add additional marker colors and icons #17

Conversation

vikasrana1989 commented Apr 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

knownasilya commented Apr 18, 2017

vikasrana1989 commented Apr 19, 2017 • edited Loading

Choose a reason for hiding this comment

knownasilya commented Apr 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

knownasilya commented Apr 21, 2017 • edited Loading

knownasilya commented Apr 21, 2017 • edited Loading

Choose a reason for hiding this comment

vikasrana1989 commented May 19, 2017

vikasrana1989 commented Apr 19, 2017 •

edited

Loading

knownasilya commented Apr 19, 2017 •

edited

Loading

knownasilya commented Apr 21, 2017 •

edited

Loading

knownasilya commented Apr 21, 2017 •

edited

Loading