From b285a2fbb1a0d2834fb8b994717bb691b823d8d7 Mon Sep 17 00:00:00 2001
From: cronzon <cronzon@switchfly.com>
Date: Sat, 22 Sep 2018 22:03:47 +0000
Subject: [PATCH] Fixes _setLinestringMetrics. WIP: getArea won't work until it
 gets a polygon

---
 TWCC.iws                | 181 +++++++++++++++++++---------------------
 webapp/js/map.bundle.js | 122 ++++++++++++++-------------
 webapp/js/map.js        |  14 ++--
 3 files changed, 157 insertions(+), 160 deletions(-)

diff --git a/TWCC.iws b/TWCC.iws
index a57856a..6435439 100644
--- a/TWCC.iws
+++ b/TWCC.iws
@@ -2,9 +2,18 @@
 <project version="4">
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/webapp/css/all.css" line="307" mnemonic="2" />
-    <bookmark url="file://$PROJECT_DIR$/webapp/js/map.js" line="789" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/webapp/js/map.js" line="794" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
+    <list default="true" id="a8befd6b-6de1-4188-ba65-de5b0e2c0c72" name="Default" comment="">
+      <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" />
+      <change beforePath="$PROJECT_DIR$/webapp/node_modules/ol/sphere.js" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/node_modules/ol/sphere.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>
     <list id="d00e39c3-1d56-42bf-91fe-fa09a32eec89" name="dont push" comment="dont push">
       <change afterPath="$PROJECT_DIR$/.gitmodules" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/webapp/.prod.htaccess" afterDir="false" />
@@ -16,15 +25,6 @@
       <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 default="true" id="a8befd6b-6de1-4188-ba65-de5b0e2c0c72" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/TWCC.iws" beforeDir="false" afterPath="$PROJECT_DIR$/TWCC.iws" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/webapp/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/webapp/js/main.js" 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/" />
@@ -60,11 +60,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="map.js" pinned="false" current-in-tab="true">
+          <file leaf-file-name="map.js" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/webapp/js/map.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="446">
-                  <caret line="315" column="49" selection-start-line="315" selection-start-column="49" selection-end-line="315" selection-end-column="49" />
+                <state relative-caret-position="169">
+                  <caret line="283" column="38" selection-start-line="283" selection-start-column="17" selection-end-line="283" selection-end-column="38" />
                   <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" />
@@ -73,7 +73,6 @@
                     <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#17692#19850#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,11 +95,23 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="sphere.js" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/webapp/node_modules/ol/sphere.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="299">
+                  <caret line="193" column="38" selection-start-line="193" selection-start-column="38" selection-end-line="193" selection-end-column="38" />
+                  <folding>
+                    <element signature="n#!!doc" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
           <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="198">
-                  <caret line="240" column="39" selection-start-line="240" selection-start-column="39" selection-end-line="240" selection-end-column="52" />
+                <state relative-caret-position="3465">
+                  <caret line="231" column="39" selection-start-line="231" selection-start-column="39" selection-end-line="231" selection-end-column="39" />
                 </state>
               </provider>
             </entry>
@@ -112,10 +123,9 @@
           <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="165">
-                  <caret line="29" column="38" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
+                <state relative-caret-position="360">
+                  <caret line="42" column="17" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
                   <folding>
-                    <element signature="e#2370#3713#0" />
                     <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" />
@@ -123,7 +133,6 @@
                     <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#17582#20658#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" />
@@ -152,11 +161,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_createMarker</find>
-      <find>_setMarker</find>
-      <find>resetMarker</find>
-      <find>.clear</find>
-      <find>_clearVectorLayer</find>
       <find>_clearAzimuthsSource</find>
       <find>_clearMarkerSource</find>
       <find>_olMarkerVectorSource =</find>
@@ -169,7 +173,6 @@
       <find>_olLinestringModify =</find>
       <find>new Text</find>
       <find>placement</find>
-      <find>_olLinestringModify =</find>
       <find>stroke: new Stroke(</find>
       <find>console.log</find>
       <find>_olLinestringVectorSource</find>
@@ -179,9 +182,15 @@
       <find>_startPolylineEdit</find>
       <find>_olLinestringModify</find>
       <find>_olLinestringVectorSource.</find>
-      <find>map.rightclick</find>
       <find>_olMap =</find>
+      <find>map.rightclick</find>
+      <find>getCoordinates</find>
+      <find>metrics</find>
+      <find>_setPolylineMetrics</find>
       <find>polyline.editend</find>
+      <find>_setLinestringMetrics</find>
+      <find>_olLinestringVectorSource.getFeatures()[0]</find>
+      <find>_getArea</find>
     </findStrings>
     <replaceStrings>
       <replace>$json</replace>
@@ -202,7 +211,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/webapp/Poop-Inc./BasePresenter.php" />
         <option value="$PROJECT_DIR$/webapp/admin/.htpasswd" />
         <option value="$PROJECT_DIR$/webapp/admin/nada.htaccess" />
         <option value="$PROJECT_DIR$/webapp/redirect.php" />
@@ -253,6 +261,7 @@
         <option value="$PROJECT_DIR$/webapp/js/converter.class.js" />
         <option value="$PROJECT_DIR$/webapp/js/main.js" />
         <option value="$PROJECT_DIR$/webapp/js/map.js" />
+        <option value="$PROJECT_DIR$/webapp/node_modules/ol/sphere.js" />
       </list>
     </option>
   </component>
@@ -288,6 +297,7 @@
     </navigator>
     <panes>
       <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -295,11 +305,6 @@
               <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>
             <path>
               <item name="TWCC" type="b2602c69:ProjectViewProjectNode" />
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
@@ -311,19 +316,11 @@
               <item name="node_modules" type="462c0819:PsiDirectoryNode" />
               <item name="ol" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="TWCC" type="b2602c69:ProjectViewProjectNode" />
-              <item name="webapp" type="462c0819:PsiDirectoryNode" />
-              <item name="node_modules" type="462c0819:PsiDirectoryNode" />
-              <item name="ol" type="462c0819:PsiDirectoryNode" />
-              <item name="style" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -708,28 +705,8 @@
       <workItem from="1537125184678" duration="16863000" />
       <workItem from="1537376181700" duration="19139000" />
       <workItem from="1537405060616" duration="5706000" />
-      <workItem from="1537551044418" duration="8001000" />
-    </task>
-    <task id="LOCAL-00095" summary="Fix issue #51.&#10;Adds a rewrite rule for include folder.">
-      <created>1424467205220</created>
-      <option name="number" value="00095" />
-      <option name="presentableId" value="LOCAL-00095" />
-      <option name="project" value="LOCAL" />
-      <updated>1424467205220</updated>
-    </task>
-    <task id="LOCAL-00096" summary="Fix issue #52.&#10;Test for existence of adsense before implementation.">
-      <created>1424812077866</created>
-      <option name="number" value="00096" />
-      <option name="presentableId" value="LOCAL-00096" />
-      <option name="project" value="LOCAL" />
-      <updated>1424812077866</updated>
-    </task>
-    <task id="LOCAL-00097" summary="Fix issue #53.&#10;Changes the CRS's definition string instead of the object parameters when manipulating UTM CRSs.">
-      <created>1425072540971</created>
-      <option name="number" value="00097" />
-      <option name="presentableId" value="LOCAL-00097" />
-      <option name="project" value="LOCAL" />
-      <updated>1425072540972</updated>
+      <workItem from="1537551044418" duration="11468000" />
+      <workItem from="1537653061390" duration="535000" />
     </task>
     <task id="LOCAL-00098" summary="Updates donation status">
       <created>1425689128425</created>
@@ -1053,11 +1030,32 @@
       <option name="project" value="LOCAL" />
       <updated>1537598953750</updated>
     </task>
-    <option name="localTasksCounter" value="144" />
+    <task id="LOCAL-00144" summary="Adds right click on CSV. TODO: metrics (use haversineDistance)">
+      <created>1537599026790</created>
+      <option name="number" value="00144" />
+      <option name="presentableId" value="LOCAL-00144" />
+      <option name="project" value="LOCAL" />
+      <updated>1537599026790</updated>
+    </task>
+    <task id="LOCAL-00145" summary="Adds delete vertice by right click on CSV. TODO: metrics (use haversineDistance)">
+      <created>1537652125058</created>
+      <option name="number" value="00145" />
+      <option name="presentableId" value="LOCAL-00145" />
+      <option name="project" value="LOCAL" />
+      <updated>1537652125060</updated>
+    </task>
+    <task id="LOCAL-00146" summary="Cleans up">
+      <created>1537652514587</created>
+      <option name="number" value="00146" />
+      <option name="presentableId" value="LOCAL-00146" />
+      <option name="project" value="LOCAL" />
+      <updated>1537652514587</updated>
+    </task>
+    <option name="localTasksCounter" value="147" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="409145000" />
+    <option name="totallyTimeSpent" value="413147000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1079,24 +1077,24 @@
       <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.5007153" side_tool="true" weight="0.30060607" />
       <window_info anchor="right" id="Maven Projects" order="6" />
       <window_info anchor="bottom" id="Database Changes" order="7" sideWeight="0.49928468" weight="0.32969698" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32935324" />
       <window_info active="true" anchor="bottom" id="Version Control" order="9" visible="true" weight="0.3090909" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32935324" />
       <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" weight="0.17199148" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4661191" weight="0.17167382" />
       <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" />
       <window_info id="Structure" order="1" sideWeight="0.6332623" side_tool="true" weight="0.24920128" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" id="Theme Preview" order="4" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="4" sideWeight="0.5318275" side_tool="true" weight="0.27539343" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="JRebel Executor" order="12" />
       <window_info anchor="bottom" id="Messages" order="13" weight="0.32772276" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.48969698" />
       <window_info anchor="bottom" id="Grunt" order="10" weight="0.32848233" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Changes" order="7" visible="true" weight="0.3118503" />
@@ -1126,11 +1124,11 @@
       <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" sideWeight="0.49928468" weight="0.32969698" />
-      <window_info anchor="bottom" id="Version Control" order="10" weight="0.25373134" />
+      <window_info anchor="bottom" id="Version Control" order="10" visible="true" weight="0.3090909" />
       <window_info anchor="bottom" id="JRebel Executor" order="13" />
       <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.17199148" />
+      <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.4661191" visible="true" weight="0.17167382" />
       <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" />
@@ -1187,8 +1185,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="Prevents adds hidden overflow" />
-    <MESSAGE value="Prevents the help to open outside of the map's boundaries" />
     <MESSAGE value="Uses 3 decimals instead of 2 when showing a length number" />
     <MESSAGE value="Adds new CRS" />
     <MESSAGE value="Migrates to SSL" />
@@ -1212,7 +1208,9 @@
     <MESSAGE value="Cleans up a bit" />
     <MESSAGE value="Adds CSV/linestring. TODO: metrics (use haversineDistance)" />
     <MESSAGE value="Adds right click on CSV. TODO: metrics (use haversineDistance)" />
-    <option name="LAST_COMMIT_MESSAGE" value="Adds right click on CSV. TODO: metrics (use haversineDistance)" />
+    <MESSAGE value="Adds delete vertice by right click on CSV. TODO: metrics (use haversineDistance)" />
+    <MESSAGE value="Cleans up" />
+    <option name="LAST_COMMIT_MESSAGE" value="Cleans up" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1220,13 +1218,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/webapp/gaproxy/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="20" column="45" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/webapp/gaproxy/libs/GAProxy.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="227">
@@ -1415,9 +1406,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="452" column="35" selection-start-line="452" selection-start-column="35" selection-end-line="452" selection-end-column="35" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1499,9 +1487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-108">
           <caret line="215" selection-start-line="215" selection-end-line="215" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1509,9 +1494,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
           <caret line="41" column="38" lean-forward="true" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1538,15 +1520,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/webapp/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="240" column="39" selection-start-line="240" selection-start-column="39" selection-end-line="240" selection-end-column="52" />
+        <state relative-caret-position="3465">
+          <caret line="231" column="39" selection-start-line="231" selection-start-column="39" selection-end-line="231" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/webapp/js/map.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="315" column="49" selection-start-line="315" selection-start-column="49" selection-end-line="315" selection-end-column="49" />
+        <state relative-caret-position="169">
+          <caret line="283" column="38" selection-start-line="283" selection-start-column="17" selection-end-line="283" selection-end-column="38" />
           <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" />
@@ -1555,7 +1537,6 @@
             <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#17692#19850#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" />
@@ -1577,5 +1558,15 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/webapp/node_modules/ol/sphere.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="193" column="38" selection-start-line="193" selection-start-column="38" selection-end-line="193" selection-end-column="38" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/webapp/js/map.bundle.js b/webapp/js/map.bundle.js
index d08721e..a24c6b0 100644
--- a/webapp/js/map.bundle.js
+++ b/webapp/js/map.bundle.js
@@ -27,6 +27,8 @@ var _olGeocoder2 = _interopRequireDefault(require("ol-geocoder"));
 
 var _Group = _interopRequireDefault(require("ol/layer/Group"));
 
+var _sphere = require("ol/sphere");
+
 var _olLayerswitcher = _interopRequireDefault(require("ol-layerswitcher"));
 
 var _Graticule = _interopRequireDefault(require("ol-ext/control/Graticule"));
@@ -72,7 +74,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   var instance;
 
   var init = function init(opts) {
-    var _azimuths,
+    var _measurements,
         _olMap,
         _geocoderService,
         _elevationService,
@@ -129,32 +131,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     };
 
     $.extend(true, _options, opts);
-    _azimuths = {
+    _measurements = {
       anglesInRadians: {},
       booleans: {
         autoZoom: true
       },
       metrics: {},
       setAngleInRadians: function setAngleInRadians(key, angleInRadians) {
-        _azimuths.anglesInRadians[key] = angleInRadians;
+        _measurements.anglesInRadians[key] = angleInRadians;
       },
       setAngleInDegrees: function setAngleInDegrees(key, angleInDegrees) {
-        _azimuths.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
+        _measurements.setAngleInRadians(key, _options.utils.degToRad(angleInDegrees));
       },
       getAngleInRadians: function getAngleInRadians(key) {
-        return _azimuths.anglesInRadians[key];
+        return _measurements.anglesInRadians[key];
       },
       setBoolean: function setBoolean(key, bool) {
-        _azimuths.booleans[key] = !!bool;
+        _measurements.booleans[key] = !!bool;
       },
       getBoolean: function getBoolean(key) {
-        return _azimuths.booleans[key];
+        return _measurements.booleans[key];
       },
       setMetrics: function setMetrics(key, value) {
-        _azimuths.metrics[key] = value;
+        _measurements.metrics[key] = value;
       },
       getMetrics: function getMetrics(key) {
-        return _azimuths.metrics[key];
+        return _measurements.metrics[key];
       }
     };
 
@@ -308,41 +310,37 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       return _getGooglePromise(_elevationService.getElevationForLocations, obj, google.maps.ElevationStatus.OK);
     }
 
-    function _addListeners() {
-      var $body = $('body');
+    function _setLinestringMetrics() {
+      var feature = _olLinestringVectorSource.getFeatures()[0].getGeometry();
 
-      _olMap.getViewport().addEventListener('contextmenu', function (evt) {
-        var feature = _olMap.forEachFeatureAtPixel(_olMap.getEventPixel(evt), function (feature) {
-          return feature;
-        });
+      _setMetrics((0, _sphere.getLength)(feature), (0, _sphere.getArea)(feature)); //TODO clement convert the geometry to a polygon for the area to work
 
-        if (feature) {
-          _trigger('map.rightclick.remove', _toLonLat(feature.getGeometry().getCoordinates()));
-        } else {
-          _trigger('map.rightclick.add', _toLonLat(_olMap.getEventCoordinate(evt)));
-        }
+    }
 
-        evt.stopPropagation();
-        evt.preventDefault();
-      });
+    function _addListeners() {
+      var $body = $('body');
       /*google.maps.event.addListener(_infowindow, 'domready', function() {
           $('#zoom-btn').button({ icons: {primary: 'ui-icon-zoomin'}, text: false });
           _trigger('infowindow.dom_ready');
       });*/
 
+      _olDefaultSource.on('tileloadend', _dfd.resolve);
+
+      _olDefaultSource.on('tileloaderror', _dfd.reject);
 
       $body.on('click', '#zoom-btn', function () {
         _flyAndZoom();
       });
 
+      _olMap.on('click', function (evt) {
+        //_infowindow.close();//TODO clement
+        _trigger('map.click', _toLonLat(evt.coordinate));
+      });
+
       _olGeocoder.on('addresschosen', function (evt) {
         _trigger('place.changed', _toLonLat(evt.coordinate));
       });
 
-      _olDefaultSource.on('tileloadend', _dfd.resolve);
-
-      _olDefaultSource.on('tileloaderror', _dfd.reject);
-
       _olMarkerModify.on('modifystart', function () {
         _clearAzimuthsSource();
 
@@ -358,12 +356,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       _olLinestringModify.on('modifyend', function (evt) {
         var feature = evt.features.getArray()[0];
 
-        _trigger('polyline.editend', feature.getGeometry().getCoordinates().map(_toLonLat));
+        _trigger('linestring.editend', feature.getGeometry().getCoordinates().map(_toLonLat));
+
+        _setLinestringMetrics();
       });
 
-      _olMap.on('click', function (evt) {
-        //_infowindow.close();//TODO clement
-        _trigger('map.click', _toLonLat(evt.coordinate));
+      _olMap.getViewport().addEventListener('contextmenu', function (evt) {
+        var feature = _olMap.forEachFeatureAtPixel(_olMap.getEventPixel(evt), function (feature) {
+          return feature;
+        });
+
+        if (feature) {
+          _trigger('linestring.removevertice', _toLonLat(feature.getGeometry().getCoordinates()));
+        } else {
+          _trigger('linestring.addvertice', _toLonLat(_olMap.getEventCoordinate(evt)));
+        }
+
+        _setLinestringMetrics();
+
+        evt.stopPropagation();
+        evt.preventDefault();
       });
 
       $body.on('converter.source.selection_changed converterset.done', function (event, response) {
@@ -390,11 +402,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
         response.wgs84 = _removeErrors(response.wgs84);
 
-        _azimuths.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
+        _measurements.setAngleInDegrees('magneticDeclination', response.magneticDeclinationInDegrees);
 
-        _azimuths.setAngleInRadians('srcConvergence', convergence.source);
+        _measurements.setAngleInRadians('srcConvergence', convergence.source);
 
-        _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
+        _measurements.setAngleInRadians('dstConvergence', convergence.destination);
 
         _setGeometricPointer(response.wgs84);
 
@@ -404,9 +416,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         if (_olAzimuthsVectorSource.getFeatures().length) {
           var convergence = _options.utils.degToRad(response.convergenceInDegrees);
 
-          _azimuths.setAngleInRadians('srcConvergence', convergence.source);
+          _measurements.setAngleInRadians('srcConvergence', convergence.source);
 
-          _azimuths.setAngleInRadians('dstConvergence', convergence.destination);
+          _measurements.setAngleInRadians('dstConvergence', convergence.destination);
 
           _updateAzimuths();
         }
@@ -661,16 +673,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: _azimuths.getAngleInRadians('magneticDeclination')
+          rotation: _measurements.getAngleInRadians('magneticDeclination')
         },
         srcConvergence: {
           src: gnArrowSrc,
           color: '#f00',
-          rotation: _azimuths.getAngleInRadians('srcConvergence')
+          rotation: _measurements.getAngleInRadians('srcConvergence')
         },
         dstConvergence: {
           src: gnArrowSrc,
-          rotation: _azimuths.getAngleInRadians('dstConvergence')
+          rotation: _measurements.getAngleInRadians('dstConvergence')
         }
       };
 
@@ -699,7 +711,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 = _azimuths.getAngleInRadians(name) || 0;
+        var rotation = _measurements.getAngleInRadians(name) || 0;
         var opacity = name !== 'true' && !rotation ? 0 : _options.mapOptions.azimuthOpacity;
         var image = feature.get('style').getImage();
         image.setRotation(rotation);
@@ -765,10 +777,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     }
 
     function _createLinestring(xyArray) {
-      /*$(_options.mapContainerElt).on('polylineedit', function () {
-          _setPolylineMetrics();
-      });*/
-      //TODO clement
       _olLinestringVectorSource.addFeature(new _ol.Feature({
         geometry: new _geom.LineString(xyArray)
       }));
@@ -787,7 +795,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     }
 
     function _setAutoZoom() {
-      if (_azimuths.getBoolean('autoZoom') === true) {
+      if (_measurements.getBoolean('autoZoom') === true) {
         var bounds = _polyline.getBounds();
 
         if (bounds) {
@@ -836,9 +844,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     }
 
     function _setMetrics(length, area) {
-      _azimuths.setMetrics('length', length);
+      _measurements.setMetrics('length', length);
 
-      _azimuths.setMetrics('area', area);
+      _measurements.setMetrics('area', area);
 
       _trigger('map.metricschanged', {
         length: length,
@@ -846,12 +854,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       });
     }
 
-    function _setPolylineMetrics() {
-      var path = _polyline.getPath();
-
-      _setMetrics(google.maps.geometry.spherical.computeLength(path), google.maps.geometry.spherical.computeArea(path));
-    }
-
     function _setLineStringSource(WGS84Array) {
       if (!_olLinestringVectorSource) {
         return;
@@ -866,9 +868,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
         _olMap.addInteraction(_olLinestringModify);
       }
+
+      _setLinestringMetrics();
       /*
       _setAutoZoom();
-      _setPolylineMetrics();*/
+      */
 
     }
 
@@ -1035,10 +1039,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       createControl: _createControl,
       setGraticule: _setGraticule,
       model: {
-        setAngleInRadians: _azimuths.setAngleInRadians,
-        setAngleInDegrees: _azimuths.setAngleInDegrees,
-        getMetrics: _azimuths.getMetrics,
-        setBoolean: _azimuths.setBoolean
+        setAngleInRadians: _measurements.setAngleInRadians,
+        setAngleInDegrees: _measurements.setAngleInDegrees,
+        getMetrics: _measurements.getMetrics,
+        setBoolean: _measurements.setBoolean
       },
       getMap: function getMap() {
         return _olMap;
@@ -1055,7 +1059,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   };
 })(jQuery);
 
-},{"ol":110,"ol-ext/control/Graticule":2,"ol-geocoder":3,"ol-layerswitcher":4,"ol/control.js":50,"ol/coordinate.js":61,"ol/geom":77,"ol/interaction.js":111,"ol/layer.js":133,"ol/layer/Group":135,"ol/proj.js":158,"ol/proj/proj4.js":163,"ol/source":227,"ol/source/Vector":251,"ol/style.js":265}],2:[function(require,module,exports){
+},{"ol":110,"ol-ext/control/Graticule":2,"ol-geocoder":3,"ol-layerswitcher":4,"ol/control.js":50,"ol/coordinate.js":61,"ol/geom":77,"ol/interaction.js":111,"ol/layer.js":133,"ol/layer/Group":135,"ol/proj.js":158,"ol/proj/proj4.js":163,"ol/source":227,"ol/source/Vector":251,"ol/sphere":259,"ol/style.js":265}],2:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
diff --git a/webapp/js/map.js b/webapp/js/map.js
index 55d0836..65add23 100644
--- a/webapp/js/map.js
+++ b/webapp/js/map.js
@@ -40,6 +40,7 @@ import {fromLonLat, toLonLat} from 'ol/proj.js';
 import {degreesToStringHDMS} from 'ol/coordinate.js'
 import Geocoder from 'ol-geocoder';
 import LayerGroup from 'ol/layer/Group';
+import {getLength, getArea} from 'ol/sphere';
 import LayerSwitcher from 'ol-layerswitcher';
 import Graticule from 'ol-ext/control/Graticule';
 
@@ -280,6 +281,11 @@ import Graticule from 'ol-ext/control/Graticule';
             return _getGooglePromise(_elevationService.getElevationForLocations, obj, google.maps.ElevationStatus.OK);
         }
 
+        function _setLinestringMetrics() {
+            var feature = _olLinestringVectorSource.getFeatures()[0].getGeometry();
+            _setMetrics(getLength(feature), getArea(feature)); //TODO clement convert the geometry to a polygon for the area to work
+        }
+
         function _addListeners() {
             var $body = $('body');
             /*google.maps.event.addListener(_infowindow, 'domready', function() {
@@ -786,11 +792,6 @@ import Graticule from 'ol-ext/control/Graticule';
             });
         }
 
-        function _setLinestringMetrics() {
-            var path = _polyline.getPath();
-            _setMetrics(google.maps.geometry.spherical.computeLength(path), google.maps.geometry.spherical.computeArea(path));
-        }
-
         function _setLineStringSource(WGS84Array) {
             if (!_olLinestringVectorSource) {
                 return;
@@ -802,9 +803,10 @@ import Graticule from 'ol-ext/control/Graticule';
                 _createLinestring(xyArray);
                 _olMap.addInteraction(_olLinestringModify);
             }
+            _setLinestringMetrics();
             /*
             _setAutoZoom();
-            _setLinestringMetrics();*/
+            */
         }
 
         function _setMarkerSource(wgs84) {