always use m instead of cm, use lambda api

openearth · May 6, 2017 · 7ddcc15 · 7ddcc15
1 parent e04e53a
commit 7ddcc15
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 19 deletions.
diff --git a/app/data/models.json b/app/data/models.json
@@ -7,7 +7,8 @@
       "engine": "Delft3D Flow",
       "timeseries": "data/timeseries/dcsm.json",
       "realtime": {
-        "points": "data/points"
+        "points": "https://tr4e0lb583.execute-api.us-east-1.amazonaws.com/dev/points",
+        "details": "https://tr4e0lb583.execute-api.us-east-1.amazonaws.com/dev/details/${location}"
       },
       "uv": {
         "src": "models/movies/dcsm.mp4",
@@ -24,8 +25,7 @@
       "extent": {
         "sw": [49.264198303222656, -3.877345323562622],
         "ne": [57.1629943847656, 9.84266757965088],
-        "time": ["2016-12-20T20:40:00Z", "2016-12-28T20:40:00Z"],
-        "waterlevel": [-2, 5]
+        "time": ["2017-05-01T20:40:00Z", "2017-05-08T20:40:00Z"]
       },
       "view": {
         "zoom": 7,

diff --git a/app/scripts/chart.js b/app/scripts/chart.js
@@ -31,10 +31,26 @@
           // data is in the feature
           Vue.set(this, 'series', [feature.properties.series]);
         } else {
-          var url = 'data/details/' + _.get(feature, 'properties.locationCode', feature.id);
+          // get the url
+          let url = _.get(
+            this.model,
+            'realtime.details',
+            'data/details/${location}'
+          );
+
+          let location = _.get(feature, 'properties.locationCode', feature.id);
+
+          // we have a template url
+          if (_.includes(url, '${location}')) {
+            // fill in template
+            url = _.template(url)({location: location});
+          }
+
+          // we have a repository
           if (this.repository !== '') {
-            url = urljoin(this.repository, 'data/details', feature.id);
+            url = urljoin(this.repository, url);
           }
+
           fetch(url)
             .then((resp)=>{
               return resp.json();
@@ -105,10 +121,19 @@
 
         var xDomain = _.map(this.model.extent.time, d3.isoParse);
         this.chart.xTime.domain(xDomain);
-        this.chart.yWaterlevel.domain(_.get(this.model.extent, 'waterlevel', [0, 1]));
+        var values = _.flatMap(_.flatMap(this.series, 'data'), 'value');
+        var extent = d3.extent(values);
+        var yDomain = _.get(
+          this.model.extent,
+          'waterlevel',
+          extent
+        );
+        this.chart.yWaterlevel.domain(yDomain);
         this.chart.xAxis
+          .transition()
           .call(d3.axisBottom(this.chart.xTime));
         this.chart.yAxis
+          .transition()
           .call(
             d3.axisLeft(this.chart.yWaterlevel)
               .ticks(5)
@@ -136,9 +161,9 @@
             return this.chart.xTime(t0);
           })
           .attr('y', (d) => {
-            var y = this.model.extent.waterlevel[1];
+            var y = yDomain[1];
             if (!_.isNil(d.to)) {
-              y = d.to / 100.0;
+              y = d.to;
             }
             return this.chart.yWaterlevel(y);
           })
@@ -149,13 +174,13 @@
             return width;
           })
           .attr('height', (d) => {
-            var y0 = this.model.extent.waterlevel[0];
+            var y0 = yDomain[0];
             if (!_.isNil(d.from)) {
-              y0 = d.from / 100.0;
+              y0 = d.from;
             }
-            var y1 = this.model.extent.waterlevel[1];
+            var y1 = yDomain[1];
             if (!_.isNil(d.to)) {
-              y1 = d.to / 100.0;
+              y1 = d.to;
             }
             var height = this.chart.yWaterlevel(y0) - this.chart.yWaterlevel(y1);
             if (height < 0) {
@@ -184,7 +209,7 @@
               return x;
             })
             .y((d) => {
-              var y = this.chart.yWaterlevel(d.s1 || d.value / 100.0);
+              var y = this.chart.yWaterlevel(d.s1 || d.value);
               // cm/m
               return y;
             });

diff --git a/app/scripts/realtime.js b/app/scripts/realtime.js
@@ -57,14 +57,23 @@
     },
     methods: {
       fetchPoints() {
-        var url = 'data/points';
+
+        if (_.isNil(this.model)) {
+          // no model yet, wait for watch
+          return;
+        }
+
+        let url = _.get(
+          this.model,
+          'realtime.points',
+          'data/points'
+        );
+
+        // we have a repository
         if (this.repository !== '') {
-          if (_.isNil(this.model)) {
-            // no model yet, wait for watch
-            return;
-          }
-          url = urljoin(this.repository, this.model.realtime.points);
+          url = urljoin(this.repository, url);
         }
+
         fetch(url)
           .then((resp) => {
             return resp.json();