From 4cda0303bc51c36115a2c65f8b7ba1a6b01acaee Mon Sep 17 00:00:00 2001
From: jshjelse <jshjelse@stud.ntnu.no>
Date: Tue, 17 Oct 2023 20:26:39 +0200
Subject: [PATCH] Quickfix
---
index.html | 29 +++++++++++++++++------------
javascript/difference.js | 2 +-
javascript/dissolve.js | 2 +-
javascript/extract.js | 2 +-
javascript/fileHandler.js | 0
javascript/intersect.js | 2 +-
javascript/union.js | 2 +-
7 files changed, 22 insertions(+), 17 deletions(-)
delete mode 100644 javascript/fileHandler.js
diff --git a/index.html b/index.html
index ce10b6c..f6a4956 100644
--- a/index.html
+++ b/index.html
@@ -124,7 +124,7 @@
<p>Choose a name for the new layer:</p>
<input id="differenceName"><br>
- <button class="button" style="font-size: 25px;" onclick="difference()">Make difference</button>
+ <button class="button" style="font-size: 25px;" onclick="makeDifference()">Make difference</button>
</div>
<div id="dissolveBox" class="box">
@@ -143,7 +143,7 @@
<p>Choose a name for the new dissolved layer:</p>
<input id="dissolveName"><br>
- <button class="button" style="font-size: 25px;" onclick="dissolve()">Dissolve</button>
+ <button class="button" style="font-size: 25px;" onclick="doDissolve()">Dissolve</button>
</div>
<div id="extractBox" class="box">
@@ -168,7 +168,7 @@
<p>Choose a name for the new layer:</p>
<input id="extractName"><br>
- <button class="button" style="font-size: 25px;" onclick="extract()">Extract</button>
+ <button class="button" style="font-size: 25px;" onclick="doExtract()">Extract</button>
</div>
<div id="intersectionBox" class="box">
@@ -190,7 +190,7 @@
<p>Choose a name for the intersection:</p>
<input id="intersectionName"><br>
- <button class="button" style="font-size: 25px;" onclick="intersection()">Intersect</button>
+ <button class="button" style="font-size: 25px;" onclick="makeIntersection()">Intersect</button>
</div>
<div id="unionBox" class="box">
@@ -212,7 +212,7 @@
<p>Choose a name for the union:</p>
<input id="unionName"><br>
- <button class="button" style="font-size: 25px;" onclick="union()">Make union</button>
+ <button class="button" style="font-size: 25px;" onclick="makeUnion()">Make union</button>
</div>
<div id="tutorialBox" class="box">
@@ -271,26 +271,31 @@
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
<!-- My js -->
+
+ <!-- General -->
+
<script src="javascript/map.js"></script>
<script src="javascript/sidebar&boxes.js"></script>
<script src="javascript/openFileExplorer.js"></script>
- <script src="javascript/fileHandler.js"></script>
<script src="javascript/geoJSON.js"></script>
<script src="javascript/leafletLayerControl.js"></script>
+ <script src="javascript/turfFormatConverter.js"></script>
+ <script src="javascript/tutorial.js"></script>
+
+ <!-- Map functions -->
+
<script src="javascript/buffer.js"></script>
<script src="javascript/dissolve.js"></script>
<script src="javascript/difference.js"></script>
- <script src="javascript/turfFormatConverter.js"></script>
<script src="javascript/intersect.js"></script>
<script src="javascript/union.js"></script>
<script src="javascript/extract.js"></script>
+
+ <!-- Map change -->
+
<script src="javascript/mapChange.js"></script>
<script src="javascript/voronoi.js"></script>
<script src="javascript/tin.js"></script>
- <script src="javascript/tutorial.js"></script>
-
- <!-- Imported js -->
- <!-- <script src="https://unpkg.com/shpjs@latest/dist/shp.js"></script> -->
-
+
</body>
</html>
diff --git a/javascript/difference.js b/javascript/difference.js
index 7b817c4..100604d 100644
--- a/javascript/difference.js
+++ b/javascript/difference.js
@@ -1,4 +1,4 @@
-function difference() {
+function makeDifference() {
// Sjekk av faktisk og gyldig input:
diff --git a/javascript/dissolve.js b/javascript/dissolve.js
index 3cdb797..8e5c186 100644
--- a/javascript/dissolve.js
+++ b/javascript/dissolve.js
@@ -1,4 +1,4 @@
-function dissolve() {
+function doDissolve() {
// Sjekk av faktisk og gyldig input:
diff --git a/javascript/extract.js b/javascript/extract.js
index 4033538..d06c6c5 100644
--- a/javascript/extract.js
+++ b/javascript/extract.js
@@ -57,7 +57,7 @@ document.getElementById("featureSelect").addEventListener("change", () => {
}
})
-function extract() {
+function doExtract() {
// Sjekk av faktisk og gyldig input:
diff --git a/javascript/fileHandler.js b/javascript/fileHandler.js
deleted file mode 100644
index e69de29..0000000
diff --git a/javascript/intersect.js b/javascript/intersect.js
index 475c5f4..35b009e 100644
--- a/javascript/intersect.js
+++ b/javascript/intersect.js
@@ -1,4 +1,4 @@
-function intersection() {
+function makeIntersection() {
// Sjekk av faktisk og gyldig input:
diff --git a/javascript/union.js b/javascript/union.js
index 8b34259..f0ce586 100644
--- a/javascript/union.js
+++ b/javascript/union.js
@@ -1,4 +1,4 @@
-function union() {
+function makeUnion() {
// Sjekk av faktisk og gyldig input:
--
GitLab