diff --git a/index.html b/index.html index ce10b6c3f8d2bf6336874a588e716bd392bdec23..f6a49567da128657f02af1123e4fa2c871cba66e 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 7b817c4aaaa0956831d80b566e44b2253559ae56..100604d8b58aae386ea9300cfa346920982ee877 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 3cdb797101828e72169fa44070d00012bf7176d0..8e5c186ab47d73eedfa713e24755af1be9dcbd45 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 40335382141f8334c1bb2ae75a29ee4c9542b6d4..d06c6c5f97ef2632d849d3882f558ac57a21d655 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/javascript/intersect.js b/javascript/intersect.js index 475c5f49968ed6121d45e272b4be2457641a6272..35b009ea8f25ade7f9251af2e12efce377959063 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 8b34259a1e0d7bbdc42a4edb0906b442bd5773a1..f0ce586655e2d18a5e6712175dc4f2f698e819a3 100644 --- a/javascript/union.js +++ b/javascript/union.js @@ -1,4 +1,4 @@ -function union() { +function makeUnion() { // Sjekk av faktisk og gyldig input: