diff --git a/index.html b/index.html
index fa9111afb12e42b4e712876585e1ecda9c9a4138..d7df347b0c5e36cd184fe586a4c2a8745ece114c 100644
--- 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">
diff --git a/javascript/buffer.js b/javascript/buffer.js
index f8bc8e2b2cf24156c9aef86340c4e1f830b17527..63abc6734ead358532a95ed4d57c7835d8e1072c 100644
--- 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;
diff --git a/javascript/colors.js b/javascript/colors.js
new file mode 100644
index 0000000000000000000000000000000000000000..84736bd4393eef9b79cdb56dd9806a9db3fbe45b
--- /dev/null
+++ b/javascript/colors.js
@@ -0,0 +1,25 @@
+// 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
+}
diff --git a/javascript/difference.js b/javascript/difference.js
index 2574e2da6b56b20e9407692eaf24b26fb9bd98e7..6be0cadb9bc02f4e0619a5cf070c048b2db4a014 100644
--- 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;
diff --git a/javascript/dissolve.js b/javascript/dissolve.js
index 53e36a0227cf67f296f99233368583d6e23aabda..d96954c424ddd951633223f6e1941d4afbef6a98 100644
--- 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;
diff --git a/javascript/geoJSON.js b/javascript/geoJSON.js
index ab174703cc88c1588c73f75d9a0b6b8171ffb759..f75cd9cbc997f7c6ed050fd7da2832e92ded3ed8 100644
--- 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();
diff --git a/javascript/intersect.js b/javascript/intersect.js
index 0d5aa423474cb56c660c91f253b94b705e0c5b58..d403852dd0c4328fda439aa7fc153cb543d22557 100644
--- 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;
diff --git a/javascript/union.js b/javascript/union.js
index e3ae36624329da7d040e49d4fc55d91cabcdebd7..0237cc49eb617e455c033f18bdf1e567a314996a 100644
--- 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;