Changeset 6514 in main

Timestamp:

06/04/14 18:56:19 (8 years ago)

Author:

Garth Braithwaite

Message:

view webapp - added equal grouping for maps.

Location:

trunk/ibisph-view/src/main/webapp

Files:

• WEB-INF/config/spring/https.xml (modified) (1 diff)
• js/jquery.leaflet.js (modified) (5 diffs)
• xslt/html/LeafletMapGraphic.xslt (modified) (1 diff)

trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/https.xml

@@ -17 +17 @@
         files that are served up on the vendor's site and not locally.
         - Need to make sure ALL content is served up via HTTPS - see the web.xml
-        and ss.xml requests mappings etc.
+        and filter.xml requests mappings etc.
 
         High Level Steps:

trunk/ibisph-view/src/main/webapp/js/jquery.leaflet.js

@@ -451 +451 @@
                 function setupChoroplethValuesAndLegend() 
                 {
-                        if(config.choropleth.dataClasses.numberOfGroups > config.choropleth.dataClasses.dataValues.length) config.choropleth.dataClasses.numberOfGroups = config.choropleth.dataClasses.dataValues.length;
-                        if("Jenks" == config.choropleth.dataClasses.type) 
+                        if(config.choropleth.dataClasses.numberOfGroups >= config.choropleth.dataClasses.dataValues.length) 
+                        {
+                                config.choropleth.dataClasses.numberOfGroups = config.choropleth.dataClasses.dataValues.length;
+                                config.choropleth.dataClasses.determinantValues = getClassNone(config.choropleth.dataClasses.dataValues);
+                        }
+
+                        else if("Jenks" == config.choropleth.dataClasses.type) 
                         {
                                 config.choropleth.dataClasses.determinantValues = geoStats.getClassJenks(config.choropleth.dataClasses.numberOfGroups);
@@ -480 +485 @@
                                 config.choropleth.dataClasses.determinantValues = geoStats.getClassQuantile(config.choropleth.dataClasses.numberOfGroups);
                         }
-                        else if("Equal" == config.choropleth.dataClasses.type) 
+                        else if("EqualInterval" == config.choropleth.dataClasses.type) 
                         {
                                 config.choropleth.dataClasses.determinantValues = geoStats.getClassEqInterval(config.choropleth.dataClasses.numberOfGroups);
                         }
-                        else if("equal" == config.choropleth.dataClasses.type) 
-                        {
-                                config.choropleth.dataClasses.determinantValues = equalBreaks(config.choropleth.dataClasses.dataValues, config.choropleth.dataClasses.numberOfGroups);
+                        else if("EqualGroup" == config.choropleth.dataClasses.type) 
+                        {
+                                config.choropleth.dataClasses.determinantValues = getClassEqualGroup(config.choropleth.dataClasses.dataValues, config.choropleth.dataClasses.numberOfGroups);
                         }
 
 //geoStats.setColors(["red", "green", "blue", "yellow", "purple", "black"]);
-console.log(".setupChoroplethValuesAndLegend - determinantValues: " + config.choropleth.dataClasses.determinantValues + ", actual Values: " + config.choropleth.dataClasses.dataValues);
+console.log(".setupChoroplethValuesAndLegend - type: " + config.choropleth.dataClasses.type + ", determinantValues: " + config.choropleth.dataClasses.determinantValues + ", actual Values: " + config.choropleth.dataClasses.dataValues);
 //console.log(".setupChoroplethValuesAndLegend - legend HTML: " + geoStats.getHtmlLegend(null, null, 1) );
 
@@ -575 +580 @@
                 function getDataValueTitle(value) 
                 {
+                        if(undefined == value) return("");
                         for(var i=0; i < config.choropleth.dataObject.data.length; i++) 
                         {
@@ -754 +760 @@
                 * the data and sets the determinant value when group count exceeded.
                 */
-                function equalBreaks(dataValueArray, numberOfGroupsGroups) 
-                {
-                        var data = dataValueArray.sort();
+                function getClassEqualGroup(dataValueArray, numberOfGroupsGroups) 
+                {
+                        var data = dataValueArray.sort(function(a,b) { return a - b;});
                         var dataBreakInterval = data.length / numberOfGroupsGroups;
+                        var dataBreakIndex = dataBreakInterval * 1;
                         var determinantValues = [];
                         determinantValues[0] = data[0];
@@ -764 +771 @@
                         while(i < data.length)
                         {
-                                if(i > dataBreakInterval)
-                                {
-                                        determinantValues[currentGroup] = data[i];
+                                if(i > dataBreakIndex)
+                                {
+                                        determinantValues[currentGroup] = data[i-1];    // use previous value as determinent comparison is < based.
                                         currentGroup++;
-                                        dataBreakInterval = currentGroup * dataBreakInterval;
+                                        dataBreakIndex = currentGroup * dataBreakInterval;
                                 }
                                 i++;
                         }
-                        determinantValues[numberOfGroupsGroups] = data[i];
+                        determinantValues[numberOfGroupsGroups] = data[i-1];
                         return(determinantValues);
                 }; //~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~
 
                                 
+                function getClassNone(dataValueArray) 
+                {
+                        var data = dataValueArray.sort(function(a,b) { return a - b;});
+                        var determinantValues = [];
+                        determinantValues[0] = data[0];
+                        for(var i=1; i<data.length; i++) determinantValues[i] = data[i-1];
+                        determinantValues[data.length] = data[data.length-1];
+                        return(determinantValues);
+                }; //~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 

trunk/ibisph-view/src/main/webapp/xslt/html/LeafletMapGraphic.xslt

@@ -73 +73 @@
                         <option value="ArithmeticProgression">Arithmetic Progression</option>
                         <option value="Quantile">Quantile</option>
-                        <option value="Equal">Equal</option>
+                        <option value="EqualInterval">Equal Interval</option>
+                        <option value="EqualGroup">Equal Group</option>
                 </select>