Begynne med geojson

index.html

@@ -155,9 +155,12 @@
         <script src="javascript/sidebar&boxes.js"></script>
         <script src="javascript/openFileExplorer.js"></script>
         <script src="javascript/fileHandler.js"></script>
+
+        <script src="javascript/geoJSON.js"></script>
+        <script src="/js/leaflet-0.7.2/leaflet.ajax.min.js"></script>
         
         <!-- Imported js -->
-        <script src="https://unpkg.com/shpjs@latest/dist/shp.js"></script>
+        <!-- <script src="https://unpkg.com/shpjs@latest/dist/shp.js"></script> -->
 
     </body>
 </html>

javascript/fileHandler.js

-function handleFile() {
-  input = document.getElementById("fileInput");
-  if (!input.files[0]) {
-    alert("Please select a file before clicking 'Load'.")
-  }
-  else {
-    file = input.files[0];
-    fr = new FileReader();
-
-    arrayBuffer = fr.readAsArrayBuffer(file);
-
-    //document.getElementById("layers").innerHTML = arrayBuffer.type;
-
-    var shpfile = new L.Shapefile(arrayBuffer, {
-			onEachFeature: function(feature, layer) {
-				if (feature.properties) {
-					layer.bindPopup(Object.keys(feature.properties).map(function(k) {
-						return k + ": " + feature.properties[k];
-					}).join("<br />"), {
-						maxHeight: 200
-					});
-				}
-			}
-		});
-
-		shpfile.addTo(map);
-		
-    shpfile.once("data:loaded", function() {
-			alert("Finished loaded shapefile 8)");
-		});
-
-    /*fr.onload = receiveBinary;
-    fr.readAsArrayBuffer(file);*/
-  }
-  function receiveBinary() {
-    result = fr.result;
-    var shpfile = new L.Shapefile(result);
-    shpfile.addTo(map);
-  }
-}

javascript/geoJSON.js

+L.GeoJSON.AJAX("exampleData/vann_2.geojson").addTo(map);
\ No newline at end of file

javascript/map.js

@@ -45,4 +45,4 @@ function activateMap() {
     map._handlers.forEach(function(handler) {
         handler.enable();
     });
-}
\ No newline at end of file
+}