diff --git a/javascript/exampleData/Shapefiles/Arealdekke_klippa.zip b/javascript/exampleData/Shapefiles/Arealdekke_klippa.zip
deleted file mode 100644
index 42c7449c852b90b1dd5f7a88f07af5dc04301644..0000000000000000000000000000000000000000
Binary files a/javascript/exampleData/Shapefiles/Arealdekke_klippa.zip and /dev/null differ
diff --git a/javascript/exampleData/Shapefiles/Bygg&Anlegg_f_klippa.zip b/javascript/exampleData/Shapefiles/Bygg&Anlegg_f_klippa.zip
deleted file mode 100644
index 5b4a2015dff5eeecfba76f59dfb51e2f2f78f701..0000000000000000000000000000000000000000
Binary files a/javascript/exampleData/Shapefiles/Bygg&Anlegg_f_klippa.zip and /dev/null differ
diff --git a/javascript/exampleData/Shapefiles/Bygg&Anlegg_l_klippa.zip b/javascript/exampleData/Shapefiles/Bygg&Anlegg_l_klippa.zip
deleted file mode 100644
index d907438652000af4e3802dc85ff93aab0f31eb32..0000000000000000000000000000000000000000
Binary files a/javascript/exampleData/Shapefiles/Bygg&Anlegg_l_klippa.zip and /dev/null differ
diff --git a/javascript/exampleData/Shapefiles/Samferdsel_klippa.zip b/javascript/exampleData/Shapefiles/Samferdsel_klippa.zip
deleted file mode 100644
index 3ec9bcdbdaf7c4a9359fe8d0637959dbd1fbdbda..0000000000000000000000000000000000000000
Binary files a/javascript/exampleData/Shapefiles/Samferdsel_klippa.zip and /dev/null differ
diff --git a/javascript/exampleData/TrainingCenters.geojson b/javascript/exampleData/TrainingCenters.geojson
deleted file mode 100644
index 06c104bab3ed55bd0c8b110c2f39e68a3e70fdc8..0000000000000000000000000000000000000000
--- a/javascript/exampleData/TrainingCenters.geojson
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "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
diff --git a/javascript/exampleData/Universities.geojson b/javascript/exampleData/Universities.geojson
deleted file mode 100644
index 56842e9be804758125c68e6881fe0a88a891b691..0000000000000000000000000000000000000000
--- a/javascript/exampleData/Universities.geojson
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "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
diff --git a/javascript/fileHandler.js b/javascript/fileHandler.js
index 6b7c335b1041092e89c18b907e9f98c6a640dbe6..29bfda322076feb3a4e6adbf97ca660a84bf4b40 100644
--- a/javascript/fileHandler.js
+++ b/javascript/fileHandler.js
@@ -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);
+ }
}
diff --git a/javascript/geoJSON.js b/javascript/geoJSON.js
index f75cd9cbc997f7c6ed050fd7da2832e92ded3ed8..fd9b0ffb4a2a1968cf928a36ac35c8c94540e7bc 100644
--- a/javascript/geoJSON.js
+++ b/javascript/geoJSON.js
@@ -1,79 +1,10 @@
-// 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()});
diff --git a/javascript/leafletLayerControl.js b/javascript/leafletLayerControl.js
index 7fa775db5b0e8eea82b38a07f47b167f0b959ff1..f4bab28638dffda4331ba25489c38e8cca1b51b2 100644
--- a/javascript/leafletLayerControl.js
+++ b/javascript/leafletLayerControl.js
@@ -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;
diff --git a/javascript/turfFormatConverter.js b/javascript/turfFormatConverter.js
index 617d02d32464b72ddce571054a9cf42ebeff8e40..2bc235c7658247489b515c80fa5a5116481c6d6d 100644
--- a/javascript/turfFormatConverter.js
+++ b/javascript/turfFormatConverter.js
@@ -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;
}