Commit 983792c8 authored by Pettersson Tomas's avatar Pettersson Tomas

recode

parent 72c1916b
......@@ -402,12 +402,14 @@ var EXTrajectory = (function (_super) {
self.endDateInput.onchange = function (evt) {
var date = moment.utc(self.endDateInput.value + ' ' + self.endTimeInput.value, self.datetimeFormat);
self.to = date.clone();
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.refreshTrajectory();
self.fireChangeFn(self);
};
self.endTimeInput.onchange = function (evt) {
var date = moment.utc(self.endDateInput.value + ' ' + self.endTimeInput.value, self.datetimeFormat);
self.to = date.clone();
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.refreshTrajectory();
self.fireChangeFn(self);
};
positionDiv.guideFn = function () {
var geojson = {};
......@@ -450,25 +452,8 @@ var EXTrajectory = (function (_super) {
map.on('draw:created', function (e) {
var type = e.layerType, layer = e.layer;
if (type == 'draw' + id) {
var trajlinefeature = layer.toGeoJSON();
if ((trajlinefeature.geometry) && (trajlinefeature.geometry.coordinates.length > 2)) {
self.trajlength = trajlinefeature.geometry.coordinates.length;
self.setTimeIncrement() && self.setTime();
self.trajectoryLayer.addData(trajlinefeature);
self.trajpointfeaturecollection = STWkit.featurecollection();
for (var i = 0; i < self.time.length; i++) {
var trajpointfeature = STWkit.createFeature("Point");
trajpointfeature.geometry.coordinates = trajlinefeature.geometry.coordinates[i];
trajpointfeature.properties.time = self.time[i];
if (i == 0)
trajpointfeature.properties.start = true;
if (i == self.time.length - 1)
trajpointfeature.properties.end = true;
self.trajpointfeaturecollection.features.push(trajpointfeature);
}
self.trajectoryLabelLayer.addData(self.trajpointfeaturecollection);
self.updateTrajectoryLabelVisibility();
}
self.drawnfeature = layer.toGeoJSON();
self.refreshTrajectory();
var toggleevt = document.createEvent("CustomEvent");
toggleevt.initCustomEvent('container:toggleVisibility', false, false, {
'show': true
......@@ -579,18 +564,51 @@ var EXTrajectory = (function (_super) {
self.endDateInput.value = self.to.format(self.dateFormat);
self.endTimeInput.value = self.to.startOf('hour').format(self.timeFormat);
}
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.refreshTrajectory();
}
};
EXTrajectory.prototype.setTimeIncrement = function () {
this.timeIncrement = -1;
var len = this.trajlength;
if (len > 0) {
var diff = Math.abs(this.from - this.to);
this.timeIncrement = Math.round(((diff / 1000) / 60) / len);
return true;
EXTrajectory.prototype.refreshTrajectory = function () {
var self = this;
if (this.drawnfeature && this.drawnfeature.geometry && this.drawnfeature.geometry.coordinates.length > 2) {
self.trajMarkerArray = [];
self.trajectoryLayer.clearLayers();
self.trajectoryLabelLayer.clearLayers();
var timeIncrement = 15;
var currentlength = self.drawnfeature.geometry.coordinates.length;
var wantedTimeIncrementlength = Math.round(((Math.abs(this.from - this.to) / 1000) / 60) / timeIncrement);
var coords = self.drawnfeature.geometry.coordinates.slice(0);
while (coords.length < wantedTimeIncrementlength) {
// too small, add points
var index = self.getRandomInt(1, currentlength - 1);
coords.splice(index, 0, [coords[index][0], coords[index][1]]);
}
self.time = [];
var t = self.from.clone();
for (var i = 0; i < coords.length; i++) {
self.time.push(t.valueOf());
t = t.add(timeIncrement, 'm');
}
self.time[self.time.length - 1] = self.to.valueOf();
var trajfeature = STWkit.createFeature("LineString");
trajfeature.geometry.coordinates = coords;
self.trajectoryLayer.addData(trajfeature);
var trajpointfeaturecollection = STWkit.featurecollection();
for (var i = 0; i < coords.length; i++) {
var trajpointfeature = STWkit.createFeature("Point");
trajpointfeature.geometry.coordinates = coords[i];
trajpointfeature.properties.time = self.time[i];
if (i == 0)
trajpointfeature.properties.start = true;
if (i == self.time.length - 1)
trajpointfeature.properties.end = true;
trajpointfeaturecollection.features.push(trajpointfeature);
}
self.trajectoryLabelLayer.addData(trajpointfeaturecollection);
self.updateTrajectoryLabelVisibility();
}
return false;
};
EXTrajectory.prototype.getRandomInt = function (min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
};
EXTrajectory.prototype.setTime = function () {
var self = this;
......@@ -696,9 +714,6 @@ var EXTrajectory = (function (_super) {
self.trajMarkerArray = [];
if (self.lineHandler._enabled)
self.lineHandler.disable();
self.timeIncrement = -1;
self.trajlength = 0;
self.time = [];
if (self.nextButton)
STWkit.AccordionCard.enableNext(self.nextButton, false);
(self.oncallback && self.oncallback());
......
This diff is collapsed.
......@@ -410,6 +410,7 @@ class EXTrajectory extends STWkit.AccordionCard {
public oncallback: Function;
public lineButton: HTMLButtonElement;
private lineHandler : any;
private drawnfeature : any;
private trajectoryLayer : L.GeoJSON;
private trajectoryLabelLayer : any;
private trajMarkerArray : any[];
......@@ -419,9 +420,6 @@ class EXTrajectory extends STWkit.AccordionCard {
private time: any;
private from: any;
private to: any;
private trajlength: number;
private trajpointfeaturecollection: any;
private timeIncrement: number; // minutes
public nextButton: any;
endDateInput: HTMLInputElement;
endTimeInput: HTMLInputElement;
......@@ -471,17 +469,18 @@ class EXTrajectory extends STWkit.AccordionCard {
self.endDateInput.onchange = function (evt) {
var date = moment.utc(self.endDateInput.value + ' ' + self.endTimeInput.value, self.datetimeFormat);
self.to = date.clone();
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.to = date.clone();
self.refreshTrajectory();
self.fireChangeFn(self);
};
self.endTimeInput.onchange = function (evt) {
var date = moment.utc(self.endDateInput.value + ' ' + self.endTimeInput.value, self.datetimeFormat);
self.to = date.clone();
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.refreshTrajectory();
self.fireChangeFn(self);
};
positionDiv.guideFn = function () {
......@@ -531,25 +530,8 @@ class EXTrajectory extends STWkit.AccordionCard {
var type = e.layerType,
layer = e.layer;
if (type == 'draw'+id) {
var trajlinefeature = layer.toGeoJSON();
if ((trajlinefeature.geometry) && (trajlinefeature.geometry.coordinates.length > 2)) {
self.trajlength = trajlinefeature.geometry.coordinates.length;
self.setTimeIncrement() && self.setTime();
self.trajectoryLayer.addData(trajlinefeature);
self.trajpointfeaturecollection = STWkit.featurecollection();
for (var i = 0; i < self.time.length; i++) {
var trajpointfeature: any = STWkit.createFeature("Point");
trajpointfeature.geometry.coordinates = trajlinefeature.geometry.coordinates[i];
trajpointfeature.properties.time = self.time[i];
if (i == 0) trajpointfeature.properties.start = true;
if (i == self.time.length - 1) trajpointfeature.properties.end = true;
self.trajpointfeaturecollection.features.push(trajpointfeature);
}
self.trajectoryLabelLayer.addData(self.trajpointfeaturecollection);
self.updateTrajectoryLabelVisibility();
}
self.drawnfeature = layer.toGeoJSON();
self.refreshTrajectory();
var toggleevt = document.createEvent("CustomEvent");
toggleevt.initCustomEvent('container:toggleVisibility', false, false, {
'show': true
......@@ -671,19 +653,64 @@ class EXTrajectory extends STWkit.AccordionCard {
self.endDateInput.value = self.to.format(self.dateFormat);
self.endTimeInput.value = self.to.startOf('hour').format(self.timeFormat);
}
self.setTimeIncrement() && self.setTime() && self.updateTrajectoryLabelTimeValues();
self.refreshTrajectory();
}
}
private refreshTrajectory(){
var self = this;
private setTimeIncrement(){
this.timeIncrement = -1;
var len = this.trajlength;
if (len > 0) {
var diff = Math.abs(this.from - this.to);
this.timeIncrement = Math.round(((diff/1000)/60) / len);
return true;
if (this.drawnfeature && this.drawnfeature.geometry && this.drawnfeature.geometry.coordinates.length > 2) {
self.trajMarkerArray = [];
self.trajectoryLayer.clearLayers();
self.trajectoryLabelLayer.clearLayers();
var timeIncrement = 15;
var currentlength = self.drawnfeature.geometry.coordinates.length;
var wantedTimeIncrementlength = Math.round(((Math.abs(this.from - this.to)/1000)/60) / timeIncrement);
var coords = self.drawnfeature.geometry.coordinates.slice(0);
while(coords.length < wantedTimeIncrementlength) {
// too small, add points
var index = self.getRandomInt(1, currentlength-1);
coords.splice(index, 0, [coords[index][0], coords[index][1]]);
}
self.time = [];
var t = self.from.clone();
for (var i = 0; i < coords.length; i++) {
self.time.push(t.valueOf());
t = t.add(timeIncrement,'m');
}
self.time[self.time.length-1] = self.to.valueOf();
var trajfeature: any = STWkit.createFeature("LineString");
trajfeature.geometry.coordinates = coords;
self.trajectoryLayer.addData(trajfeature);
var trajpointfeaturecollection = STWkit.featurecollection();
for (var i = 0; i < coords.length; i++) {
var trajpointfeature: any = STWkit.createFeature("Point");
trajpointfeature.geometry.coordinates = coords[i];
trajpointfeature.properties.time = self.time[i];
if (i == 0) trajpointfeature.properties.start = true;
if (i == self.time.length - 1) trajpointfeature.properties.end = true;
trajpointfeaturecollection.features.push(trajpointfeature);
}
self.trajectoryLabelLayer.addData(trajpointfeaturecollection);
self.updateTrajectoryLabelVisibility();
}
return false;
}
private getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
public setTime() {
......@@ -793,9 +820,6 @@ class EXTrajectory extends STWkit.AccordionCard {
self.trajectoryLayer.clearLayers()
self.trajMarkerArray = [];
if (self.lineHandler._enabled) self.lineHandler.disable();
self.timeIncrement = -1;
self.trajlength = 0;
self.time = [];
if (self.nextButton) STWkit.AccordionCard.enableNext(self.nextButton, false);
(self.oncallback && self.oncallback());
}
......
......@@ -43,7 +43,7 @@ var L;
this.accordionDiv = L.DomUtil.create('div', 'uk-accordion', this.container);
var locationid = self.initials + 'locationCard';
self.cardMap[locationid] = new EXLocation(locationid, this.accordionDiv, self.lang, self.langData, map, self.forcing, self.obs, self.type, self.subtype, self.initials);
self.cardMap[locationid].show();
// self.cardMap[locationid].show();
var periodid = self.initials + 'periodCard';
var periodoptions = {};
periodoptions['type'] = this.type;
......@@ -62,11 +62,12 @@ var L;
var trajectoryid = self.initials + 'trajectoryCard';
self.cardMap[trajectoryid] = new EXTrajectory(trajectoryid, this.accordionDiv, self.lang, self.langData, map, self.domain, self.type, self.subtype, self.initials);
this.cardMap[periodid].addChangeFnListener(this.cardMap[trajectoryid]);
// self.cardMap[trajectoryid].show(); // comment out
this.cardMap[trajectoryid].addChangeFnListener(this.cardMap[periodid]);
self.cardMap[trajectoryid].show(); // comment out
_super.prototype.setup.call(this, map);
var chain = [];
chain[locationid] = periodid;
// chain[trajectoryid] = periodid; // comment out
// chain[locationid] = periodid;
chain[trajectoryid] = periodid; // comment out
chain[periodid] = oiltypeid;
chain[oiltypeid] = amountid;
chain[amountid] = trajectoryid;
......
{"version":3,"file":"leaflet-exercise-control.js","sourceRoot":"","sources":["leaflet-exercise-control.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"leaflet-exercise-control.js","sourceRoot":"","sources":["leaflet-exercise-control.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
......@@ -49,7 +49,7 @@ module L.Control {
this.accordionDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-accordion', this.container);
var locationid = self.initials+'locationCard';
self.cardMap[locationid] = new EXLocation(locationid, this.accordionDiv, self.lang, self.langData, map, self.forcing, self.obs, self.type, self.subtype, self.initials);
self.cardMap[locationid].show();
// self.cardMap[locationid].show();
var periodid = self.initials+'periodCard';
var periodoptions = {};
periodoptions['type'] = this.type;
......@@ -69,11 +69,12 @@ module L.Control {
var trajectoryid = self.initials+'trajectoryCard';
self.cardMap[trajectoryid] = new EXTrajectory(trajectoryid, this.accordionDiv, self.lang, self.langData, map, self.domain, self.type, self.subtype, self.initials);
this.cardMap[periodid].addChangeFnListener(this.cardMap[trajectoryid]);
// self.cardMap[trajectoryid].show(); // comment out
this.cardMap[trajectoryid].addChangeFnListener(this.cardMap[periodid]);
self.cardMap[trajectoryid].show(); // comment out
super.setup(map);
var chain = [];
chain[locationid] = periodid;
// chain[trajectoryid] = periodid; // comment out
// chain[locationid] = periodid;
chain[trajectoryid] = periodid; // comment out
chain[periodid] = oiltypeid;
chain[oiltypeid] = amountid;
......
Markdown is supported
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