Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Commit

Permalink
Removed windmills for now (more testing needed), geology layer group …
Browse files Browse the repository at this point in the history
…bug fix
  • Loading branch information
AndresKasekamp committed Mar 6, 2024
1 parent e4be591 commit 3b6e86d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
19 changes: 6 additions & 13 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -325,8 +320,6 @@ view.when(() => {
initVisibleLayers,
visibleLayersCurrently
);
console.log(regularLayers);
console.log(elevationChanged);

const sharedLocation = createURL(view, regularLayers, elevationChanged);
copyTextToClipboard(sharedLocation);
Expand Down
3 changes: 2 additions & 1 deletion modules/layers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
];
Expand Down

0 comments on commit 3b6e86d

Please sign in to comment.