From 01d1edfaab722a03e76a5431d461a160cad16b92 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@thewebdevelopmentagency.com>
Date: Wed, 29 Jan 2020 17:33:32 +0700
Subject: [PATCH] IMPROVEMENT: Map API loaded event

---
 src/js/_components/_ui.map.api.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/js/_components/_ui.map.api.js b/src/js/_components/_ui.map.api.js
index 49e3ee4..7b6fa16 100755
--- a/src/js/_components/_ui.map.api.js
+++ b/src/js/_components/_ui.map.api.js
@@ -7,7 +7,7 @@ import '../../scss/_components/_ui.map.scss';
 
 import CONSTS from 'js/_consts';
 
-const MapAPI = (($) => {
+const MapAPI = ($ => {
   // Constants
   const NAME = 'jsMapAPI';
   const DATA_KEY = NAME;
@@ -38,7 +38,7 @@ const MapAPI = (($) => {
       Drv.init($el, config);
       ui.drv = Drv;
 
-      $el.on(Events.MAPAPILOADED, (e) => {
+      $el.on(Events.MAPAPILOADED, e => {
         ui.map = Drv.getMap();
 
         if (config['geojson']) {
@@ -47,7 +47,7 @@ const MapAPI = (($) => {
         } else if (config['address']) {
           console.log(config['address']);
           console.log(`${NAME}: setting up address marker`);
-          Drv.geocode(config['address'], (result) => {
+          Drv.geocode(config['address'], result => {
             console.log(result);
           });
         } else if (config['lat'] && config['lng']) {
@@ -60,13 +60,12 @@ const MapAPI = (($) => {
           Drv.addMarker([config['lng'], config['lat']], config);
         }
 
+        $el.data(DATA_KEY, ui);
+        $el.addClass(`${NAME}-active`);
+
+        $el.trigger(Events.MAPLOADED);
         console.log(`${NAME}: Map is loaded`);
       });
-
-      $el.data(DATA_KEY, ui);
-      $el.addClass(`${NAME}-active`);
-
-      $el.trigger(Events.MAPLOADED);
     }
 
     // Public methods