clean up

mbforr · Sep 10, 2018 · ade2ec5 · ade2ec5
1 parent 06c543f
commit ade2ec5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@carto/airship": "^1.0.0-alpha.14",
     "@carto/airship-icons": "^1.0.0-alpha-27.0",
     "@carto/airship-style": "1.0.0-alpha.37",
-    "@carto/carto.js": "^4.0.8",
+    "@carto/carto.js": "^4.1.6",
     "axios": "^0.18.0",
     "babel-cli": "6.24.1",
     "babel-core": "6.25.0",

diff --git a/public/dist/bundle.js b/public/dist/bundle.js
diff --git a/public/dist/bundle.js.map b/public/dist/bundle.js.map
diff --git a/src/actions/mapsettings.js b/src/actions/mapsettings.js
diff --git a/src/components/RightBar.js b/src/components/RightBar.js
@@ -28,7 +28,7 @@ class RightBar extends Component {
         operation={carto.operation.SUM}
         operationColumn='total_damage'
       />
-    
+
       <Histogram />
       </div>
     )

diff --git a/src/components/widgets/Histogram.js b/src/components/widgets/Histogram.js
@@ -62,15 +62,16 @@ class Histogram extends Component {
    const filter = new carto.filter.Range('rr_employees_injured', { between: { min, max } });
    this.props.layers.railaccidents.source.addFilter(filter);
    this.setState({ filter: filter });
-   console.log('CREATE!!!!', filter._filters.between)
+   console.log('CREATE!!!!', filter._filters.between) //CHECK HERE CHECK HERE CHECK HERE
 
  }
 
  updateFilter() {
+   //console.log(this.state.layers.railaccidents.source._appliedFilters._filters)
    const { range, filter } = this.state
    const min = range[0]
    const max = range[1]
-   console.log('UPDATE!!!!', filter._filters.between, this.state.filter._filters.between, this.state.range)
+   console.log('UPDATE!!!!', filter._filters.between, this.state.filter._filters.between, this.state.range)  //CHECK HERE CHECK HERE CHECK HERE
    filter.setFilters({ between: { min, max } });
  }
 
@@ -105,9 +106,12 @@ class Histogram extends Component {
   }
 
 
+
+
   render() {
     const { data } = this.state;
 
+
     return (
       <as-histogram-widget
         ref={node => { this.widget = node; }}

diff --git a/yarn.lock b/yarn.lock
@@ -43,9 +43,9 @@
     react-day-picker "^7.1.4"
     react-emotion "^9.0.1"
 
-"@carto/carto.js@^4.0.8":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@carto/carto.js/-/carto.js-4.1.3.tgz#26aecb1dac88e27987d1a81c2f6d48c34cd920a9"
+"@carto/carto.js@^4.1.6":
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/@carto/carto.js/-/carto.js-4.1.6.tgz#b1b5c5b8fd42b6f1b1a1a874c31b5455fb082c93"
   dependencies:
     "@carto/zera" "1.0.7"
     backbone "1.2.3"
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ class RightBar extends Component { @@
             operation={carto.operation.SUM}
             operationColumn='total_damage'
           />
           <Histogram />
           </div>
         )
@@ Expand Down @@