Fix the layers' clipping.

Goutte
1 parent 36fb9368
Showing 4 changed files with 12 additions and 4 deletions Show diff stats
CHANGELOG.md
web/run.py
web/static/js/swapp.js
web/static/js/swapp.ls
@@ -40,6 +40,12 @@ et prendre aussi
 - [ ] Layer : Auroral Emissions
+## 1.3.1
+
+- [x] Disable Earth again
+- [x] Fix the layers being shown outside the clipping area in the time series
+
+
 ## 1.3
 - [x] Earth pdyn = pv² (TBD)
@@ -22,6 +22,7 @@ from jinja2 import Environment, FileSystemLoader, Markup
 from netCDF4 import Dataset, date2num
 from yaml import load as yaml_load
+
 # PATH RELATIVITY #############################################################
 THIS_DIRECTORY = dirname(abspath(__file__))
@@ -559,11 +559,11 @@
       this.plotWrapper.attr('transform', 'translate(' + this.margin.left + ',' + this.margin.top + ')');
       clipId = "ts-clip-" + this.parameter + "-" + this.target.slug;
       this.clip = this.svg.append("defs").append("svg:clipPath").attr("id", clipId).append("svg:rect").attr("x", 0).attr("y", 0);
-      this.createCatalogLayers();
       this.pathWrapper = this.plotWrapper.append('g');
       this.pathWrapper.attr("clip-path", "url(#" + clipId + ")");
       this.path = this.pathWrapper.append('path').datum(this.data).classed('line', true);
       this.predictiveDataPath = this.pathWrapper.append('path').datum(this.predictiveData).classed('predictive-line', true);
+      this.createCatalogLayers();
       this.horizontalLines = [];
       if (this.options['horizontalLines']) {
         for (i$ = 0, len$ = (ref$ = this.options['horizontalLines']).length; i$ < len$; ++i$) {
@@ -749,7 +749,7 @@
     };
     TimeSeries.prototype.createCatalogLayer = function(started_at, stopped_at){
       var layer_rect;
-      layer_rect = this.plotWrapper.append("rect").attr('y', 0).attr('height', this.plotHeight).attr('fill', '#FFFD64C2');
+      layer_rect = this.pathWrapper.append("rect").attr('y', 0).attr('height', this.plotHeight).attr('fill', '#FFFD64C2');
       return layer_rect;
     };
     TimeSeries.prototype.resizeCatalogLayers = function(){
@@ -446,7 +446,6 @@ export class TimeSeries
                 .attr("x", 0)
                 .attr("y", 0)
-    @createCatalogLayers()
     @pathWrapper = @plotWrapper.append('g')
     @pathWrapper.attr("clip-path", "url(\##{clipId})")
@@ -457,6 +456,8 @@ export class TimeSeries
                                       .datum(@predictiveData)
                                       .classed('predictive-line', true)
+    @createCatalogLayers()
+
     @horizontalLines = []
     if @options['horizontalLines']
       for line in @options['horizontalLines']
@@ -671,7 +672,7 @@ export class TimeSeries
     this
   createCatalogLayer: (started_at, stopped_at) ->
-    layer_rect = @plotWrapper.append("rect")
+    layer_rect = @pathWrapper.append("rect")
                              .attr('y', 0)
                              .attr('height', @plotHeight)
                              .attr('fill', '#FFFD64C2')