Small bugfixes for classification

generateColorRamp.js

@@ -25,7 +25,6 @@ function generateColor(theColorBegin, theColorEnd, theNumSteps) {
         theB = interpolate(theB0, theB1, i, theNumSteps);
         theVal = (((theR << 8) | theG) << 8) | theB;
         colorArray[i] = theVal.toString(16);
-        console.log(theVal.toString(16));
     }
     return colorArray;
 }

generateColorRamp.js~

@@ -0,0 +1,31 @@
+function interpolate(pBegin, pEnd, pStep, pMax) {
+    if (pBegin < pEnd) {
+        return ((pEnd - pBegin) * (pStep / pMax)) + pBegin;
+    } else {
+        return ((pBegin - pEnd) * (1 - (pStep / pMax))) + pEnd;
+    }
+
+}
+
+function generateColor(theColorBegin, theColorEnd, theNumSteps) {
+    var colorArray = new Array();
+    theColorBegin = parseInt(theColorBegin, 16);
+    theColorEnd = parseInt(theColorEnd, 16);
+
+    theR0 = (theColorBegin & 0xff0000) >> 16;
+    theG0 = (theColorBegin & 0x00ff00) >> 8;
+    theB0 = (theColorBegin & 0x0000ff) >> 0;
+    theR1 = (theColorEnd & 0xff0000) >> 16;
+    theG1 = (theColorEnd & 0x00ff00) >> 8;
+    theB1 = (theColorEnd & 0x0000ff) >> 0;
+
+    for (i = 0; i <= theNumSteps; i++) {
+        theR = interpolate(theR0, theR1, i, theNumSteps);
+        theG = interpolate(theG0, theG1, i, theNumSteps);
+        theB = interpolate(theB0, theB1, i, theNumSteps);
+        theVal = (((theR << 8) | theG) << 8) | theB;
+        colorArray[i] = theVal.toString(16);
+        console.log(theVal.toString(16));
+    }
+    return colorArray;
+}

main.js

@@ -282,22 +282,7 @@ function colorChange(count) {
  * This method is used to initially set classes - only used at startup! 
  */
 function initialColorization(){
-	symbol = new esri.symbol.SimpleFillSymbol();
-    symbol.setColor(new dojo.Color([150, 150, 150, 0.75]));
-    var renderer = new esri.renderer.ClassBreaksRenderer(symbol, attributeFields[activeLayer]);
-
-    //the values are layer dependent, so if another initial layer is chosen, these values MUST be changed
-    renderer.addBreak(0,1702,new esri.symbol.SimpleFillSymbol().setColor(new dojo.Color("#FF0000")));
-
-    renderer.addBreak(1703,3404,new esri.symbol.SimpleFillSymbol().setColor(new dojo.Color("#FFFF00")));
-
-    renderer.addBreak(3405,5107,new esri.symbol.SimpleFillSymbol().setColor(new dojo.Color("#00FF00")));
-
-    featureLayer.setRenderer(renderer);
-    featureLayer.refresh();
-
-    legend.refresh();
-
+	addEqualBreaks(3, "FF0000", "00FF00");
 }
 
 /**
@@ -357,9 +342,9 @@ function layerChange(layerNr) {
  * method for automatic (equal) breaks
  */
 function addEqualBreaks(number, colorStart, colorEnd) {
-
-    var breakStep = (maxValues[activeLayer] - minValues[activeLayer]) / (number + 1);
-    var colorArray = generateColor(colorStart, colorEnd, number);
+    var breakStep = (maxValues[activeLayer] - minValues[activeLayer]) / (number);
+    var colorArray = generateColor(colorStart, colorEnd, number-1);
+    colorArray.reverse();
 
     symbol = new esri.symbol.SimpleFillSymbol();
     symbol.setColor(new dojo.Color([150, 150, 150, 0.75]));

main.js~

@@ -282,6 +282,7 @@ function colorChange(count) {
  * This method is used to initially set classes - only used at startup! 
  */
 function initialColorization(){
+  /**
 	symbol = new esri.symbol.SimpleFillSymbol();
     symbol.setColor(new dojo.Color([150, 150, 150, 0.75]));
     var renderer = new esri.renderer.ClassBreaksRenderer(symbol, attributeFields[activeLayer]);
@@ -297,7 +298,8 @@ function initialColorization(){
     featureLayer.refresh();
 
     legend.refresh();
-
+	*/
+	addEqualBreaks(3, "FF0000", "00FF00");
 }
 
 /**
@@ -357,9 +359,9 @@ function layerChange(layerNr) {
  * method for automatic (equal) breaks
  */
 function addEqualBreaks(number, colorStart, colorEnd) {
-
-    var breakStep = (maxValues[activeLayer] - minValues[activeLayer]) / (number + 1);
-    var colorArray = generateColor(colorStart, colorEnd, number);
+    var breakStep = (maxValues[activeLayer] - minValues[activeLayer]) / (number);
+    var colorArray = generateColor(colorStart, colorEnd, number-1);
+    colorArray.reverse();
 
     symbol = new esri.symbol.SimpleFillSymbol();
     symbol.setColor(new dojo.Color([150, 150, 150, 0.75]));