From 3b6e86d9a049e0e2b28a49a31a892c8f53e10f1b Mon Sep 17 00:00:00 2001
From: Andres Kasekamp <andreskasekamp@gmail.com>
Date: Wed, 6 Mar 2024 10:48:11 +0200
Subject: [PATCH] Removed windmills for now (more testing needed), geology
 layer group bug fix

---
 app.js            | 19 ++++++-------------
 modules/layers.js |  3 ++-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app.js b/app.js
index 90b46e6..a61ef7c 100644
--- a/app.js
+++ b/app.js
@@ -62,9 +62,7 @@ import {
   createURL,
   setupViewPoint,
 } from "./modules/goToLocation.js";
-import {
-  displayWindmills
-} from "./modules/rotatingWindmill";
+import { displayWindmills } from "./modules/rotatingWindmill";
 
 /************************************************************
  * Init scene (/w layers) and view
@@ -103,18 +101,15 @@ const akDTM = setupElevationLayer(
 
 const view = setupWebView(scene);
 
-
-
-
-
-
 view.when(() => {
   /**************************************
    * Geology layer setup
    **************************************/
   const geologyLayers = getGeologyLayers(geologyView);
+
   const boreholes = geologyLayers.items.find(
-    (layer) => layer.title === "Puurkaevud/puuraugud"
+    // (layer) => layer.title === "Puurkaevud/puuraugud"
+    (layer) => layer.title === "Andmepunktid"
   );
   const constructionGeology = geologyLayers.items.find(
     (layer) => layer.title === "Ehitusgeoloogia"
@@ -265,8 +260,8 @@ view.when(() => {
   /**************************************
    * Rotating windmills
    **************************************/
-
-  displayWindmills(view);
+  // TODO selle kuvamine võiks olla dummy kihi kaudu (ka renderdamine, sest muidu jookseb app liiga kaua ilmselt)
+  // displayWindmills(view);
 
   /**************************************
    * Reordering layers
@@ -325,8 +320,6 @@ view.when(() => {
         initVisibleLayers,
         visibleLayersCurrently
       );
-      console.log(regularLayers);
-      console.log(elevationChanged);
 
       const sharedLocation = createURL(view, regularLayers, elevationChanged);
       copyTextToClipboard(sharedLocation);
diff --git a/modules/layers.js b/modules/layers.js
index f988065..1249608 100644
--- a/modules/layers.js
+++ b/modules/layers.js
@@ -54,7 +54,8 @@ const taimkateWorkaround = (treeGroupLayer, view) => {
 
 const getGeologyLayers = (view) => {
   const geologyLayerTitles = [
-    "Puurkaevud/puuraugud",
+    "Andmepunktid",
+    "Puurkaevud/puuraugud", // DEPRECATED, inside Andmepunktid for now
     "Ehitusgeoloogia",
     "Geoloogia WMS",
   ];