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

Merge branch '4-gjore-drop-av-filer-mulig' into 'dev' 

Resolve "Gjøre drop av filer mulig"

See merge request !7
parents 72614a5e 032f4e20
No related branches found
No related tags found
2 merge requests!8From dev into main,!7Resolve "Gjøre drop av filer mulig"
Hide whitespace changes
Inline Side-by-side
style.css → css/style.css
+ 20
− 0
View file @ 79207bd4
...@@ -66,4 +66,24 @@ ...@@ -66,4 +66,24 @@
height: 80vh; height: 80vh;
overflow-x: hidden; overflow-x: hidden;
transition: 0.5s; transition: 0.5s;
}
#dialog {
display: none;
}
#clickOpen {
font-family: monospace;
font-size: larger;
background-color: orangered;
color: white;
width: 20vw;
text-align: center;
border-color: white;
border-style: dotted;
border-width: 5px;
border-radius: 10px;
margin-left: 2vw;
margin-right: 2vw;
cursor: pointer;
} }
\ No newline at end of file
index.html
+ 84
− 71
View file @ 79207bd4
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
<head> <head>
<title>ProgGIS</title> <title>ProgGIS</title>
<link rel="stylesheet" href="style.css" /> <link rel="stylesheet" href="css/style.css"/>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" /> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script> <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
<script src="https://unpkg.com/shpjs@latest/dist/shp.js"></script>
<script src="javascript/catiline.js"></script>
<script src="javascript/leaflet.shpfile.js"></script>
</head> </head>
<body class="standard"> <body class="standard">
...@@ -45,96 +49,105 @@ ...@@ -45,96 +49,105 @@
</svg> </svg>
</div> </div>
<div style="margin-left: 10px; font-size: 18px;"> <div style="margin-left: 10px; margin-top: 5px; margin-bottom: 5px;">
<p>Hei<br>på<br>deg!<br><br>Hu<br>og<br>Hei :)</p> <input type="file" none="dialog" id="dialog" multiple>
<button id="clickOpen" onclick="clickMe()">Click here to open new layers</button>
</div>
<div style="margin-left: 10px; font-size: 18px; height: 50vh;">
<p id="layers"></p>
</div> </div>
</div> </div>
<div id="map" style="position: relative; z-index: 1; height: 80vh;"> <div id="map" style="position: relative; z-index: 1; height: 80vh;">
<div style="display: flex; flex-grow: 2; flex-direction: column;"> <div id="drop_zone">
<div style="height: 72vh;"> <div style="display: flex; flex-grow: 2; flex-direction: column;">
<div id="bufferBox" class="box"> <div style="height: 72vh;">
<div class="box3"> <div id="bufferBox" class="box">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Buffer</h1> <div class="box3">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Buffer</h1>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('bufferBox')"
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16"> <svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('bufferBox')"
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/> xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
</svg> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
</svg>
</div>
</div> </div>
</div>
<div id="intersectionBox" class="box"> <div id="intersectionBox" class="box">
<div class="box3"> <div class="box3">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Intersection</h1> <h1 style="font-size: 4vh; text-align: center; width: 36vw;">Intersection</h1>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('intersectionBox')" <svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('intersectionBox')"
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16"> xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
</svg> </svg>
</div>
</div> </div>
</div>
<div id="unionBox" class="box"> <div id="unionBox" class="box">
<div class="box3"> <div class="box3">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Union</h1> <h1 style="font-size: 4vh; text-align: center; width: 36vw;">Union</h1>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('unionBox')" <svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('unionBox')"
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16"> xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
</svg> </svg>
</div>
</div> </div>
</div>
<div id="differenceBox" class="box"> <div id="differenceBox" class="box">
<div class="box3"> <div class="box3">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Difference</h1> <h1 style="font-size: 4vh; text-align: center; width: 36vw;">Difference</h1>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('differenceBox')" <svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('differenceBox')"
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16"> xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
</svg> </svg>
</div>
</div> </div>
</div>
<div id="tutorialBox" class="box"> <div id="tutorialBox" class="box">
<div class="box3"> <div class="box3">
<h1 style="font-size: 4vh; text-align: center; width: 36vw;">Tutorial</h1> <h1 style="font-size: 4vh; text-align: center; width: 36vw;">Tutorial</h1>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('tutorialBox')"
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
</svg>
</div>
<svg style="cursor: pointer; padding-top: 15px;" onclick="closeBox('tutorialBox')" <p style="margin: 2vw; padding: 5px; background-color: white; border-color: black;
xmlns="http://www.w3.org/2000/svg" width="3vw" height="3vw" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16"> border-width: 2px; color: black; height: 18vh; width: 35vw; text-align: left;">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/> Legg til piler på hver side av 'Tutorial' for å navigere rundt blant de ulike tutorialene.
</svg> </p>
</div> </div>
<textarea style="margin: 2vw; padding: 5px; background-color: white; border-color: black;
border-width: 2px; color: black; height: 18vh; width: 35vw; text-align: left;">
Legg til piler på hver side av 'Tutorial' for å navigere rundt blant de ulike tutorialene.
</textarea>
</div> </div>
</div>
<div class="box2"> <div class="box2">
<div style="padding-left: 2vw;"> <div style="padding-left: 2vw;">
<svg style="cursor: pointer; border: none; position: absolute; color: orangered; z-index: 999;" onclick="openNav()" <svg style="cursor: pointer; border: none; position: absolute; color: orangered; z-index: 999;" onclick="openNav()"
xmlns="http://www.w3.org/2000/svg" width="6vh" height="6vh" fill="currentColor" class="bi bi-plus-circle-fill" viewBox="0 0 16 16"> xmlns="http://www.w3.org/2000/svg" width="6vh" height="6vh" fill="currentColor" class="bi bi-plus-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v3h-3a.5.5 0 0 0 0 1h3v3a.5.5 0 0 0 1 0v-3h3a.5.5 0 0 0 0-1h-3v-3z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8.5 4.5a.5.5 0 0 0-1 0v3h-3a.5.5 0 0 0 0 1h3v3a.5.5 0 0 0 1 0v-3h3a.5.5 0 0 0 0-1h-3v-3z"/>
</svg> </svg>
</div> </div>
<div style="width: 95vw;"></div> <div style="width: 95vw;"></div>
<div style="padding-right: 2vw;"> <div style="padding-right: 2vw;">
<svg style="cursor: pointer; border: none; position: relative; color: orangered; z-index: 999;" onclick="openBox('tutorialBox')" <svg style="cursor: pointer; border: none; position: relative; color: orangered; z-index: 999;" onclick="openBox('tutorialBox')"
xmlns="http://www.w3.org/2000/svg" width="6vh" height="6v" fill="currentColor" class="bi bi-question-circle-fill" viewBox="0 0 16 16"> xmlns="http://www.w3.org/2000/svg" width="6vh" height="6v" fill="currentColor" class="bi bi-question-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.496 6.033h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286a.237.237 0 0 0 .241.247zm2.325 6.443c.61 0 1.029-.394 1.029-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94 0 .533.425.927 1.01.927z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.496 6.033h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286a.237.237 0 0 0 .241.247zm2.325 6.443c.61 0 1.029-.394 1.029-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94 0 .533.425.927 1.01.927z"/>
</svg> </svg>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script src="javascript/map.js"></script>
<script src="javascript/sidebar&boxes.js"></script>
<script src="javascript/openFileFromExplorer.js"></script>
</body> </body>
</html> </html>
<script src="javascript/map.js"></script>
<script src="javascript/sidebar&boxes.js"></script>
\ No newline at end of file
javascript/catiline.js 0 → 100644
+ 769
− 0
View file @ 79207bd4
/*! catiline 2.4.2 2013-08-08*/
/*!©2013 Calvin Metcalf @license MIT https://github.com/calvinmetcalf/catiline */
if (typeof document === 'undefined') {
self._noTransferable=true;
self.onmessage=function(e){
/*jslint evil: true */
eval(e.data);
};
} else {
(function(global){
'use strict';
/*!From setImmediate Copyright (c) 2012 Barnesandnoble.com,llc, Donavon West, and Domenic Denicola @license MIT https://github.com/NobleJS/setImmediate */
(function(attachTo,global) {
var tasks = (function () {
function Task(handler, args) {
this.handler = handler;
this.args = args;
}
Task.prototype.run = function () {
// See steps in section 5 of the spec.
if (typeof this.handler === 'function') {
// Choice of `thisArg` is not in the setImmediate spec; `undefined` is in the setTimeout spec though:
// http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html
this.handler.apply(undefined, this.args);
} else {
var scriptSource = '' + this.handler;
/*jshint evil: true */
eval(scriptSource);
}
};
var nextHandle = 1; // Spec says greater than zero
var tasksByHandle = {};
var currentlyRunningATask = false;
return {
addFromSetImmediateArguments: function (args) {
var handler = args[0];
var argsToHandle = Array.prototype.slice.call(args, 1);
var task = new Task(handler, argsToHandle);
var thisHandle = nextHandle++;
tasksByHandle[thisHandle] = task;
return thisHandle;
},
runIfPresent: function (handle) {
// From the spec: 'Wait until any invocations of this algorithm started before this one have completed.'
// So if we're currently running a task, we'll need to delay this invocation.
if (!currentlyRunningATask) {
var task = tasksByHandle[handle];
if (task) {
currentlyRunningATask = true;
try {
task.run();
} finally {
delete tasksByHandle[handle];
currentlyRunningATask = false;
}
}
} else {
// Delay by doing a setTimeout. setImmediate was tried instead, but in Firefox 7 it generated a
// 'too much recursion' error.
global.setTimeout(function () {
tasks.runIfPresent(handle);
}, 0);
}
},
remove: function (handle) {
delete tasksByHandle[handle];
}
};
}());
// Installs an event handler on `global` for the `message` event: see
// * https://developer.mozilla.org/en/DOM/window.postMessage
// * http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#crossDocumentMessages
var MESSAGE_PREFIX = 'com.catilinejs.setImmediate' + Math.random();
function isStringAndStartsWith(string, putativeStart) {
return typeof string === 'string' && string.substring(0, putativeStart.length) === putativeStart;
}
function onGlobalMessage(event) {
// This will catch all incoming messages (even from other windows!), so we need to try reasonably hard to
// avoid letting anyone else trick us into firing off. We test the origin is still this window, and that a
// (randomly generated) unpredictable identifying prefix is present.
if (event.source === global && isStringAndStartsWith(event.data, MESSAGE_PREFIX)) {
var handle = event.data.substring(MESSAGE_PREFIX.length);
tasks.runIfPresent(handle);
}
}
if (global.addEventListener) {
global.addEventListener('message', onGlobalMessage, false);
} else {
global.attachEvent('onmessage', onGlobalMessage);
}
attachTo.setImmediate = function () {
var handle = tasks.addFromSetImmediateArguments(arguments);
// Make `global` post a message to itself with the handle and identifying prefix, thus asynchronously
// invoking our onGlobalMessage listener above.
global.postMessage(MESSAGE_PREFIX + handle, '*');
return handle;
};
})(catiline,global);
/*! Promiscuous ©2013 Ruben Verborgh @license MIT https://github.com/RubenVerborgh/promiscuous*/
(function (exports,tick) {
var func = 'function';
// Creates a deferred: an object with a promise and corresponding resolve/reject methods
function Deferred() {
// The `handler` variable points to the function that will
// 1) handle a .then(onFulfilled, onRejected) call
// 2) handle a .resolve or .reject call (if not fulfilled)
// Before 2), `handler` holds a queue of callbacks.
// After 2), `handler` is a simple .then handler.
// We use only one function to save memory and complexity.
var handler = function (onFulfilled, onRejected, value) {
// Case 1) handle a .then(onFulfilled, onRejected) call
var createdDeffered;
if (onFulfilled !== handler) {
createdDeffered = createDeferred();
handler.queue.push({ deferred: createdDeffered, resolve: onFulfilled, reject: onRejected });
return createdDeffered.promise;
}
// Case 2) handle a .resolve or .reject call
// (`onFulfilled` acts as a sentinel)
// The actual function signature is
// .re[ject|solve](sentinel, success, value)
var action = onRejected ? 'resolve' : 'reject',queue,deferred,callback;
for (var i = 0, l = handler.queue.length; i < l; i++) {
queue = handler.queue[i];
deferred = queue.deferred;
callback = queue[action];
if (typeof callback !== func) {
deferred[action](value);
} else {
execute(callback, value, deferred);
}
}
// Replace this handler with a simple resolved or rejected handler
handler = createHandler(promise, value, onRejected);
};
function Promise(){
this.then=function (onFulfilled, onRejected) {
return handler(onFulfilled, onRejected);
};
}
var promise = new Promise();
this.promise = promise;
// The queue of deferreds
handler.queue = [];
this.resolve = function (value) {
handler.queue && handler(handler, true, value);
};
this.reject = function (reason) {
handler.queue && handler(handler, false, reason);
};
}
function createDeferred(){
return new Deferred();
}
// Creates a fulfilled or rejected .then function
function createHandler(promise, value, success) {
return function (onFulfilled, onRejected) {
var callback = success ? onFulfilled : onRejected, result;
if (typeof callback !== func) {
return promise;
}
execute(callback, value, result = createDeferred());
return result.promise;
};
}
// Executes the callback with the specified value,
// resolving or rejecting the deferred
function execute(callback, value, deferred) {
tick(function () {
var result;
try {
result = callback(value);
if (result && typeof result.then === func) {
result.then(deferred.resolve, deferred.reject);
} else {
deferred.resolve(result);
}
}
catch (error) {
deferred.reject(error);
}
});
}
// Returns a resolved promise
exports.resolve= function (value) {
var promise = {};
promise.then = createHandler(promise, value, true);
return promise;
};
// Returns a rejected promise
exports.reject= function (reason) {
var promise = {};
promise.then = createHandler(promise, reason, false);
return promise;
};
// Returns a deferred
exports.deferred= createDeferred;
exports.all=function(array){
var promise = exports.deferred();
var len = array.length;
var resolved=0;
var out = [];
var onSuccess=function(n){
return function(v){
out[n]=v;
resolved++;
if(resolved===len){
promise.resolve(out);
}
};
};
array.forEach(function(v,i){
v.then(onSuccess(i),function(a){
promise.reject(a);
});
});
return promise.promise;
};
})(catiline,catiline.setImmediate);
catiline._hasWorker = typeof Worker !== 'undefined'&&typeof fakeLegacy === 'undefined';
catiline.URL = window.URL || window.webkitURL;
catiline._noTransferable=!catiline.URL;
//regex out the importScript call and move it up to the top out of the function.
function regexImports(string){
var rest=string,
match = true,
matches = {},
loopFunc = function(a,b){
if(b){
'importScripts('+b.split(',').forEach(function(cc){
matches[catiline.makeUrl(cc.match(/\s*[\'\"](\S*)[\'\"]\s*/)[1])]=true; // trim whitespace, add to matches
})+');\n';
}
};
while(match){
match = rest.match(/(importScripts\(.*?\);?)/);
rest = rest.replace(/(importScripts\(\s*(?:[\'\"].*?[\'\"])?\s*\);?)/,'\n');
if(match){
match[0].replace(/importScripts\(\s*([\'\"].*?[\'\"])?\s*\);?/g,loopFunc);
}
}
matches = Object.keys(matches);
return [matches,rest];
}
function moveImports(string){
var str = regexImports(string);
var matches = str[0];
var rest = str[1];
if(matches.length>0){
return 'importScripts(\''+matches.join('\',\'')+'\');\n'+rest;
}else{
return rest;
}
}
function moveIimports(string){
var str = regexImports(string);
var matches = str[0];
var rest = str[1];
if(matches.length>0){
return 'importScripts(\''+matches.join('\',\'')+'\');eval(__scripts__);\n'+rest;
}else{
return rest;
}
}
function getPath(){
if(typeof SHIM_WORKER_PATH !== 'undefined'){
return SHIM_WORKER_PATH;
}else if('SHIM_WORKER_PATH' in catiline){
return catiline.SHIM_WORKER_PATH;
}
var scripts = document.getElementsByTagName('script');
var len = scripts.length;
var i = 0;
while(i<len){
if(/catiline(\.min)?\.js/.test(scripts[i].src)){
return scripts[i].src;
}
i++;
}
}
function appendScript(iDoc,text){
var iScript = iDoc.createElement('script');
if (typeof iScript.text !== 'undefined') {
iScript.text = text;
} else {
iScript.innerHTML = text;
}
if(iDoc.readyState==='complete'){
iDoc.documentElement.appendChild(iScript);
}else{
iDoc.onreadystatechange=function(){
if(iDoc.readyState==='complete'){
iDoc.documentElement.appendChild(iScript);
}
};
}
}
//much of the iframe stuff inspired by https://github.com/padolsey/operative
//mos tthings besides the names have since been changed
function actualMakeI(script,codeword){
var iFrame = document.createElement('iframe');
iFrame.style.display = 'none';
document.body.appendChild(iFrame);
var iWin = iFrame.contentWindow;
var iDoc = iWin.document;
var text=['try{ ',
'var __scripts__=\'\';function importScripts(scripts){',
' if(Array.isArray(scripts)&&scripts.length>0){',
' scripts.forEach(function(url){',
' var ajax = new XMLHttpRequest();',
' ajax.open(\'GET\',url,false);',
' ajax.send();__scripts__+=ajax.responseText;',
' __scripts__+=\'\\n;\';',
' });',
' }',
'};',
script,
'}catch(e){',
' window.parent.postMessage([\''+codeword+'\',\'error\'],\'*\')',
'}'].join('\n');
appendScript(iDoc,text);
return iFrame;
}
function makeIframe(script,codeword){
var promise = catiline.deferred();
if(document.readyState==='complete'){
promise.resolve(actualMakeI(script,codeword));
}else{
window.addEventListener('load',function(){
promise.resolve(actualMakeI(script,codeword));
},false);
}
return promise.promise;
}
catiline.makeIWorker = function (strings,codeword){
var script =moveIimports(strings.join(''));
var worker = {onmessage:function(){}};
var ipromise = makeIframe(script,codeword);
window.addEventListener('message',function(e){
if(typeof e.data ==='string'&&e.data.length>codeword.length&&e.data.slice(0,codeword.length)===codeword){
worker.onmessage({data:JSON.parse(e.data.slice(codeword.length))});
}
});
worker.postMessage=function(data){
ipromise.then(function(iFrame){
iFrame.contentWindow.postMessage(JSON.stringify(data),'*');
});
};
worker.terminate=function(){
ipromise.then(function(iFrame){
document.body.removeChild(iFrame);
});
};
return worker;
};
//accepts an array of strings, joins them, and turns them into a worker.
function makeFallbackWorker(script){
catiline._noTransferable=true;
var worker = new Worker(getPath());
worker.postMessage(script);
return worker;
}
catiline.makeWorker = function (strings, codeword){
if(!catiline._hasWorker){
return catiline.makeIWorker(strings,codeword);
}
var worker;
var script =moveImports(strings.join(''));
if(catiline._noTransferable){
return makeFallbackWorker(script);
}
try{
worker= new Worker(catiline.URL.createObjectURL(new Blob([script],{type: 'text/javascript'})));
}catch(e){
try{
worker=makeFallbackWorker(script);
}catch(ee){
worker = catiline.makeIWorker(strings,codeword);
}
}finally{
return worker;
}
};
catiline.makeUrl = function (fileName) {
var link = document.createElement('link');
link.href = fileName;
return link.href;
};
catiline.Worker = function Catiline(obj) {
if(typeof obj === 'function'){
obj = {
data:obj
};
}
var __codeWord__='com.catilinejs.'+(catiline._hasWorker?'iframe':'worker')+Math.random();
var listeners = {};
var self = this;
self.on = function (eventName, func, scope) {
scope = scope || self;
if (eventName.indexOf(' ') > 0) {
eventName.split(' ').map(function (v) {
return self.on(v, func, scope);
}, this);
return self;
}
if (!(eventName in listeners)) {
listeners[eventName] = [];
}
listeners[eventName].push(function (a) {
func.call(scope, a);
});
return self;
};
function _fire(eventName, data) {
if (eventName.indexOf(' ') > 0) {
eventName.split(' ').forEach(function (v) {
_fire(v, data);
});
return self;
}
if (!(eventName in listeners)) {
return self;
}
listeners[eventName].forEach(function (v) {
v(data);
});
return self;
}
self.fire = function (eventName, data, transfer) {
if(catiline._noTransferable){
worker.postMessage([[eventName], data]);
}else{
worker.postMessage([[eventName], data], transfer);
}
return self;
};
self.off = function (eventName, func) {
if (eventName.indexOf(' ') > 0) {
eventName.split(' ').map(function (v) {
return self.off(v, func);
});
return self;
}
if (!(eventName in listeners)) {
return self;
}
else if (!func) {
delete listeners[eventName];
}
else {
if (listeners[eventName].indexOf(func) > -1) {
if (listeners[eventName].length > 1) {
delete listeners[eventName];
}
else {
listeners[eventName].splice(listeners[eventName].indexOf(func), 1);
}
}
}
return self;
};
var i = 0;
var promises = [];
var rejectPromises = function (msg) {
if (typeof msg !== 'string' && 'preventDefault' in msg) {
msg.preventDefault();
msg = msg.message;
}
promises.forEach(function (p) {
if (p) {
p.reject(msg);
}
});
};
obj.__codeWord__='"'+__codeWord__+'"';
if (!('initialize' in obj)) {
if ('init' in obj) {
obj.initialize = obj.init;
}
else {
obj.initialize = function () {};
}
}
var fObj = '{\n\t';
var keyFunc = function (key) {
var out = function (data, transfer) {
var i = promises.length;
promises[i] = catiline.deferred();
if(catiline._noTransferable){
worker.postMessage([[__codeWord__, i], key, data]);
}else{
worker.postMessage([[__codeWord__, i], key, data], transfer);
}
return promises[i].promise;
};
return out;
};
for (var key in obj) {
if (i !== 0) {
fObj = fObj + ',\n\t';
}
else {
i++;
}
fObj = fObj + key + ':' + obj[key].toString();
self[key] = keyFunc(key);
}
fObj = fObj + '}';
var worker = catiline.makeWorker(['\'use strict\';\n\nvar _db = ',fObj,';\nvar listeners = {};\nvar __iFrame__ = typeof document!=="undefined";\nvar __self__={onmessage:function(e){\n _fire("messege",e.data[1]);\n if(e.data[0][0]===_db.__codeWord__){\n return regMsg(e);\n }else{\n _fire(e.data[0][0],e.data[1]);\n }\n}};\nif(__iFrame__){\n window.onmessage=function(e){\n if(typeof e.data === "string"){\n e ={data: JSON.parse(e.data)};\n }\n __self__.onmessage(e);\n };\n}else{\n self.onmessage=__self__.onmessage;\n}\n__self__.postMessage=function(rawData, transfer){\n var data;\n if(!self._noTransferable&&!__iFrame__){\n self.postMessage(rawData, transfer);\n }else if(__iFrame__){\n data = _db.__codeWord__+JSON.stringify(rawData);\n window.parent.postMessage(data,"*");\n }else if(self._noTransferable){\n self.postMessage(rawData);\n }\n};\n_db.on = function (eventName, func, scope) {\n if(eventName.indexOf(" ")>0){\n return eventName.split(" ").map(function(v){\n return _db.on(v,func,scope);\n },_db);\n }\n scope = scope || _db;\n if (!(eventName in listeners)) {\n listeners[eventName] = [];\n }\n listeners[eventName].push(function (a) {\n func.call(scope, a, _db);\n });\n};\nfunction _fire(eventName,data){\n if(eventName.indexOf(" ")>0){\n eventName.split(" ").forEach(function(v){\n _fire(v,data);\n });\n return;\n }\n if (!(eventName in listeners)) {\n return;\n }\n listeners[eventName].forEach(function (v) {\n v(data);\n });\n}\n\n_db.fire = function (eventName, data, transfer) {\n __self__.postMessage([[eventName], data], transfer);\n};\n_db.off=function(eventName,func){\n if(eventName.indexOf(" ")>0){\n return eventName.split(" ").map(function(v){\n return _db.off(v,func);\n });\n }\n if(!(eventName in listeners)){\n return;\n }else if(!func){\n delete listeners[eventName];\n }else{\n if(listeners[eventName].indexOf(func)>-1){\n if(listeners[eventName].length>1){\n delete listeners[eventName];\n }else{\n listeners[eventName].splice(listeners[eventName].indexOf(func),1);\n }\n }\n }\n};\nvar console={};\nfunction makeConsole(method){\n return function(){\n var len = arguments.length;\n var out =[];\n var i = 0;\n while (i<len){\n out.push(arguments[i]);\n i++;\n }\n _db.fire("console",[method,out]);\n };\n}\n["log", "debug", "error", "info", "warn", "time", "timeEnd"].forEach(function(v){\n console[v]=makeConsole(v);\n});\nvar regMsg = function(e){\n var cb=function(data,transfer){\n __self__.postMessage([e.data[0],data],transfer);\n };\n var result;\n if(__iFrame__){\n try{\n result = _db[e.data[1]](e.data[2],cb,_db);\n }catch(e){\n _db.fire("error",JSON.stringify(e));\n }\n }else{\n result = _db[e.data[1]](e.data[2],cb,_db);\n }\n if(typeof result !== "undefined"){\n cb(result);\n }\n};\n_db.initialize(_db);\n'],__codeWord__);
worker.onmessage = function (e) {
_fire('message', e.data[1]);
if (e.data[0][0] === __codeWord__) {
promises[e.data[0][1]].resolve(e.data[1]);
promises[e.data[0][1]] = 0;
}
else {
_fire(e.data[0][0], e.data[1]);
}
};
self.on('error',rejectPromises);
worker.onerror = function (e) {
_fire('error', e);
};
self.on('console', function (msg) {
console[msg[0]].apply(console, msg[1]);
});
self._close = function () {
worker.terminate();
rejectPromises('closed');
return catiline.resolve();
};
if (!('close' in self)) {
self.close = self._close;
}
};
catiline.worker = function (obj){
return new catiline.Worker(obj);
};
catiline.Queue = function CatilineQueue(obj, n, dumb) {
var self = this;
self.__batchcb__ = {};
self.__batchtcb__ = {};
self.batch = function (cb) {
if (typeof cb === 'function') {
self.__batchcb__.__cb__ = cb;
return self.__batchcb__;
}
else {
return clearQueue(cb);
}
};
self.batchTransfer = function (cb) {
if (typeof cb === 'function') {
self.__batchtcb__.__cb__ = cb;
return self.__batchtcb__;
}
else {
return clearQueue(cb);
}
};
var workers = new Array(n);
var numIdle = 0;
var idle = [];
var que = [];
var queueLen = 0;
while (numIdle < n) {
workers[numIdle] = new catiline.Worker(obj);
idle.push(numIdle);
numIdle++;
}
self.on = function (eventName, func, context) {
workers.forEach(function (worker) {
worker.on(eventName, func, context);
});
return self;
};
self.off = function (eventName, func, context) {
workers.forEach(function (worker) {
worker.off(eventName, func, context);
});
return self;
};
var batchFire = function (eventName, data) {
workers.forEach(function (worker) {
worker.fire(eventName, data);
});
return self;
};
self.fire = function (eventName, data) {
workers[~~ (Math.random() * n)].fire(eventName, data);
return self;
};
self.batch.fire = batchFire;
self.batchTransfer.fire = batchFire;
function clearQueue(mgs) {
mgs = mgs || 'canceled';
queueLen = 0;
var oQ = que;
que = [];
oQ.forEach(function (p) {
p[3].reject(mgs);
});
return self;
}
function keyFunc(k) {
return function (data, transfer) {
return doStuff(k, data, transfer);
};
}
function keyFuncBatch(k) {
return function (array) {
return catiline.all(array.map(function (data) {
return doStuff(k, data);
}));
};
}
function keyFuncBatchCB(k) {
return function (array) {
var self = this;
return catiline.all(array.map(function (data) {
return doStuff(k, data).then(self.__cb__);
}));
};
}
function keyFuncBatchTransfer(k) {
return function (array) {
return catiline.all(array.map(function (data) {
return doStuff(k, data[0], data[1]);
}));
};
}
function keyFuncBatchTransferCB(k) {
return function (array) {
var self = this;
return catiline.all(array.map(function (data) {
return doStuff(k, data[0], data[1]).then(self.__cb__);
}));
};
}
for (var key in obj) {
self[key] = keyFunc(key);
self.batch[key] = keyFuncBatch(key);
self.__batchcb__[key] = keyFuncBatchCB(key);
self.batchTransfer[key] = keyFuncBatchTransfer(key);
self.__batchtcb__[key] = keyFuncBatchTransferCB(key);
}
function done(num) {
var data;
if (queueLen) {
data = que.shift();
queueLen--;
workers[num][data[0]](data[1], data[2]).then(function (d) {
done(num);
data[3].resolve(d);
}, function (d) {
done(num);
data[3].reject(d);
});
}
else {
numIdle++;
idle.push(num);
}
}
function doStuff(key, data, transfer) { //srsly better name!
if (dumb) {
return workers[~~ (Math.random() * n)][key](data, transfer);
}
var promise = catiline.deferred(),
num;
if (!queueLen && numIdle) {
num = idle.pop();
numIdle--;
workers[num][key](data, transfer).then(function (d) {
done(num);
promise.resolve(d);
}, function (d) {
done(num);
promise.reject(d);
});
}
else if (queueLen || !numIdle) {
queueLen = que.push([key, data, transfer, promise]);
}
return promise.promise;
}
self._close = function () {
return catiline.all(workers.map(function (w) {
return w._close();
}));
};
if (!('close' in self)) {
self.close = self._close;
}
};
catiline.queue = function (obj, n, dumb) {
return new catiline.Queue(obj, n, dumb);
};
function catiline(object,queueLength,unmanaged){
if(arguments.length === 1 || !queueLength || queueLength <= 1){
return new catiline.Worker(object);
}else{
return new catiline.Queue(object,queueLength,unmanaged);
}
}
function initBrowser(catiline){
var origCW = global.cw;
catiline.noConflict=function(newName){
global.cw = origCW;
if(newName){
global[newName]=catiline;
}
};
global.catiline = catiline;
global.cw = catiline;
if(!('communist' in global)){
global.communist=catiline;
}
}
if(typeof define === 'function'){
define(function(require){
catiline.SHIM_WORKER_PATH=require.toUrl('./catiline.js');
return catiline;
});
}else if(typeof module === 'undefined' || !('exports' in module)){
initBrowser(catiline);
} else {
module.exports=catiline;
}
catiline.version = '2.4.2';
})(this);}
\ No newline at end of file
javascript/leaflet.shpfile.js 0 → 100644
+ 63
− 0
View file @ 79207bd4
'use strict';
/* global cw, shp */
L.Shapefile = L.GeoJSON.extend({
options: {
importUrl: 'javascript/shp.js'
},
initialize: function(file, options) {
L.Util.setOptions(this, options);
if (typeof cw !== 'undefined') {
/*eslint-disable no-new-func*/
if (!options.isArrayBuffer) {
this.worker = cw(new Function('data', 'cb', 'importScripts("' + this.options.importUrl + '");shp(data).then(cb);'));
} else {
this.worker = cw(new Function('data', 'importScripts("' + this.options.importUrl + '"); return shp.parseZip(data);'));
}
/*eslint-enable no-new-func*/
}
L.GeoJSON.prototype.initialize.call(this, {
features: []
}, options);
this.addFileData(file);
},
addFileData: function(file) {
var self = this;
this.fire('data:loading');
if (typeof file !== 'string' && !('byteLength' in file)) {
var data = this.addData(file);
this.fire('data:loaded');
return data;
}
if (!this.worker) {
shp(file).then(function(data) {
self.addData(data);
self.fire('data:loaded');
}).catch(function(err) {
self.fire('data:error', err);
})
return this;
}
var promise;
if (this.options.isArrayBufer) {
promise = this.worker.data(file, [file]);
} else {
promise = this.worker.data(cw.makeUrl(file));
}
promise.then(function(data) {
self.addData(data);
self.fire('data:loaded');
self.worker.close();
}).then(function() {}, function(err) {
self.fire('data:error', err);
})
return this;
}
});
L.shapefile = function(a, b, c) {
return new L.Shapefile(a, b, c);
};
javascript/map.js
+ 23
− 6
View file @ 79207bd4
// Bestemme URL til basiskartet:
var osm_map = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright"<OpenStreetMap</a> contributors'
});
// Initialiserer kartet: // Initialiserer kartet:
var map = L.map('map', { var map = L.map('map', {
layers: [osm_map], // Default basiskart
maxZoom: 18, // Justerer zoom-nivået maxZoom: 18, // Justerer zoom-nivået
minZoom: 6, minZoom: 6,
zoomControl: false, // Fjerner default zoom-knapper zoomControl: false, // Fjerner default zoom-knapper
}).setView([63.418529, 10.40284], 13) }).setView([63.418529, 10.40284], 13)
// Bestemme URL til basiskartet:
var osm_map = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright"<OpenStreetMap</a> contributors'
});
// Google Map layer:
var googleSat = L.tileLayer('http://{s}.google.com/vt/lyrs=s&x={x}&y={y}&z={z}',{
subdomains:['mt0','mt1','mt2','mt3']
});
osm_map.addTo(map);
googleSat.addTo(map);
// Legger til zoom-knapper på egnet sted // Legger til zoom-knapper på egnet sted
L.control.zoom({ L.control.zoom({
position:'topright' position:'topright'
}).addTo(map); }).addTo(map);
// Layer control:
var baselayers = {
"OpenStreetMap": osm_map,
"Satellite": googleSat
}
L.control.layers(baselayers).addTo(map)
/* Activate and deactivate interactions in the leaflet map*/ /* Activate and deactivate interactions in the leaflet map*/
function deactivateMap() { function deactivateMap() {
......
javascript/openFileFromExplorer.js 0 → 100644
+ 32
− 0
View file @ 79207bd4
const clickOpen = document.getElementById("clickOpen"); // Knappen vi gir funksjonalitet
const dialog = document.getElementById("dialog"); // Input-feltet vi har skjult, men som lagrer dataen som velges
function clickMe() {
dialog.click();
}
dialog.addEventListener("input", () => {
if (dialog.files.length) {
for (i = 0; i < dialog.files.length; i++) {
document.getElementById("layers").innerHTML = dialog.files[i].name;
}
}
});
var geo = L.geoJson({features:[]}, {
onEachFeature: function popUp(f, l) {
var out = [];
if (f.properties){
for(var key in f.properties){
out.push(key + ": " + f.properties[key]);
}
l.bindPopup(out.join("<br />"));
}
}
}).addTo(map);
var base = 'vann.zip';
shp(base).then(function(data){
geo.addData(data);
});
javascript/shp.js 0 → 100644
+ 17726
− 0
View file @ 79207bd4
Source diff could not be displayed: it is too large. Options to address this: view the blob.
javascript/vann.zip 0 → 100644
+ 0
− 0
View file @ 79207bd4
File added
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