eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-21 11:40:01 +00:00
Code Activity

Merge branch 'master' into translation

Browse Source
This commit is contained in:
Axel Uhl committed 2017-10-25 23:51:10 +02:00
2 parents 1bcf6b1b78 e57dd8a7a2
commit 5d0befd2b1
40 files changed
+62 -1501
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+2 -2
View File
@@ -24,8 +24,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.freg.resultimport,
com.sap.sailing.domain.swisstimingreplayadapter,
com.sap.sailing.simulator,
com.google.gwt.user;bundle-version="2.8.1";resolution:=optional,
com.google.gwt.servlet;bundle-version="2.8.1",
com.google.gwt.user;bundle-version="2.8.2";resolution:=optional,
com.google.gwt.servlet;bundle-version="2.8.2",
com.sap.sailing.domain.igtimiadapter,
com.sap.sailing.xrr.resultimport,
com.sap.sailing.datamining.shared,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class WindStreamletsCanvasOverlay extends FullCanvasOverlay implements Ti
macroWeather = false;
SimulatorJSBundle bundle = GWT.create(SimulatorJSBundle.class);
String jsonStr = bundle.windStreamletsDataJS().getText();
RectField f = RectField.read(jsonStr.substring(19, jsonStr.length() - 1), false, streamletPars, coordinateSystem);
RectField f = RectField.read(jsonStr, false, streamletPars, coordinateSystem);
map.setZoom(5);
map.panTo(f.getCenter());
this.swarm = new Swarm(this, map, timer, f, streamletPars);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/RectField.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class RectField implements VectorField {
}
public static RectField read(String jsonData, boolean correctForSphere, StreamletParameters parameters, CoordinateSystem coordinateSystem) {
JSONObject data = JSONParser.parseLenient(jsonData).isObject();
JSONObject data = JSONParser.parseStrict(jsonData).isObject();
int w = (int) data.get("gridWidth").isNumber().doubleValue();
int h = (int) data.get("gridHeight").isNumber().doubleValue();
Vector[][] field = new Vector[w][h];
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/wind-data.js
+10 -10
View File
@@ -1,12 +1,12 @@
var swarmDataExt = {
timestamp: "1:55 pm on March 22, 2014",
x0: -130.103438,
y0: 20.191999,
x1: -60.885558,
y1: 52.807669,
gridWidth: 501.0,
gridHeight: 237.0,
field: [
{
"timestamp": "1:55 pm on March 22, 2014",
"x0": -130.103438,
"y0": 20.191999,
"x1": -60.885558,
"y1": 52.807669,
"gridWidth": 501.0,
"gridHeight": 237.0,
"field": [
0,0,
0,0,
0,0,
@@ -118745,4 +118745,4 @@ field: [
0,0,
0,0
]
};
}