From eedaecab2c503b87cb0322730836fafd2a18a7b3 Mon Sep 17 00:00:00 2001
From: bgreman <47828384+bgreman@users.noreply.github.com>
Date: Sat, 31 Jul 2021 15:43:48 -0400
Subject: [PATCH] Vendor ruler (#1476)

* Fixes ruler module integrity issues by bringing module into source

* Changing ruler stylesheet to vaguely match DCS theme in Liberation

* Changelog

(cherry picked from commit 119d4b9514fdd395adf2dc19b5919930a59b56ac)
---
 changelog.md                                  |   1 +
 resources/ui/map/canvas.html                  |   8 +-
 resources/ui/map/lib/leaflet-ruler/LICENSE.md |  22 +++
 .../map/lib/leaflet-ruler/leaflet-ruler.css   |  41 +++++
 .../ui/map/lib/leaflet-ruler/leaflet-ruler.js | 173 ++++++++++++++++++
 resources/ui/map/lib/leaflet-ruler/ruler.png  | Bin 0 -> 684 bytes
 6 files changed, 239 insertions(+), 6 deletions(-)
 create mode 100644 resources/ui/map/lib/leaflet-ruler/LICENSE.md
 create mode 100644 resources/ui/map/lib/leaflet-ruler/leaflet-ruler.css
 create mode 100644 resources/ui/map/lib/leaflet-ruler/leaflet-ruler.js
 create mode 100644 resources/ui/map/lib/leaflet-ruler/ruler.png

diff --git a/changelog.md b/changelog.md
index 8dcf1271..bdb930a0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -15,6 +15,7 @@ Saves from 4.0.0 are compatible with 4.1.0.
 * **[UI]** Control point name displayed with ground object group name on map.
 * **[UI]** Buy or Replace will now show the correct price for generated ground objects like sams.
 * **[UI]** Improved logging for frontline movement to be more descriptive about what happened and why.
+* **[UI]** Brought ruler map module into source, which should fix file integrity issues with the module.
 
 ## Fixes
 
diff --git a/resources/ui/map/canvas.html b/resources/ui/map/canvas.html
index ff99669a..0efc3ebf 100644
--- a/resources/ui/map/canvas.html
+++ b/resources/ui/map/canvas.html
@@ -25,12 +25,8 @@
         crossorigin="">
     </script>
     <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/gh/gokertanrisever/leaflet-ruler@master/src/leaflet-ruler.css"
-          integrity="sha384-P9DABSdtEY/XDbEInD3q+PlL+BjqPCXGcF8EkhtKSfSTr/dS5PBKa9+/PMkW2xsY"
-          crossorigin="anonymous">
-    <script src="https://cdn.jsdelivr.net/gh/gokertanrisever/leaflet-ruler@master/src/leaflet-ruler.js"
-            integrity="sha384-N2S8y7hRzXUPiepaSiUvBH1ZZ7Tc/ZfchhbPdvOE5v3aBBCIepq9l+dBJPFdo1ZJ"
-            crossorigin="anonymous"></script>
+          href="lib/leaflet-ruler/leaflet-ruler.css">
+    <script src="lib/leaflet-ruler/leaflet-ruler.js"></script>
     <script src="map.js" defer="defer"></script>
     <style>
         body { padding: 0; margin: 0; }
diff --git a/resources/ui/map/lib/leaflet-ruler/LICENSE.md b/resources/ui/map/lib/leaflet-ruler/LICENSE.md
new file mode 100644
index 00000000..79f8b9d7
--- /dev/null
+++ b/resources/ui/map/lib/leaflet-ruler/LICENSE.md
@@ -0,0 +1,22 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2017 Goker Tanrisever
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.css b/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.css
new file mode 100644
index 00000000..4ef5cafe
--- /dev/null
+++ b/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.css
@@ -0,0 +1,41 @@
+.leaflet-ruler{
+  height: 35px;
+  width: 35px;
+  background-image: url("ruler.png"); /* <div>Icons made by <a href="https://www.flaticon.com/authors/monkik" title="monkik">monkik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div> */
+  background-repeat: no-repeat;
+  background-position: center;
+}
+.leaflet-ruler:hover{
+  background-image: url("ruler.png"); /* <div>Icon made by <a href="https://www.flaticon.com/authors/monkik" title="monkik">monkik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div> */
+}
+.leaflet-ruler-clicked{
+  height: 35px;
+  width: 35px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-image: url("ruler.png");
+  border-color: #5C863F !important;
+}
+.leaflet-bar{
+  background-color: #ffffff;
+}
+.leaflet-control {
+  cursor: pointer;
+}
+.result-tooltip{
+  background-color: white;
+  border-width: medium;
+  border-color: #435466;
+  font-size: smaller;
+}
+.moving-tooltip{
+  background-color: rgba(255, 255, 255, .7);
+  background-clip: padding-box;
+  opacity: 0.5;
+  border: dotted;
+  border-color: #435466;
+  font-size: smaller;
+}
+.plus-length{
+  padding-left: 45px;
+}
\ No newline at end of file
diff --git a/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.js b/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.js
new file mode 100644
index 00000000..be69ebfa
--- /dev/null
+++ b/resources/ui/map/lib/leaflet-ruler/leaflet-ruler.js
@@ -0,0 +1,173 @@
+(function(factory, window){
+  "use strict";
+  if (typeof define === 'function' && define.amd) {
+    define(['leaflet'], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory(require('leaflet'));
+  }
+  if (typeof window !== 'undefined' && window.L) {
+    window.L.Ruler = factory(L);
+  }
+}(function (L) {
+  "use strict";
+  L.Control.Ruler = L.Control.extend({
+    options: {
+      position: 'topright',
+      circleMarker: {
+        color: 'red',
+        radius: 2
+      },
+      lineStyle: {
+        color: 'red',
+        dashArray: '1,6'
+      },
+      lengthUnit: {
+        display: 'km',
+        decimal: 2,
+        factor: null,
+        label: 'Distance:'
+      },
+      angleUnit: {
+        display: '&deg;',
+        decimal: 2,
+        factor: null,
+        label: 'Bearing:'
+      }
+    },
+    onAdd: function(map) {
+      this._map = map;
+      this._container = L.DomUtil.create('div', 'leaflet-bar');
+      this._container.classList.add('leaflet-ruler');
+      L.DomEvent.disableClickPropagation(this._container);
+      L.DomEvent.on(this._container, 'click', this._toggleMeasure, this);
+      this._choice = false;
+      this._defaultCursor = this._map._container.style.cursor;
+      this._allLayers = L.layerGroup();
+      return this._container;
+    },
+    onRemove: function() {
+      L.DomEvent.off(this._container, 'click', this._toggleMeasure, this);
+    },
+    _toggleMeasure: function() {
+      this._choice = !this._choice;
+      this._clickedLatLong = null;
+      this._clickedPoints = [];
+      this._totalLength = 0;
+      if (this._choice){
+        this._map.doubleClickZoom.disable();
+        L.DomEvent.on(this._map._container, 'keydown', this._escape, this);
+        L.DomEvent.on(this._map._container, 'dblclick', this._closePath, this);
+        this._container.classList.add("leaflet-ruler-clicked");
+        this._clickCount = 0;
+        this._tempLine = L.featureGroup().addTo(this._allLayers);
+        this._tempPoint = L.featureGroup().addTo(this._allLayers);
+        this._pointLayer = L.featureGroup().addTo(this._allLayers);
+        this._polylineLayer = L.featureGroup().addTo(this._allLayers);
+        this._allLayers.addTo(this._map);
+        this._map._container.style.cursor = 'crosshair';
+        this._map.on('click', this._clicked, this);
+        this._map.on('mousemove', this._moving, this);
+      }
+      else {
+        this._map.doubleClickZoom.enable();
+        L.DomEvent.off(this._map._container, 'keydown', this._escape, this);
+        L.DomEvent.off(this._map._container, 'dblclick', this._closePath, this);
+        this._container.classList.remove("leaflet-ruler-clicked");
+        this._map.removeLayer(this._allLayers);
+        this._allLayers = L.layerGroup();
+        this._map._container.style.cursor = this._defaultCursor;
+        this._map.off('click', this._clicked, this);
+        this._map.off('mousemove', this._moving, this);
+      }
+    },
+    _clicked: function(e) {
+      this._clickedLatLong = e.latlng;
+      this._clickedPoints.push(this._clickedLatLong);
+      L.circleMarker(this._clickedLatLong, this.options.circleMarker).addTo(this._pointLayer);
+      if(this._clickCount > 0 && !e.latlng.equals(this._clickedPoints[this._clickedPoints.length - 2])){
+        if (this._movingLatLong){
+          L.polyline([this._clickedPoints[this._clickCount-1], this._movingLatLong], this.options.lineStyle).addTo(this._polylineLayer);
+        }
+        var text;
+        this._totalLength += this._result.Distance;
+        if (this._clickCount > 1){
+          text = '<b>' + this.options.angleUnit.label + '</b>&nbsp;' + this._result.Bearing.toFixed(this.options.angleUnit.decimal) + '&nbsp;' + this.options.angleUnit.display + '<br><b>' + this.options.lengthUnit.label + '</b>&nbsp;' + this._totalLength.toFixed(this.options.lengthUnit.decimal) + '&nbsp;' +  this.options.lengthUnit.display;
+        }
+        else {
+          text = '<b>' + this.options.angleUnit.label + '</b>&nbsp;' + this._result.Bearing.toFixed(this.options.angleUnit.decimal) + '&nbsp;' + this.options.angleUnit.display + '<br><b>' + this.options.lengthUnit.label + '</b>&nbsp;' + this._result.Distance.toFixed(this.options.lengthUnit.decimal) + '&nbsp;' +  this.options.lengthUnit.display;
+        }
+        L.circleMarker(this._clickedLatLong, this.options.circleMarker).bindTooltip(text, {permanent: true, className: 'result-tooltip'}).addTo(this._pointLayer).openTooltip();
+      }
+      this._clickCount++;
+    },
+    _moving: function(e) {
+      if (this._clickedLatLong){
+        L.DomEvent.off(this._container, 'click', this._toggleMeasure, this);
+        this._movingLatLong = e.latlng;
+        if (this._tempLine){
+          this._map.removeLayer(this._tempLine);
+          this._map.removeLayer(this._tempPoint);
+        }
+        var text;
+        this._addedLength = 0;
+        this._tempLine = L.featureGroup();
+        this._tempPoint = L.featureGroup();
+        this._tempLine.addTo(this._map);
+        this._tempPoint.addTo(this._map);
+        this._calculateBearingAndDistance();
+        this._addedLength = this._result.Distance + this._totalLength;
+        L.polyline([this._clickedLatLong, this._movingLatLong], this.options.lineStyle).addTo(this._tempLine);
+        if (this._clickCount > 1){
+          text = '<b>' + this.options.angleUnit.label + '</b>&nbsp;' + this._result.Bearing.toFixed(this.options.angleUnit.decimal) + '&nbsp;' + this.options.angleUnit.display + '<br><b>' + this.options.lengthUnit.label + '</b>&nbsp;' + this._addedLength.toFixed(this.options.lengthUnit.decimal) + '&nbsp;' +  this.options.lengthUnit.display + '<br><div class="plus-length">(+' + this._result.Distance.toFixed(this.options.lengthUnit.decimal) + ')</div>';
+        }
+        else {
+          text = '<b>' + this.options.angleUnit.label + '</b>&nbsp;' + this._result.Bearing.toFixed(this.options.angleUnit.decimal) + '&nbsp;' + this.options.angleUnit.display + '<br><b>' + this.options.lengthUnit.label + '</b>&nbsp;' + this._result.Distance.toFixed(this.options.lengthUnit.decimal) + '&nbsp;' +  this.options.lengthUnit.display;
+        }
+        L.circleMarker(this._movingLatLong, this.options.circleMarker).bindTooltip(text, {sticky: true, offset: L.point(0, -40) ,className: 'moving-tooltip'}).addTo(this._tempPoint).openTooltip();
+      }
+    },
+    _escape: function(e) {
+      if (e.keyCode === 27){
+        if (this._clickCount > 0){
+          this._closePath();
+        }
+        else {
+          this._choice = true;
+          this._toggleMeasure();
+        }
+      }
+    },
+    _calculateBearingAndDistance: function() {
+      var f1 = this._clickedLatLong.lat, l1 = this._clickedLatLong.lng, f2 = this._movingLatLong.lat, l2 = this._movingLatLong.lng;
+      var toRadian = Math.PI / 180;
+      // haversine formula
+      // bearing
+      var y = Math.sin((l2-l1)*toRadian) * Math.cos(f2*toRadian);
+      var x = Math.cos(f1*toRadian)*Math.sin(f2*toRadian) - Math.sin(f1*toRadian)*Math.cos(f2*toRadian)*Math.cos((l2-l1)*toRadian);
+      var brng = Math.atan2(y, x)*((this.options.angleUnit.factor ? this.options.angleUnit.factor/2 : 180)/Math.PI);
+      brng += brng < 0 ? (this.options.angleUnit.factor ? this.options.angleUnit.factor : 360) : 0;
+      // distance
+      var R = this.options.lengthUnit.factor ? 6371 * this.options.lengthUnit.factor : 6371; // kilometres
+      var deltaF = (f2 - f1)*toRadian;
+      var deltaL = (l2 - l1)*toRadian;
+      var a = Math.sin(deltaF/2) * Math.sin(deltaF/2) + Math.cos(f1*toRadian) * Math.cos(f2*toRadian) * Math.sin(deltaL/2) * Math.sin(deltaL/2);
+      var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+      var distance = R * c;
+      this._result = {
+        Bearing: brng,
+        Distance: distance
+      };
+    },
+    _closePath: function() {
+      this._map.removeLayer(this._tempLine);
+      this._map.removeLayer(this._tempPoint);
+      if (this._clickCount <= 1) this._map.removeLayer(this._pointLayer);
+      this._choice = false;
+      L.DomEvent.on(this._container, 'click', this._toggleMeasure, this);
+      this._toggleMeasure();
+    }
+  });
+  L.control.ruler = function(options) {
+    return new L.Control.Ruler(options);
+  };
+}, window));
diff --git a/resources/ui/map/lib/leaflet-ruler/ruler.png b/resources/ui/map/lib/leaflet-ruler/ruler.png
new file mode 100644
index 0000000000000000000000000000000000000000..0882776a6686bb280044bc4bf3f8478cc368ba5b
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn
z4jTXf02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00In2L_t(oN4=Q6
zvcW(YhI3aKdJ0!yxCqp!jf>zi{1ghETBT*i&y0djV|hROB9YyMWb@4I?BDTvPL40J
z$5R=xSS*z1dFpgJ>6LFXk(o}XB2uf>q~Gm!ddH7*8H%6>-ELRr`~6<#pE#8XiVz9~
zuaGktlL!eDaw0>K<#MT4p5*g+X{6Wd`GiuJp$J;JT-K{f6$%AaEEZL%R8qNIPOrYN
z5UMOy8H$WXBbj4-xm;vyk^!u;)MO~qXf&ih91eQtP4LeI_&T`{>9s^KkiT)K(~)@;
zd>wj_ScZX<$wc~UwJPi9^I3WmK@pHhW;UBiAlmhMRkzzsZMR#!YbHzt{4K-4^?I!a
zgMo}!tCik0V-f*>$uJO&<=bwz)qFmeu?d?9_*sU5!{Jco7_)qBM2Uc(WEf~G-!S5c
zfY>q&Wcl*W8AV(X5KD%EX_T*xNSU<D*M?PwfoYbn4WkSL(JGaSthHLL#N}%vREB|J
zPhT5JM8KB}1MBs=^vB~-@7PHy0(>$IO#1Zwm)AQna6BGM@2Y%lhztYKSiYOhMt;CX
znj*mCNe^G1`~AL*U6!wnN8a<KN1Dy1)AF_9$+z-HFrGDWa3uodGlO#r-T>zq8!kn_
ztC}cex<al+fbS+^63RjZ_+$Y7JMbx#l?eEf0lY#y>181TLS+D}4ELdIQ0fln16m6s
SR4>;60000<MNUMnLSTaRcqSD9

literal 0
HcmV?d00001