Merge branch '7-farger-pa-datalagene' into 'dev'

Resolve "Farger på datalagene" See merge request !41

Merge branch '7-farger-pa-datalagene' into 'dev'
60713013 · Jakob Severin Steffensen Hjelseth · 17970f2a · c875481d · 60713013 · 60713013
Commit 60713013 authored 1 year ago by Jakob Severin Steffensen Hjelseth
--- a/index.html
+++ b/index.html
@@ -12,6 +12,9 @@
        <!-- Turfjs -->
        <script src='https://unpkg.com/@turf/turf@6/turf.min.js'></script>

+        <!-- Coloring the map layers -->
+        <script src="javascript/colors.js"></script>
+
    </head>
    
    <body class="standard">

--- a/javascript/buffer.js
+++ b/javascript/buffer.js
@@ -18,9 +18,9 @@ function makeBuffer() {

        if (document.getElementById("bufferCheck").checked) {
            var dissolved = turf.dissolve(buffer);
-            var newLayer = L.geoJSON(dissolved);
+            var newLayer = L.geoJSON(dissolved, {style: getStyle()});
        } else {
-            var newLayer = L.geoJSON(buffer);
+            var newLayer = L.geoJSON(buffer, {style: getStyle()});
        }
        
        overlayMaps[name] = newLayer;

--- a/javascript/colors.js
+++ b/javascript/colors.js
+// Her farges alle lagene i kartet
+
+var count = 0;
+
+var colors = [
+"blue",
+"red",
+"yellow",
+"green",
+"purple",
+"orange",
+];
+
+function getStyle() {
+    var myStyle = {
+        "color": colors[count]
+    };
+
+    count++;
+    if (count == colors.length) {
+        count = 0;
+    }
+
+    return myStyle
+}
--- a/javascript/difference.js
+++ b/javascript/difference.js
@@ -14,7 +14,7 @@ function difference() {

    try {
        var difference = turf.difference(multiPolygon1, multiPolygon2);
-        var newLayer = L.geoJSON(difference);
+        var newLayer = L.geoJSON(difference, {style: getStyle()});
        
        overlayMaps[name] = newLayer;


--- a/javascript/dissolve.js
+++ b/javascript/dissolve.js
@@ -5,7 +5,7 @@ function dissolve() {
    
    try {
        var dissolved = turf.dissolve(layer);
-        var newLayer = L.geoJSON(dissolved);
+        var newLayer = L.geoJSON(dissolved, {style: getStyle()});

        overlayMaps[name] = newLayer;


--- a/javascript/geoJSON.js
+++ b/javascript/geoJSON.js
@@ -69,18 +69,15 @@ var TC = {
  ]
 };

-var test1 = L.geoJSON();
-var test2 = L.geoJSON();
-
-test1.addData(U);
-test2.addData(TC);
+var test1 = L.geoJSON(U, {style: getStyle()});
+var test2 = L.geoJSON(TC, {style: getStyle()});

 // Det jeg skal ha med i ferdig versjon:

-var Arealdekke = L.geoJSON();
-var Bygg_f = L.geoJSON();
-var Bygg_l = L.geoJSON();
-var Samferdsel = L.geoJSON();
+var Arealdekke = L.geoJSON(null, {style: getStyle()});
+var Bygg_f = L.geoJSON(null, {style: getStyle()});
+var Bygg_l = L.geoJSON(null, {style: getStyle()});
+var Samferdsel = L.geoJSON(null, {style: getStyle()});

 fetch("javascript/exampleData/Arealdekke_klippa.geojson").then(function(response) {
    return response.json();

--- a/javascript/intersect.js
+++ b/javascript/intersect.js
@@ -14,7 +14,7 @@ function intersection() {
    
    try {
        var intersection = turf.intersect(multiPolygon1, multiPolygon2);
-        var newLayer = new L.GeoJSON(intersection);
+        var newLayer = new L.GeoJSON(intersection, {style: getStyle()});
        
        overlayMaps[name] = newLayer;


--- a/javascript/union.js
+++ b/javascript/union.js
@@ -14,7 +14,7 @@ function union() {

    try {
        var union = turf.union(multiPolygon1, multiPolygon2);
-        var newLayer = L.geoJSON(union);
+        var newLayer = L.geoJSON(union, {style: getStyle()});

        overlayMaps[name] = newLayer;