Skip to content
Snippets Groups Projects
Commit d7ea033a authored by Jakob Severin Steffensen Hjelseth's avatar Jakob Severin Steffensen Hjelseth
Browse files

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

Ferdig?

Closes #7

See merge request !40
parents d74c6eda 1d9ba399
No related branches found
No related tags found
2 merge requests!43Resolve "Extract",!40Ferdig?
Pipeline #234970 passed
Stage: deploy
Hide whitespace changes
Inline Side-by-side
index.html
+ 3
− 0
View file @ d7ea033a
......@@ -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">
......
javascript/colors.js 0 → 100644
+ 25
− 0
View file @ d7ea033a
// 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
}
javascript/geoJSON.js
+ 10
− 8
View file @ d7ea033a
......@@ -69,18 +69,20 @@ var TC = {
]
};
var test1 = L.geoJSON();
var test2 = L.geoJSON();
var test1 = L.geoJSON(U, {style: getStyle()});
var test2 = L.geoJSON(TC, {style: getStyle()});
test1.addData(U);
test2.addData(TC);
//addMapLayer(test1, U);
//addMapLayer(test2, TC);
//test1.addData(U);
//test2.addData(TC);
// 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();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment