From 908dea458451ea5abea4766f4e87ac37b5c31d8c Mon Sep 17 00:00:00 2001
From: cronzon <cronzon@switchfly.com>
Date: Fri, 21 Sep 2018 17:31:58 +0000
Subject: [PATCH] Cleans up a bit

---
 TWCC.iws                | 162 ++++++++++++++-------------
 webapp/js/map.bundle.js | 136 ++++++++++-------------
 webapp/js/map.js        | 238 ++++++++++++++++++++--------------------
 3 files changed, 259 insertions(+), 277 deletions(-)

diff --git a/TWCC.iws b/TWCC.iws
index c959477..7f21397 100644
--- a/TWCC.iws
+++ b/TWCC.iws
@@ -15,14 +15,14 @@
       <change beforePath="$PROJECT_DIR$/webapp/admin/.htaccess" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/webapp/includes/application_top.php" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/includes/application_top.php" afterDir="false" />
     </list>
+    <list id="6401c52a-3810-4fe5-a93f-53d39aa2bed8" name="things" comment="">
+      <change beforePath="$PROJECT_DIR$/webapp/Poop-Inc./firmware/poop_inc/filesystem.ino" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/Poop-Inc./firmware/poop_inc/filesystem.ino" afterDir="false" />
+    </list>
     <list default="true" id="a8befd6b-6de1-4188-ba65-de5b0e2c0c72" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/webapp/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/js/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/TWCC.iws" beforeDir="false" afterPath="$PROJECT_DIR$/TWCC.iws" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/webapp/js/map.bundle.js" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/js/map.bundle.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/webapp/js/map.js" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/js/map.js" afterDir="false" />
     </list>
-    <list id="6401c52a-3810-4fe5-a93f-53d39aa2bed8" name="things" comment="">
-      <change beforePath="$PROJECT_DIR$/webapp/Poop-Inc./firmware/poop_inc/filesystem.ino" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/Poop-Inc./firmware/poop_inc/filesystem.ino" afterDir="false" />
-    </list>
     <ignored path="TWCC.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path="webapp/sessions/" />
@@ -46,7 +46,7 @@
     <favorites_list name="TWCC" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.50858366">
+    <splitter split-orientation="horizontal" split-proportion="0.4926534">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
@@ -61,16 +61,25 @@
           <file leaf-file-name="map.js" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/webapp/js/map.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="205">
-                  <caret line="680" column="42" selection-start-line="680" selection-start-column="42" selection-end-line="680" selection-end-column="42" />
+                <state relative-caret-position="336">
+                  <caret line="898" column="9" selection-start-line="898" selection-start-column="9" selection-end-line="898" selection-end-column="9" />
                   <folding>
-                    <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
-                    <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+                    <element signature="e#2293#3956#0" />
+                    <element signature="e#4017#4959#0" />
+                    <element signature="e#4984#5055#0" />
+                    <element signature="e#5089#5170#0" />
+                    <element signature="e#5205#5276#0" />
+                    <element signature="e#5309#5378#0" />
+                    <element signature="e#5411#5474#0" />
+                    <element signature="e#5513#6135#0" />
+                    <element signature="e#6193#6584#0" />
+                    <element signature="e#6632#8005#0" />
+                    <element signature="e#8048#8345#0" />
+                    <element signature="e#8399#8876#0" />
+                    <element signature="e#8928#10184#0" />
+                    <element signature="e#10252#10672#0" />
+                    <element signature="e#10716#10827#0" />
+                    <element signature="e#10872#11002#0" />
                     <element signature="n#style#0;n#path#0;n#svg#0;n#!!top" expanded="true" />
                     <element signature="n#style#0;n#rect#0;n#svg#0;n#!!top" expanded="true" />
                     <element signature="n#style#0;n#polygon#0;n#svg#0;n#!!top" expanded="true" />
@@ -96,8 +105,8 @@
           <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/webapp/js/main.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="228">
-                  <caret line="234" column="33" selection-start-line="234" selection-start-column="19" selection-end-line="234" selection-end-column="33" />
+                <state relative-caret-position="249">
+                  <caret line="234" column="8" selection-start-line="234" selection-start-column="8" selection-end-line="234" selection-end-column="8" />
                 </state>
               </provider>
             </entry>
@@ -115,11 +124,11 @@
       </split-first>
       <split-second>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="map.js" pinned="false" current-in-tab="false">
+          <file leaf-file-name="map.js" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/webapp/js/map.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="524">
-                  <caret line="55" column="177" selection-start-line="55" selection-start-column="177" selection-end-line="55" selection-end-column="177" />
+                <state relative-caret-position="258">
+                  <caret line="274" column="9" selection-start-line="274" selection-start-column="9" selection-end-line="274" selection-end-column="9" />
                   <folding>
                     <element signature="e#1040#1078#0" expanded="true" />
                     <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
@@ -151,33 +160,12 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Graticule.js" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/webapp/node_modules/ol-ext/control/Graticule.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="108">
-                  <caret line="66" column="21" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="21" />
-                  <folding>
-                    <element signature="n#!!doc" expanded="true" />
-                    <element signature="e#167#209#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-second>
     </splitter>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>export</find>
-      <find>ol_proj.get`</find>
-      <find>export function fromLonLat(</find>
-      <find>lonLabelFormatter</find>
-      <find>formatCoord</find>
-      <find>degreesToStringHDMS</find>
-      <find>_flyTo</find>
-      <find>_setMarker</find>
       <find>_setGeometricPointer</find>
       <find>.wgs84_changed</find>
       <find>selection_changed</find>
@@ -200,12 +188,21 @@
       <find>marker.dragend</find>
       <find>flyto</find>
       <find>.bind(</find>
+      <find>style</find>
+      <find>_setPolylineMetrics</find>
+      <find>this.</find>
+      <find>_olMarkerVectorSource.gete</find>
+      <find>_doZoom</find>
+      <find>_flyAndZoom</find>
+      <find>map.rightclick</find>
+      <find>_getMaxZoomPromise</find>
     </findStrings>
     <replaceStrings>
       <replace>$json</replace>
       <replace>LogsCRUD.php</replace>
       <replace>'</replace>
       <replace>header</replace>
+      <replace>.on(</replace>
     </replaceStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/webapp/gaproxy</dir>
@@ -293,8 +290,9 @@
     <servers />
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
+    <option name="x" value="1920" />
+    <option name="width" value="1920" />
+    <option name="height" value="1080" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -313,6 +311,11 @@
               <item name="TWCC" type="b2602c69:ProjectViewProjectNode" />
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="TWCC" type="b2602c69:ProjectViewProjectNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -701,21 +704,7 @@
       <workItem from="1536769703712" duration="37010000" />
       <workItem from="1537125184678" duration="16863000" />
       <workItem from="1537376181700" duration="19139000" />
-      <workItem from="1537405060616" duration="3100000" />
-    </task>
-    <task id="LOCAL-00090" summary="Fix issue #47.&#10;Builds the Math.sinh function if it doesn't exist.">
-      <created>1423256908201</created>
-      <option name="number" value="00090" />
-      <option name="presentableId" value="LOCAL-00090" />
-      <option name="project" value="LOCAL" />
-      <updated>1423256908201</updated>
-    </task>
-    <task id="LOCAL-00091" summary="Fix issue #48.&#10;Allows the dialogs to be closed when clicking outside.">
-      <created>1423265090372</created>
-      <option name="number" value="00091" />
-      <option name="presentableId" value="LOCAL-00091" />
-      <option name="project" value="LOCAL" />
-      <updated>1423265090372</updated>
+      <workItem from="1537405060616" duration="5706000" />
     </task>
     <task id="LOCAL-00092" summary="Fix issue #49.&#10;Changes the way the projections are passed to proj4.">
       <created>1424455873768</created>
@@ -1046,11 +1035,25 @@
       <option name="project" value="LOCAL" />
       <updated>1537407916091</updated>
     </task>
-    <option name="localTasksCounter" value="139" />
+    <task id="LOCAL-00139" summary="Removes `bind` from map.js and adds the click listener on the map">
+      <created>1537408934478</created>
+      <option name="number" value="00139" />
+      <option name="presentableId" value="LOCAL-00139" />
+      <option name="project" value="LOCAL" />
+      <updated>1537408934478</updated>
+    </task>
+    <task id="LOCAL-00140" summary="Removes remaining `bind`">
+      <created>1537409063842</created>
+      <option name="number" value="00140" />
+      <option name="presentableId" value="LOCAL-00140" />
+      <option name="project" value="LOCAL" />
+      <updated>1537409063842</updated>
+    </task>
+    <option name="localTasksCounter" value="141" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="398538000" />
+    <option name="totallyTimeSpent" value="401144000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1074,10 +1077,10 @@
       <window_info anchor="bottom" id="Database Changes" order="7" sideWeight="0.49928468" weight="0.32969698" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.25454545" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32935324" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="14" visible="true" weight="0.2581818" />
+      <window_info anchor="bottom" id="Terminal" order="14" weight="0.2581818" />
       <window_info id="Capture Tool" order="0" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4661191" visible="true" weight="0.17238913" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4661191" weight="0.17238913" />
       <window_info anchor="right" id="Database" order="7" sideWeight="0.8333333" weight="0.24248926" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.48969698" />
       <window_info anchor="right" id="SciView" order="4" />
@@ -1103,31 +1106,31 @@
     <layout-to-restore>
       <window_info anchor="bottom" id="Application Servers" order="12" />
       <window_info id="Designer" order="4" />
-      <window_info anchor="right" id="Palette" order="8" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.32772276" />
       <window_info id="JRebel" order="5" side_tool="true" />
+      <window_info id="Image Layers" order="0" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32935324" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Changes" order="7" visible="true" weight="0.3118503" />
+      <window_info anchor="right" id="Palette" order="8" />
       <window_info id="Favorites" order="6" sideWeight="0.5318275" side_tool="true" weight="0.27539343" />
-      <window_info anchor="bottom" id="Terminal" order="15" weight="0.25870648" />
+      <window_info anchor="bottom" id="Changes" order="7" visible="true" weight="0.3118503" />
       <window_info id="Capture Tool" order="1" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.30128205" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.32772276" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.18834548" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5007153" side_tool="true" weight="0.30060607" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Database Changes" order="8" weight="0.32969698" />
-      <window_info anchor="bottom" id="Version Control" order="10" visible="true" weight="0.25454545" />
+      <window_info anchor="bottom" id="Database Changes" order="8" sideWeight="0.49928468" weight="0.32969698" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="10" visible="true" weight="0.25454545" />
       <window_info anchor="bottom" id="JRebel Executor" order="13" />
+      <window_info anchor="bottom" id="Terminal" order="15" weight="0.2581818" />
       <window_info anchor="bottom" id="Grunt" order="11" weight="0.32848233" />
       <window_info anchor="right" id="Code explorer" order="5" />
-      <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.4661191" visible="true" weight="0.1702432" />
+      <window_info content_ui="combo" id="Project" order="2" sideWeight="0.4661191" visible="true" weight="0.17238913" />
       <window_info anchor="right" id="SciView" order="6" />
       <window_info anchor="right" id="Database" order="10" sideWeight="0.8333333" weight="0.24248926" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info id="Image Layers" order="0" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.18834548" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info anchor="right" id="Maven Projects" order="9" />
@@ -1180,8 +1183,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="temp" />
-    <MESSAGE value="???" />
     <MESSAGE value="Removes iws." />
     <MESSAGE value="Changes the ignore" />
     <MESSAGE value="Removes iws files" />
@@ -1205,11 +1206,13 @@
     <MESSAGE value="Fixes JS error" />
     <MESSAGE value="Adds layer switcher" />
     <MESSAGE value="Adds graticule. WIP" />
-    <option name="LAST_COMMIT_MESSAGE" value="Adds graticule. WIP" />
+    <MESSAGE value="Removes `bind` from map.js and adds the click listener on the map" />
+    <MESSAGE value="Removes remaining `bind`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removes remaining `bind`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="21" />
+      <option name="time" value="22" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -1524,16 +1527,17 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/webapp/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="234" column="33" selection-start-line="234" selection-start-column="19" selection-end-line="234" selection-end-column="33" />
+        <state relative-caret-position="249">
+          <caret line="234" column="8" selection-start-line="234" selection-start-column="8" selection-end-line="234" selection-end-column="8" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/webapp/js/map.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="680" column="42" selection-start-line="680" selection-start-column="42" selection-end-line="680" selection-end-column="42" />
+        <state relative-caret-position="258">
+          <caret line="274" column="9" selection-start-line="274" selection-start-column="9" selection-end-line="274" selection-end-column="9" />
           <folding>
+            <element signature="e#1040#1078#0" expanded="true" />
             <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
diff --git a/webapp/js/map.bundle.js b/webapp/js/map.bundle.js
index 1cb3c15..ba85ac2 100644
--- a/webapp/js/map.bundle.js
+++ b/webapp/js/map.bundle.js
@@ -69,9 +69,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     return;
   }
 
-  var instance,
-      init = function init(opts) {
-    var _model,
+  var instance;
+
+  var init = function init(opts) {
+    var _azimuths,
         _olMap,
         _geocoderService,
         _elevationService,
@@ -126,32 +127,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     };
 
     $.extend(true, _options, opts);
-    _model = {
+    _azimuths = {
       anglesInRadians: {},
       booleans: {
         autoZoom: true
       },
       metrics: {},
       setAngleInRadians: function setAngleInRadians(key, angleInRadians) {
-        _model.anglesInRadians[key] = angleInRadians;
+        _azimuths.anglesInRadians[key] = angleInRadians;
       },
       setAngleInDegrees: function setAngleInDegrees(key, angleInDegrees) {
-        _model.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
+        _azimuths.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
       },
       getAngleInRadians: function getAngleInRadians(key) {
-        return _model.anglesInRadians[key];
+        return _azimuths.anglesInRadians[key];
       },
       setBoolean: function setBoolean(key, bool) {
-        _model.booleans[key] = !!bool;
+        _azimuths.booleans[key] = !!bool;
       },
       getBoolean: function getBoolean(key) {
-        return _model.booleans[key];
+        return _azimuths.booleans[key];
       },
       setMetrics: function setMetrics(key, value) {
-        _model.metrics[key] = value;
+        _azimuths.metrics[key] = value;
       },
       getMetrics: function getMetrics(key) {
-        return _model.metrics[key];
+        return _azimuths.metrics[key];
       }
     };
 
@@ -301,47 +302,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       return _getGooglePromise(_elevationService.getElevationForLocations, obj, google.maps.ElevationStatus.OK);
     }
 
-    function _getMaxZoomPromise(obj) {
-      return _getGooglePromise(_maxZoomService.getMaxZoomAtLatLng, obj, google.maps.MaxZoomStatus.OK);
-    }
-
     function _addListeners() {
       var $body = $('body');
-      /*if (_options.locationSelector) {
-          var autocompleteService = new google.maps.places.Autocomplete($(_options.locationSelector)[0], {bounds: _map.getBounds()});
-          google.maps.event.addListener(autocompleteService, 'place_changed', function() {
-              var place = autocompleteService.getPlace();
-              _trigger('place.changed', place);
-          });
-          google.maps.event.addListener(_map, 'bounds_changed', function() {
-              autocompleteService.setBounds(_map.getBounds());
-          });
-          google.maps.event.addListenerOnce(_map, 'tilesloaded', function() {
-              $('.pac-container')
-                  .css('left', ($(_options.locationSelector).offset().left).toString() + 'px')
-                  .css('top', ($(_options.locationSelector).offset().top + 20).toString() + 'px');
-              _trigger('map.tilesloaded');
-          });
-      }
-      google.maps.event.addListener(_map, 'rightclick', function(event) {
+      /*google.maps.event.addListener(_map, 'rightclick', function(event) {
           _trigger('map.rightclick', event);
       });
-      google.maps.event.addListener(_map, 'zoom_changed', function() {
-          if (_olMarkerVectorSource.getFeatures().length) {
-              setTimeout(function() {_createAzimuths(_marker.getPosition());}, 100);
-          }
-      });
       google.maps.event.addListener(_infowindow, 'domready', function() {
           $('#zoom-btn').button({ icons: {primary: 'ui-icon-zoomin'}, text: false });
           _trigger('infowindow.dom_ready');
-      });
-      google.maps.event.addListenerOnce(_map, 'idle', function(){
-          setTimeout(function() {_dfd.resolve();}, 1000);
-      });
-      $body.on('click', '#zoom-btn', function() {
-          _doZoom();
       });*/
 
+      $body.on('click', '#zoom-btn', function () {
+        _flyAndZoom();
+      });
+
       _olGeocoder.on('addresschosen', function (evt) {
         _trigger('place.changed', _toLonLat(evt.coordinate));
       });
@@ -389,11 +363,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
         response.wgs84 = _removeErrors(response.wgs84);
 
-        _model.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
+        _azimuths.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
 
-        _model.setAngleInRadians('srcConvergence', convergence.source);
+        _azimuths.setAngleInRadians('srcConvergence', convergence.source);
 
-        _model.setAngleInRadians('dstConvergence', convergence.destination);
+        _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
 
         _setGeometricPointer(response.wgs84);
 
@@ -403,9 +377,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         if (_olAzimutsVectorSource.getFeatures().length) {
           var convergence = _options.utils.degToRad(response.convergenceInDegrees);
 
-          _model.setAngleInRadians('srcConvergence', convergence.source);
+          _azimuths.setAngleInRadians('srcConvergence', convergence.source);
 
-          _model.setAngleInRadians('dstConvergence', convergence.destination);
+          _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
 
           _updateAzimuths();
         }
@@ -542,7 +516,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         })],
         view: _olView
       });
-      /*var graticule = new Graticule({
+      /*
+      Default graticule based on map's SRS
+       var graticule = new Graticule({
           map: _olMap,
           strokeStyle: new Stroke({
               color: 'rgba(255,120,0,0.9)',
@@ -598,16 +574,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         },
         magneticDeclination: {
           src: _getSvgSource('<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 16 97" xml:space="preserve" width="16" height="97"><g transform="matrix(0.07106223,0,0,0.07106223,-0.43846047,1.8741008e-6)"><path style="fill:#fff" d="m 7.954,226.53 c -2.23,4.623 -2.295,8.072 -0.609,9.915 3.911,4.275 15.926,-3.905 23.323,-9.051 l 58.416,-40.662 c 7.397,-5.145 20.402,-11.835 29.414,-11.993 0.897,-0.016 1.8,-0.011 2.703,0.011 9.007,0.218 21.958,7.016 29.3,12.238 l 56.403,40.151 c 7.343,5.221 19.303,13.473 23.301,9.219 1.74,-1.849 1.751,-5.33 -0.381,-9.997 L 129.648,7.047 c -4.264,-9.333 -11.335,-9.404 -15.79,-0.163 L 7.954,226.53 Z"/><path style="stroke:#fff;stroke-width:28.14434624;" d="m 118.74748,174.45383 0,1190.45957"/></g></svg>'),
-          rotation: _model.getAngleInRadians('magneticDeclination')
+          rotation: _azimuths.getAngleInRadians('magneticDeclination')
         },
         srcConvergence: {
           src: gnArrowSrc,
           color: '#f00',
-          rotation: _model.getAngleInRadians('srcConvergence')
+          rotation: _azimuths.getAngleInRadians('srcConvergence')
         },
         dstConvergence: {
           src: gnArrowSrc,
-          rotation: _model.getAngleInRadians('dstConvergence')
+          rotation: _azimuths.getAngleInRadians('dstConvergence')
         }
       };
 
@@ -636,7 +612,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         //Even if xy has not changed, we need to force the re-rendering so the rotation is taken into account
         feature.getGeometry().setCoordinates(xy || feature.getGeometry().getCoordinates());
         var name = feature.get('name');
-        var rotation = _model.getAngleInRadians(name) || 0;
+        var rotation = _azimuths.getAngleInRadians(name) || 0;
         var opacity = name !== 'true' && !rotation ? 0 : _options.mapOptions.azimuthOpacity;
         var image = feature.get('style').getImage();
         image.setRotation(rotation);
@@ -767,7 +743,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     }
 
     function _setAutoZoom() {
-      if (_model.getBoolean('autoZoom') === true) {
+      if (_azimuths.getBoolean('autoZoom') === true) {
         var bounds = _polyline.getBounds();
 
         if (bounds) {
@@ -791,10 +767,34 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       return dfd.promise();
     }
 
+    function _zoomTo(zoom) {
+      var dfd = new $.Deferred();
+      var duration = 200;
+
+      _olView.animate({
+        zoom: zoom,
+        duration: duration
+      }, dfd.resolve);
+
+      return dfd.promise();
+    }
+
+    function _flyAndZoom() {
+      $('#zoom-btn').button("option", "disabled", true);
+
+      var xy = _olMarkerVectorSource.getFeatures()[0].getGeometry().getCoordinates();
+
+      $.when(_flyTo(xy), _zoomTo(10)).done(function () {
+        $('#zoom-btn').button("option", "disabled", false);
+      }).fail(function () {
+        alert("Error in MaxZoomService");
+      });
+    }
+
     function _setMetrics(length, area) {
-      _model.setMetrics('length', length);
+      _azimuths.setMetrics('length', length);
 
-      _model.setMetrics('area', area);
+      _azimuths.setMetrics('area', area);
 
       _trigger('map.metricschanged', {
         length: length,
@@ -975,22 +975,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       });
     }
 
-    function _doZoom() {
-      var latlng = _marker.getPosition();
-
-      $('#zoom-btn').button("option", "disabled", true);
-
-      _getMaxZoomPromise(latlng).done(function (response) {
-        $('#zoom-btn').button("option", "disabled", false);
-
-        _olMap.setCenter(latlng);
-
-        _olMap.setZoom(response.zoom);
-      }).fail(function () {
-        alert("Error in MaxZoomService");
-      });
-    }
-
     _initMap();
 
     return {
@@ -998,10 +982,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       createControl: _createControl,
       setGraticule: _setGraticule,
       model: {
-        setAngleInRadians: _model.setAngleInRadians,
-        setAngleInDegrees: _model.setAngleInDegrees,
-        getMetrics: _model.getMetrics,
-        setBoolean: _model.setBoolean
+        setAngleInRadians: _azimuths.setAngleInRadians,
+        setAngleInDegrees: _azimuths.setAngleInDegrees,
+        getMetrics: _azimuths.getMetrics,
+        setBoolean: _azimuths.setBoolean
       },
       getMap: function getMap() {
         return _olMap;
diff --git a/webapp/js/map.js b/webapp/js/map.js
index 313bc97..4031076 100644
--- a/webapp/js/map.js
+++ b/webapp/js/map.js
@@ -43,7 +43,7 @@ import LayerGroup from 'ol/layer/Group';
 import LayerSwitcher from 'ol-layerswitcher';
 import Graticule from 'ol-ext/control/Graticule';
 
-(function($) {
+(function ($) {
     "use strict";
     /*global document, window, jQuery, console, Math */
 
@@ -51,9 +51,11 @@ import Graticule from 'ol-ext/control/Graticule';
         return;
     }
 
-    var instance,
-    init = function(opts) {
-        var _model, _olMap, _geocoderService, _elevationService, _olView, _olDefaultSource, _olModify, _olAzimutsVectorSource, _olMarkerVectorSource, _olGeocoder, _olGraticule, _infowindow, _polyline, _maxZoomService, _tmpOverlay,
+    var instance;
+    var init = function (opts) {
+        var _azimuths, _olMap, _geocoderService, _elevationService, _olView, _olDefaultSource, _olModify,
+            _olAzimutsVectorSource, _olMarkerVectorSource, _olGeocoder, _olGraticule, _infowindow, _polyline,
+            _maxZoomService, _tmpOverlay,
             _dfd = null,
             _options = {
                 mapOptions: {
@@ -98,30 +100,30 @@ import Graticule from 'ol-ext/control/Graticule';
 
         $.extend(true, _options, opts);
 
-        _model = {
+        _azimuths = {
             anglesInRadians: {},
-            booleans: {autoZoom:true},
+            booleans: {autoZoom: true},
             metrics: {},
-            setAngleInRadians: function(key, angleInRadians) {
-                _model.anglesInRadians[key] = angleInRadians;
+            setAngleInRadians: function (key, angleInRadians) {
+                _azimuths.anglesInRadians[key] = angleInRadians;
             },
-            setAngleInDegrees: function(key, angleInDegrees) {
-                _model.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
+            setAngleInDegrees: function (key, angleInDegrees) {
+                _azimuths.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
             },
             getAngleInRadians: function (key) {
-                return _model.anglesInRadians[key];
+                return _azimuths.anglesInRadians[key];
             },
-            setBoolean: function(key, bool) {
-                _model.booleans[key] = !!bool;
+            setBoolean: function (key, bool) {
+                _azimuths.booleans[key] = !!bool;
             },
-            getBoolean: function(key) {
-                return _model.booleans[key];
+            getBoolean: function (key) {
+                return _azimuths.booleans[key];
             },
-            setMetrics: function(key, value) {
-                _model.metrics[key] = value;
+            setMetrics: function (key, value) {
+                _azimuths.metrics[key] = value;
             },
-            getMetrics: function(key) {
-                return _model.metrics[key];
+            getMetrics: function (key) {
+                return _azimuths.metrics[key];
             }
         };
 
@@ -148,16 +150,16 @@ import Graticule from 'ol-ext/control/Graticule';
         function _createControl(obj) {
             var controlDiv,
                 opts = {
-                    fkidx:1,
-                    css:{
+                    fkidx: 1,
+                    css: {
                         width: '',
                         height: '',
                         backgroundColor: 'transparent'
                     }
                 };
-            $.extend(opts, obj||{});
+            $.extend(opts, obj || {});
             controlDiv = $('<div>')
-                .css(opts.css||{})
+                .css(opts.css || {})
                 .prop('index', opts.fkidx)
                 .addClass(opts['class']);
             if (opts.content !== undefined) {
@@ -184,11 +186,11 @@ import Graticule from 'ol-ext/control/Graticule';
 
         function _getMapType(WMSProviderData) {
             var mapType,
-                replacer = function(match, p1) {
+                replacer = function (match, p1) {
                     return eval(p1);
                 },
                 options = {
-                    getTileUrl: function(coord, zoom) {
+                    getTileUrl: function (coord, zoom) {
                         var url,
                             normalizedCoord = _getNormalizedCoordinates(coord, zoom);
                         if (!normalizedCoord) {
@@ -202,9 +204,9 @@ import Graticule from 'ol-ext/control/Graticule';
                         return url;
                     },
                     tileSize: _newGSize(256, 256),
-                    isPng: WMSProviderData.isPng||false,
+                    isPng: WMSProviderData.isPng || false,
                     maxZoom: WMSProviderData.zoom.max,
-                    minZoom: WMSProviderData.zoom.min||0,
+                    minZoom: WMSProviderData.zoom.min || 0,
                     alt: WMSProviderData.alternativeText,
                     name: WMSProviderData.name
                 };
@@ -216,9 +218,9 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         function _setPolylineGetBounds() {
-            google.maps.Polyline.prototype.getBounds = function() {
+            google.maps.Polyline.prototype.getBounds = function () {
                 var bounds = new google.maps.LatLngBounds();
-                this.getPath().forEach(function(e) {
+                this.getPath().forEach(function (e) {
                     bounds.extend(e);
                 });
                 return bounds;
@@ -226,13 +228,18 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         function _setCanvasProjectionOverlayClass() {
-            function CanvasProjectionOverlay() {}
+            function CanvasProjectionOverlay() {
+            }
+
             CanvasProjectionOverlay.prototype = new google.maps.OverlayView();
             $.extend(CanvasProjectionOverlay.prototype, {
                 constructor: CanvasProjectionOverlay,
-                onAdd: function(){},
-                draw: function(){},
-                onRemove: function(){}
+                onAdd: function () {
+                },
+                draw: function () {
+                },
+                onRemove: function () {
+                }
             });
             _tmpOverlay = new CanvasProjectionOverlay();
             _tmpOverlay.setMap(_olMap);
@@ -240,7 +247,7 @@ import Graticule from 'ol-ext/control/Graticule';
 
         function _getStreetViewCloseBtn(panorama) {
             var $closeBtn = $('<div style="z-index: 1; margin: 3px; position: absolute; right: 0px; top: 70px;"><div title="' + _t('close') + '" style="position: absolute; left: 0px; top: 0px; z-index: 2;"><div style="width: 16px; height: 16px; overflow: hidden; position: absolute; left: 0px; top: 0px;"><img src="https://maps.gstatic.com/mapfiles/api-3/images/cb_scout2.png" draggable="false" style="position: absolute; left: -490px; top: -102px; width: 1028px; height: 214px; -webkit-user-select: none; border: 0px; padding: 0px; margin: 0px;" alt="X"><\/div><div style="width: 16px; height: 16px; overflow: hidden; position: absolute; left: 0px; top: 0px; display: none;"><img src="https://maps.gstatic.com/mapfiles/api-3/images/cb_scout2.png" draggable="false" style="position: absolute; left: -539px; top: -102px; width: 1028px; height: 214px; -webkit-user-select: none; border: 0px; padding: 0px; margin: 0px;" alt="X"><\/div><\/div><div style="z-index: 1; font-size: 1px; background-color: rgb(187, 187, 187); width: 16px; height: 16px;"><\/div><\/div>');
-            $closeBtn.on("click", function(event) {
+            $closeBtn.on("click", function (event) {
                 event.preventDefault();
                 panorama.setVisible(false);
             });
@@ -248,9 +255,9 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         function _getGooglePromise(googleAsyncFunction, args, OK) {
-            return $.Deferred(function(dfrd) {
-                googleAsyncFunction(args, function(results, status) {
-                    if(status === OK || (results && results.status === OK)) {
+            return $.Deferred(function (dfrd) {
+                googleAsyncFunction(args, function (results, status) {
+                    if (status === OK || (results && results.status === OK)) {
                         dfrd.resolve(results[0] || results);
                     } else {
                         dfrd.reject(new Error(status));
@@ -267,46 +274,18 @@ import Graticule from 'ol-ext/control/Graticule';
             return _getGooglePromise(_elevationService.getElevationForLocations, obj, google.maps.ElevationStatus.OK);
         }
 
-        function _getMaxZoomPromise(obj) {
-            return _getGooglePromise(_maxZoomService.getMaxZoomAtLatLng, obj, google.maps.MaxZoomStatus.OK);
-        }
-
         function _addListeners() {
             var $body = $('body');
-            /*if (_options.locationSelector) {
-                var autocompleteService = new google.maps.places.Autocomplete($(_options.locationSelector)[0], {bounds: _map.getBounds()});
-                google.maps.event.addListener(autocompleteService, 'place_changed', function() {
-                    var place = autocompleteService.getPlace();
-                    _trigger('place.changed', place);
-                });
-                google.maps.event.addListener(_map, 'bounds_changed', function() {
-                    autocompleteService.setBounds(_map.getBounds());
-                });
-                google.maps.event.addListenerOnce(_map, 'tilesloaded', function() {
-                    $('.pac-container')
-                        .css('left', ($(_options.locationSelector).offset().left).toString() + 'px')
-                        .css('top', ($(_options.locationSelector).offset().top + 20).toString() + 'px');
-                    _trigger('map.tilesloaded');
-                });
-            }
-            google.maps.event.addListener(_map, 'rightclick', function(event) {
+            /*google.maps.event.addListener(_map, 'rightclick', function(event) {
                 _trigger('map.rightclick', event);
             });
-            google.maps.event.addListener(_map, 'zoom_changed', function() {
-                if (_olMarkerVectorSource.getFeatures().length) {
-                    setTimeout(function() {_createAzimuths(_marker.getPosition());}, 100);
-                }
-            });
             google.maps.event.addListener(_infowindow, 'domready', function() {
                 $('#zoom-btn').button({ icons: {primary: 'ui-icon-zoomin'}, text: false });
                 _trigger('infowindow.dom_ready');
-            });
-            google.maps.event.addListenerOnce(_map, 'idle', function(){
-                setTimeout(function() {_dfd.resolve();}, 1000);
-            });
-            $body.on('click', '#zoom-btn', function() {
-                _doZoom();
             });*/
+            $body.on('click', '#zoom-btn', function() {
+                _flyAndZoom();
+            });
             _olGeocoder.on('addresschosen', function (evt) {
                 _trigger('place.changed', _toLonLat(evt.coordinate));
             });
@@ -320,7 +299,7 @@ import Graticule from 'ol-ext/control/Graticule';
                 var feature = evt.features.getArray()[0];
                 _trigger('marker.dragend', _toLonLat(feature.getGeometry().getCoordinates()));
             });
-            _olMap.on('click', function(evt) {
+            _olMap.on('click', function (evt) {
                 //_infowindow.close();
                 _trigger('map.click', _toLonLat(evt.coordinate));
             });
@@ -341,17 +320,17 @@ import Graticule from 'ol-ext/control/Graticule';
             $body.on('converterset.wgs84_changed', function (event, response) {
                 var convergence = _options.utils.degToRad(response.convergenceInDegrees);
                 response.wgs84 = _removeErrors(response.wgs84);
-                _model.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
-                _model.setAngleInRadians('srcConvergence', convergence.source);
-                _model.setAngleInRadians('dstConvergence', convergence.destination);
+                _azimuths.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
+                _azimuths.setAngleInRadians('srcConvergence', convergence.source);
+                _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
                 _setGeometricPointer(response.wgs84);
                 _trigger('converter.changed', response);
             });
-            $body.on('converterset.convergence_changed', function(event, response) {
+            $body.on('converterset.convergence_changed', function (event, response) {
                 if (_olAzimutsVectorSource.getFeatures().length) {
                     var convergence = _options.utils.degToRad(response.convergenceInDegrees);
-                    _model.setAngleInRadians('srcConvergence', convergence.source);
-                    _model.setAngleInRadians('dstConvergence', convergence.destination);
+                    _azimuths.setAngleInRadians('srcConvergence', convergence.source);
+                    _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
                     _updateAzimuths();
                 }
             });
@@ -499,7 +478,10 @@ import Graticule from 'ol-ext/control/Graticule';
                 view: _olView
             });
 
-            /*var graticule = new Graticule({
+            /*
+            Default graticule based on map's SRS
+
+            var graticule = new Graticule({
                 map: _olMap,
                 strokeStyle: new Stroke({
                     color: 'rgba(255,120,0,0.9)',
@@ -553,16 +535,16 @@ import Graticule from 'ol-ext/control/Graticule';
                 },
                 magneticDeclination: {
                     src: _getSvgSource('<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 16 97" xml:space="preserve" width="16" height="97"><g transform="matrix(0.07106223,0,0,0.07106223,-0.43846047,1.8741008e-6)"><path style="fill:#fff" d="m 7.954,226.53 c -2.23,4.623 -2.295,8.072 -0.609,9.915 3.911,4.275 15.926,-3.905 23.323,-9.051 l 58.416,-40.662 c 7.397,-5.145 20.402,-11.835 29.414,-11.993 0.897,-0.016 1.8,-0.011 2.703,0.011 9.007,0.218 21.958,7.016 29.3,12.238 l 56.403,40.151 c 7.343,5.221 19.303,13.473 23.301,9.219 1.74,-1.849 1.751,-5.33 -0.381,-9.997 L 129.648,7.047 c -4.264,-9.333 -11.335,-9.404 -15.79,-0.163 L 7.954,226.53 Z"/><path style="stroke:#fff;stroke-width:28.14434624;" d="m 118.74748,174.45383 0,1190.45957"/></g></svg>'),
-                    rotation: _model.getAngleInRadians('magneticDeclination')
+                    rotation: _azimuths.getAngleInRadians('magneticDeclination')
                 },
                 srcConvergence: {
                     src: gnArrowSrc,
                     color: '#f00',
-                    rotation: _model.getAngleInRadians('srcConvergence')
+                    rotation: _azimuths.getAngleInRadians('srcConvergence')
                 },
                 dstConvergence: {
                     src: gnArrowSrc,
-                    rotation: _model.getAngleInRadians('dstConvergence')
+                    rotation: _azimuths.getAngleInRadians('dstConvergence')
                 }
             };
             for (var name in norths) {
@@ -589,7 +571,7 @@ import Graticule from 'ol-ext/control/Graticule';
                 //Even if xy has not changed, we need to force the re-rendering so the rotation is taken into account
                 feature.getGeometry().setCoordinates(xy || feature.getGeometry().getCoordinates());
                 var name = feature.get('name');
-                var rotation = _model.getAngleInRadians(name) || 0;
+                var rotation = _azimuths.getAngleInRadians(name) || 0;
                 var opacity = name !== 'true' && !rotation ? 0 : _options.mapOptions.azimuthOpacity;
                 var image = feature.get('style').getImage();
                 image.setRotation(rotation);
@@ -607,7 +589,7 @@ import Graticule from 'ol-ext/control/Graticule';
 
         function _removeErrors(wgs84Array) {
             var newWgs84Array = [];
-            $.each(wgs84Array, function() {
+            $.each(wgs84Array, function () {
                 if (this.lat === undefined && this.x === undefined || this.error) {
                     return true;
                 } //INPUT ERROR => continue
@@ -618,7 +600,7 @@ import Graticule from 'ol-ext/control/Graticule';
 
         function _getLatLngArray(wgs84Array) {
             var myLatLngArray = [];
-            $.each(wgs84Array, function() {
+            $.each(wgs84Array, function () {
                 myLatLngArray.push(_getXY(this));
             });
             return myLatLngArray;
@@ -701,9 +683,9 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         function _startPolylineEdit() {
-            _polyline.runEdit(true, function(poly) {
+            _polyline.runEdit(true, function (poly) {
                 var wgs84 = [];
-                poly.getPath().forEach(function(vtx) {
+                poly.getPath().forEach(function (vtx) {
                     wgs84.push(vtx);
                 });
                 _trigger('polyline.editend', wgs84);
@@ -711,7 +693,7 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         function _setAutoZoom() {
-            if (_model.getBoolean('autoZoom') === true) {
+            if (_azimuths.getBoolean('autoZoom') === true) {
                 var bounds = _polyline.getBounds();
                 if (bounds) {
                     _olMap.fitBounds(bounds);
@@ -732,9 +714,33 @@ import Graticule from 'ol-ext/control/Graticule';
             return dfd.promise();
         }
 
+        function _zoomTo(zoom) {
+            var dfd = new $.Deferred();
+            var duration = 200;
+
+            _olView.animate({
+                zoom: zoom,
+                duration: duration
+            }, dfd.resolve);
+
+            return dfd.promise();
+        }
+
+        function _flyAndZoom() {
+            $('#zoom-btn').button("option", "disabled", true);
+            var xy = _olMarkerVectorSource.getFeatures()[0].getGeometry().getCoordinates();
+            $.when(_flyTo(xy), _zoomTo(10))
+                .done(function () {
+                    $('#zoom-btn').button("option", "disabled", false);
+                })
+                .fail(function () {
+                    alert("Error in MaxZoomService");
+                });
+        }
+
         function _setMetrics(length, area) {
-            _model.setMetrics('length', length);
-            _model.setMetrics('area', area);
+            _azimuths.setMetrics('length', length);
+            _azimuths.setMetrics('area', area);
             _trigger('map.metricschanged', {
                 length: length,
                 area: area
@@ -795,16 +801,16 @@ import Graticule from 'ol-ext/control/Graticule';
         }
 
         //from http://forum.webrankinfo.com/maps-api-suggestion-villes-t129145.html
-        function _getAddressComponent(result, address_type, name_type){
+        function _getAddressComponent(result, address_type, name_type) {
             var i, j, ret;
             address_type = (address_type === null) ? 'country' : address_type;
             name_type = (name_type === null) ? 'long_name' : name_type;
 
-            if(result){
-                for(i=0; i<result.address_components.length; i++){
-                    for(j=0; j<result.address_components[i].types.length; j++){
-                        if(result.address_components[i].types[j] == address_type){
-                            if(result.address_components[i][name_type]){
+            if (result) {
+                for (i = 0; i < result.address_components.length; i++) {
+                    for (j = 0; j < result.address_components[i].types.length; j++) {
+                        if (result.address_components[i].types[j] == address_type) {
+                            if (result.address_components[i][name_type]) {
                                 ret = result.address_components[i][name_type];
                                 break;
                             }
@@ -823,19 +829,19 @@ import Graticule from 'ol-ext/control/Graticule';
                 elevation = '',
                 direction = '',
                 timezone = '',
-                timeStamp = Math.round((new Date().getTime())/1000),
+                timeStamp = Math.round((new Date().getTime()) / 1000),
                 timezoneParameters = {
                     location: latlng.toUrlValue(),
                     timestamp: timeStamp,
                     sensor: 'false',
                     language: _options.context.languageCode
                 },
-                lat = Math.round(latlng.lat()*10000000)/10000000,
-                lng = Math.round(latlng.lng()*10000000)/10000000;
+                lat = Math.round(latlng.lat() * 10000000) / 10000000,
+                lng = Math.round(latlng.lng() * 10000000) / 10000000;
 
             elevationPromise = _getElevationPromise({
                 'locations': [latlng]
-            }).done(function(elevationResult) {
+            }).done(function (elevationResult) {
                 if (elevationResult) {
                     elevation = '<p style="float:right;"><img src="' + _options.system.dirWsImages + 'elevation_icon.png" alt="' + _t('elevation') + '" title="' + _t('elevation') + '" style="float:left;" width="38" height="30"> ' + elevationResult.elevation.toString().split('.')[0] + _t('unitMeter') + '<\/p>';
                 }
@@ -846,9 +852,9 @@ import Graticule from 'ol-ext/control/Graticule';
                 url: 'https://maps.googleapis.com/maps/api/timezone/json',
                 data: timezoneParameters,
                 crossDomain: true
-            }).done(function(TZdata) {
+            }).done(function (TZdata) {
                 if (TZdata.status == "OK") {
-                    var offset = (TZdata.dstOffset + TZdata.rawOffset)/3600;
+                    var offset = (TZdata.dstOffset + TZdata.rawOffset) / 3600;
                     timezone = '<p style="float:left;">' + TZdata.timeZoneName + ', GMT';
                     if (offset > 0) {
                         timezone = timezone + '+';
@@ -863,7 +869,7 @@ import Graticule from 'ol-ext/control/Graticule';
             geocoderPromise = _getGeocoderPromise({
                 latLng: latlng,
                 language: _options.context.languageCode
-            }).done(function(geocoderResult) {
+            }).done(function (geocoderResult) {
                 if (geocoderResult) {
                     var iso;
                     direction = '<p>';
@@ -878,12 +884,12 @@ import Graticule from 'ol-ext/control/Graticule';
             });
 
             _infowindow.close();
-            $.when(elevationPromise, timezonePromise, geocoderPromise).always(function() {
+            $.when(elevationPromise, timezonePromise, geocoderPromise).always(function () {
                 html = '<div class="iw-content"><h3>' + _t('dragMe') + '<\/h3>';
                 html = html + direction;
                 html = html + '<div class="divp">';
                 html = html + elevation;
-                html = html + '<p style="float:left;"><img src="' + _options.system.dirWsImages + 'gps_icon.png" alt="GPS (WGS84)" title="GPS (WGS84)" style="float:left;" width="38" height="30"><\/p><p style="float:left;">' + lat + _t('unitDegreeNorth') +'<br>' + lng + _t('unitDegreeEast') + '<\/p>';
+                html = html + '<p style="float:left;"><img src="' + _options.system.dirWsImages + 'gps_icon.png" alt="GPS (WGS84)" title="GPS (WGS84)" style="float:left;" width="38" height="30"><\/p><p style="float:left;">' + lat + _t('unitDegreeNorth') + '<br>' + lng + _t('unitDegreeEast') + '<\/p>';
                 html = html + timezone;
                 html = html + '<\/div>';
                 html = html + '<div><a href="#" id="directurl" style="text-decoration:none;" title="' + _t('directLink') + '"><img src="' + _options.system.dirWsImages + 'url.png" alt="' + _t('directLink') + '" style="border:0px none;vertical-align:middle;" width="16" height="16"> ' + _t('directLink') + '<\/a><\/div><\/div>';
@@ -892,32 +898,20 @@ import Graticule from 'ol-ext/control/Graticule';
             });
         }
 
-        function _doZoom() {
-            var latlng = _marker.getPosition();
-            $('#zoom-btn').button("option", "disabled", true);
-            _getMaxZoomPromise(latlng)
-                .done(function(response) {
-                    $('#zoom-btn').button("option", "disabled", false);
-                    _olMap.setCenter(latlng);
-                    _olMap.setZoom(response.zoom);
-                })
-                .fail(function() {
-                    alert("Error in MaxZoomService");
-                });
-        }
-
         _initMap();
         return {
             promise: _dfd.promise(),
             createControl: _createControl,
             setGraticule: _setGraticule,
             model: {
-                setAngleInRadians: _model.setAngleInRadians,
-                setAngleInDegrees: _model.setAngleInDegrees,
-                getMetrics: _model.getMetrics,
-                setBoolean: _model.setBoolean
+                setAngleInRadians: _azimuths.setAngleInRadians,
+                setAngleInDegrees: _azimuths.setAngleInDegrees,
+                getMetrics: _azimuths.getMetrics,
+                setBoolean: _azimuths.setBoolean
             },
-            getMap: function() {return _olMap;}
+            getMap: function () {
+                return _olMap;
+            }
         };
     };