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

Merge branch 'dev' into 'main' 

Dev

See merge request !65
parents a7bea7a3 2e973ed6
No related branches found
No related tags found
2 merge requests!66Resolve "README og Tutorial",!65Dev
Pipeline #238880 passed
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 166 deletions
javascript/exampleData/Shapefiles/Arealdekke_klippa.zip deleted 100644 → 0
+ 0
− 0
View file @ a7bea7a3
File deleted
javascript/exampleData/Shapefiles/Bygg&Anlegg_f_klippa.zip deleted 100644 → 0
+ 0
− 0
View file @ a7bea7a3
File deleted
javascript/exampleData/Shapefiles/Bygg&Anlegg_l_klippa.zip deleted 100644 → 0
+ 0
− 0
View file @ a7bea7a3
File deleted
javascript/exampleData/Shapefiles/Samferdsel_klippa.zip deleted 100644 → 0
+ 0
− 0
View file @ a7bea7a3
File deleted
javascript/exampleData/TrainingCenters.geojson deleted 100644 → 0
+ 0
− 33
View file @ a7bea7a3
{
"type": "FeatureCollection",
"properties": {"name": "Training centers"},
"features": [
{
"type": "Feature",
"properties": {"name": "SIT Gløshaugen"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.403855, 63.421078],
[10.404845, 63.421427],
[10.40556, 63.421042],
[10.404572, 63.420705],
[10.403855, 63.421078]
]]
}
}, {
"type": "Feature",
"properties": {"name": "SIT Dragvoll"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.474145, 63.407263],
[10.475657, 63.407148],
[10.475491, 63.406157],
[10.473766, 63.406265],
[10.474145, 63.407263]
]]
}
}
]
}
\ No newline at end of file
javascript/exampleData/Universities.geojson deleted 100644 → 0
+ 0
− 33
View file @ a7bea7a3
{
"type": "FeatureCollection",
"properties": {"name": "Universities"},
"features": [
{
"type": "Feature",
"properties": {"name": "Gløshaugen"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.403787, 63.420031],
[10.410954, 63.414691],
[10.404863, 63.414188],
[10.398170, 63.418901],
[10.403787, 63.420031]
]]
}
}, {
"type": "Feature",
"properties": {"name": "Dragvoll"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.467217, 63.409471],
[10.471829, 63.408921],
[10.47094, 63.406668],
[10.466968 , 63.407128],
[10.467217, 63.409471]
]]
}
}
]
}
\ No newline at end of file
javascript/fileHandler.js
+ 8
− 4
View file @ 3ac13c51
......@@ -35,9 +35,13 @@ function handleFile() {
})
}
overlayMaps[selectedFile.name] = newLayer;
if (doLayerExist(selectedFile.name)) {
return alert("This layer is already added to the map!");
} else {
overlayMaps[selectedFile.name] = newLayer;
updateSidebar();
handleLayer(selectedFile.name);
updateSidebar();
handleLayer(selectedFile.name);
}
}
javascript/geoJSON.js
+ 5
− 74
View file @ 3ac13c51
// Test-data jeg tester funksjonalitet på:
// Det fungerer ikke å lese fra fil ved å kun kjøre html-filen lokalt
var U = {
"type": "FeatureCollection",
"properties": {"name": "Universities"},
"features": [
{
"type": "Feature",
"properties": {"name": "Gløshaugen"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.403787, 63.420031],
[10.410954, 63.414691],
[10.404863, 63.414188],
[10.398170, 63.418901],
[10.403787, 63.420031]
]]
}
}, {
"type": "Feature",
"properties": {"name": "Dragvoll"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.467217, 63.409471],
[10.471829, 63.408921],
[10.47094, 63.406668],
[10.466968 , 63.407128],
[10.467217, 63.409471]
]]
}
}
]
};
var TC = {
"type": "FeatureCollection",
"properties" : {"name": "Training centers"},
"features": [
{
"type": "Feature",
"properties": {"name": "SIT Gløshaugen"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.403855, 63.421078],
[10.404845, 63.421427],
[10.40556, 63.421042],
[10.404572, 63.420705],
[10.403855, 63.421078]
]]
}
}, {
"type": "Feature",
"properties": {"name": "SIT Dragvoll"},
"geometry": {
"type": "Polygon",
"coordinates": [[
[10.474145, 63.407263],
[10.475657, 63.407148],
[10.475491, 63.406157],
[10.473766, 63.406265],
[10.474145, 63.407263]
]]
}
}
]
};
var test1 = L.geoJSON(U, {style: getStyle()});
var test2 = L.geoJSON(TC, {style: getStyle()});
// Det jeg skal ha med i ferdig versjon:
/*
Det fungerer ikke å lese fra fil ved å kun kjøre html-filen lokalt
Har derfor brukt litt eksempeldata fra koden
*/
var Arealdekke = L.geoJSON(null, {style: getStyle()});
var Bygg_f = L.geoJSON(null, {style: getStyle()});
var Bygg_l = L.geoJSON(null, {style: getStyle()});
......
javascript/leafletLayerControl.js
+ 0
− 2
View file @ 3ac13c51
......@@ -21,8 +21,6 @@ function loadExampleData() {
overlayMaps["Bygg_f"] = Bygg_f;
overlayMaps["Bygg_l"] = Bygg_l;
overlayMaps["Samferdsel"] = Samferdsel;
overlayMaps["test1"] = test1;
overlayMaps["test2"] = test2;
updateSidebar();
exampleLoaded = true;
......
javascript/turfFormatConverter.js
+ 1
− 20
View file @ 3ac13c51
......@@ -51,31 +51,12 @@ function isInputMultiPolygon(layer) {
}
function turnList(liste) {
/*var more = false;
try {
var test = liste[0][0][0];
if (test != null) {
more = true;
}
} catch {
more = false;
}
if (more) {
var newList = [];
console.log("JA")
for (var i = 0; i < layer.length; i++) {
newList.push(turnList(liste[i]));
}
} else {*/
var newList = [];
for (var i = liste.length - 1; i > -1; i--) {
newList.push(liste[i]);
}
//}
return newList;
}
......
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