Merge pull request #66 from sharmalab/feature_state_share

updated sharable url and added geochoropleth state code
sharmalab · Jan 30, 2018 · b69b213 · b69b213
2 parents 535d346 + 694236a
commit b69b213
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/public/javascripts/src/components/Navbar.jsx b/public/javascripts/src/components/Navbar.jsx
@@ -77,6 +77,9 @@ var NavBar = React.createClass({
               {self.state.showSharedUrl ?
               <div id="shareurldiv">
               <Modal.Dialog>
+                <Modal.Header>
+                  <Modal.Title>Sharable URL</Modal.Title>
+                </Modal.Header>
                 <Modal.Body>
                   URL copied to clipboard!
                   <FormControl value={shareurl} type="text" />

diff --git a/public/javascripts/src/components/Visualizations/GeoChoroplethMap.jsx b/public/javascripts/src/components/Visualizations/GeoChoroplethMap.jsx
@@ -56,9 +56,6 @@ var GeoChoroplethMap = React.createClass({
         var group = {
             all: function () {
                 return self.props.currData[attributeName].values;
-            },
-            order: function () {
-
             },
             top: function () {
                 return self.props.currData[attributeName].values;
@@ -97,14 +94,24 @@ var GeoChoroplethMap = React.createClass({
                     .title(function (d) {
                         return attributeName + ": " + d.key + "\nNo: " + (d.value ? d.value : 0);
                     });
-
             geo.filterHandler(function(dimension, filters){
                 if(filters)
                     dimension.filter(filters);
                 else
                     dimension.filter(null);
                 return filters;
             });
+            /*
+            var filter = JSON.parse(self.getUrlParam("filter"));
+            console.log(filter);
+            console.log("geo");
+            console.log(filter["Origin_State"]);
+            if(filter["Origin_State"]){
+              console.log("geo filter");
+              geo.filter(filter);             
+            }
+            */
+
 
             dc.renderAll();
             self.setState({chart: geo, dimension: dim, group: group});
@@ -117,6 +124,11 @@ var GeoChoroplethMap = React.createClass({
         this.state.chart.filterAll();
         this.changeFilterState(false);
     },
+    getUrlParam: function (name){
+      if(name=(new RegExp('[?&]'+encodeURIComponent(name)+'=([^&]*)')).exec(location.search)){
+        return decodeURIComponent(name[1]);
+      }
+    },   
     render: function () {
         /* the color domain needs to be assigned with every render in case the data changed */
         if (this.state.group) {
@@ -140,6 +152,7 @@ var GeoChoroplethMap = React.createClass({
         if (queryFilter[attributeName]) {
             queryString = queryFilter[attributeName].toString();
         }
+        console.log(queryString);
 
         return(
             <div id="geo">