rev leaflet

UMN-LATIS · Oct 16, 2024 · 76d2a39 · 76d2a39
1 parent 0b869f4
commit 76d2a39
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 63 deletions.
diff --git a/assets/leaflet-treering/Leaflet.AreaCapture.js b/assets/leaflet-treering/Leaflet.AreaCapture.js
@@ -690,10 +690,10 @@ function NewEllipse(Inte) {
     L.DomEvent.on(window, 'keydown', (e) => {
         if (e.keyCode == 69 && e.getModifierState("Shift") && !e.getModifierState("Control") && 
         window.name.includes('popout') && !Inte.treering.annotationAsset.dialogAnnotationWindow) { // Dialog windows w/ text cannot be active
-        e.preventDefault();
-        e.stopPropagation();
-        Inte.treering.disableTools();
-        this.enable();
+            e.preventDefault();
+            e.stopPropagation();
+            Inte.treering.disableTools();
+            this.enable();
         }
     }, this);
 
@@ -812,8 +812,8 @@ function NewEllipse(Inte) {
  * @param {object} Inte - AreaCaptureInterface object. Allows access to all other tools.
  */
 function NewEllipseDialog(Inte) {
-    let minWidth = 130;
-    let minHeight = 130;
+    let minWidth = 180;
+    let minHeight = 170;
     this.size = [minWidth, minHeight];
     this.anchor = [50, 0];
 
@@ -880,25 +880,14 @@ function NewEllipseDialog(Inte) {
      * @function
      */
     NewEllipseDialog.prototype.createDialogEventListeners = function () {
-        // Year editing buttons: 
-        $("#AreaCapture-editYear-btn").on("click", () => {
-            let html = document.getElementById("AreaCapture-newYearDialog-template").innerHTML;
-            let template = Handlebars.compile(html);
-            let content = template({
-                "year": Inte.ellipseData.year,
-            });
-            this.dialog.setContent(content);
-            document.getElementById("AreaCapture-newYear-input").select();
-
-            $("#AreaCapture-confirmYear-btn").on("click", () => {
-                let year = $("#AreaCapture-newYear-input").val();
-                if (year || year == 0) {
-                    Inte.ellipseVisualAssets.cycleColorsMulti(year);
-                    Inte.ellipseData.year = year;
-                }
-                this.update();
-            })
-        });
+        $("#AreaCapture-confirmYear-btn").on("click", () => {
+            let year = $("#AreaCapture-newYear-input").val();
+            if (year || year == 0) {
+                Inte.ellipseVisualAssets.cycleColorsMulti(year);
+                Inte.ellipseData.year = year;
+            }
+            this.update();
+        })
 
         $("#AreaCapture-subtractYear-btn").on("click", () => {
             Inte.ellipseData.decreaseYear();

diff --git a/assets/leaflet-treering/Leaflet.PithEstimate.js b/assets/leaflet-treering/Leaflet.PithEstimate.js
@@ -4,8 +4,6 @@
  * @version 1.0.0
  */
 
-const { point } = require("leaflet");
-
 /**
  * Interface for pith estimate tools. 
  * @constructor

diff --git a/assets/leaflet-treering/Template.AreaCapture.html b/assets/leaflet-treering/Template.AreaCapture.html
@@ -1,13 +1,20 @@
 <script id="AreaCapture-incrementDialog-template" type="text/x-handlebars-template">
     <div class="AreaCapture-dialog-container">  
-        <div class="AreaCapture-editYear-container">
-            <p class="AreaCapture-text"> 
-                Year: {{ year }}
-
-                <i id="AreaCapture-editYear-btn" 
-                class="fa fa-pencil-square"
-                style="float: right;"
-                aria-hidden="true"></i> 
+        <h4 class="AreaCapture-lassoInstruction-header">Create ellipses:</h4>
+        <div class="AreaCapture-dialog-container">
+            <p class="AreaCapture-text" style="display: inline;"> 
+                Year: 
+                <input id="AreaCapture-newYear-input"
+                class="AreaCapture-input"
+                type="number"
+                placeholder="{{ year }}">
+
+                <div style="display: inline;">
+                    <i id="AreaCapture-confirmYear-btn"
+                    class="fa fa-check-square" 
+                    style="font-size: 16px;"
+                    aria-hidden="true"></i>
+                </div>
             </p>
         </div>
         <div class="AreaCapture-btn-row">
@@ -36,30 +43,6 @@
     </div>
 </script>
 
-<script id="AreaCapture-newYearDialog-template" type="text/x-handlebars-template">
-    <div class="AreaCapture-dialog-container">
-        <p class="AreaCapture-text"> 
-            Year: 
-            <input id="AreaCapture-newYear-input"
-            class="AreaCapture-input"
-            type="number"
-            placeholder="{{ year }}">
-
-            <div style="margin-top: 4px;">
-                <i id="AreaCapture-confirmYear-btn"
-                class="fa fa-check-square" 
-                style="font-size: 16px;"
-                aria-hidden="true"></i>
-
-                <p class="AreaCapture-subtext"
-                style="display: inline;">
-                    Shift - 2
-                </p>
-            </div>
-        </p>
-    </div>
-</script>
-
 <script id="AreaCapture-deleteSelectedEllipsesDialog-template" type="text/x-handlebars-template">
     <div class="AreaCapture-dialog-container">
         <div class="AreaCapture-deleteWarning-container">

diff --git a/assets/leaflet-treering/leaflet-treering.js b/assets/leaflet-treering/leaflet-treering.js
@@ -106,10 +106,6 @@ function LTreering (viewer, basePath, options, base_layer, gl_layer, fullJSON) {
   this.tools.push(...this.datingInterface.tools);
 
   // --- //
-  // Code hosted in Leaflet.AreaCapture.js
-  this.areaCaptureInterface = new AreaCaptureInterface(this);
-  this.areaTools = new ButtonBar(this, this.areaCaptureInterface.btns, 'hdr_strong', 'Manage ellipses');
-  this.tools.push(...this.areaCaptureInterface.tools);
   // Code hosted in Leaflet.PithEstimate.js
   this.pithEstimateInterface = new PithEstimateInterface(this);
   let createToolArr = [this.createPoint.btn, this.mouseLine.btn, this.zeroGrowth.btn, this.createBreak.btn];