From 75ae52e9530fe532aa800a53dd78139836e425bc Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.com>
Date: Sat, 17 Sep 2022 14:58:00 +0300
Subject: [PATCH] fix: 3d view - don't allow download obj for globe

---
 index.html            | 10 +++++-----
 modules/ui/options.js |  5 +++--
 versioning.js         |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index e21e6490..c61a9d8a 100644
--- a/index.html
+++ b/index.html
@@ -5575,19 +5575,19 @@
           <div data-tip="Set map rotation speed. Set to 0 is you want to toggle off the rotation">
             <div>Rotation:</div>
             <input id="options3dMeshRotationRange" type="range" min="0" max="10" step=".1" />
-            <input id="options3dMeshRotationNumber" type="number" min="0" max="10" step=".1" style="width: 3em" />
+            <input id="options3dMeshRotationNumber" type="number" min="0" max="10" step=".1" style="width: 4em" />
           </div>
 
           <div data-tip="Set height scale">
             <div>Height scale:</div>
             <input id="options3dScaleRange" type="range" min="0" max="100" />
-            <input id="options3dScaleNumber" type="number" min="0" max="1000" style="width: 3em" />
+            <input id="options3dScaleNumber" type="number" min="0" max="1000" style="width: 4em" />
           </div>
 
           <div data-tip="Set scene lightness">
             <div>Lightness:</div>
             <input id="options3dLightnessRange" type="range" min="0" max="100" />
-            <input id="options3dLightnessNumber" type="number" min="0" max="500" style="width: 3em" />
+            <input id="options3dLightnessNumber" type="number" min="0" max="500" style="width: 4em" />
           </div>
 
           <div data-tip="Set sun position (x, y, z) to define shadows">
@@ -5627,7 +5627,7 @@
           <div data-tip="Set globe rotation speed. Set to 0 is you want to toggle off the rotation">
             <div>Rotation:</div>
             <input id="options3dGlobeRotationRange" type="range" min="0" max="10" step=".1" />
-            <input id="options3dGlobeRotationNumber" type="number" min="0" max="10" step=".1" style="width: 3em" />
+            <input id="options3dGlobeRotationNumber" type="number" min="0" max="10" step=".1" style="width: 4em" />
           </div>
 
           <div data-tip="Set globe texture resolution">
@@ -7822,7 +7822,7 @@
     <script src="modules/ui/stylePresets.js"></script>
 
     <script src="modules/ui/general.js?v=1.87.00"></script>
-    <script src="modules/ui/options.js?v=1.87.09"></script>
+    <script src="modules/ui/options.js?v=1.87.11"></script>
     <script src="main.js"></script>
 
     <script defer src="modules/relief-icons.js"></script>
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 47cbf60c..5fd154f0 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -461,8 +461,8 @@ function changeDialogsTheme(themeColor, transparency) {
 }
 
 function changeZoomExtent(value) {
-  if(+zoomExtentMin.value > +zoomExtentMax.value) {
-    [zoomExtentMin.value, zoomExtentMax.value]=[zoomExtentMax.value, zoomExtentMin.value];
+  if (+zoomExtentMin.value > +zoomExtentMax.value) {
+    [zoomExtentMin.value, zoomExtentMax.value] = [zoomExtentMax.value, zoomExtentMin.value];
   }
   const min = Math.max(+zoomExtentMin.value, 0.01);
   const max = Math.min(+zoomExtentMax.value, 200);
@@ -1008,6 +1008,7 @@ function toggle3dOptions() {
     const globe = document.getElementById("canvas3d").dataset.type === "viewGlobe";
     options3dMesh.style.display = globe ? "none" : "block";
     options3dGlobe.style.display = globe ? "block" : "none";
+    options3dOBJSave.style.display = globe ? "none" : "inline-block";
     options3dScaleRange.value = options3dScaleNumber.value = ThreeD.options.scale;
     options3dLightnessRange.value = options3dLightnessNumber.value = ThreeD.options.lightness * 100;
     options3dSunX.value = ThreeD.options.sun.x;
diff --git a/versioning.js b/versioning.js
index 943084ec..8fa1dbef 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // version and caching control
-const version = "1.87.10"; // generator version, update each time
+const version = "1.87.11"; // generator version, update each time
 
 {
   document.title += " v" + version;