Converting color JPS scale to five-color version now used by JP.

Closes #1.

Author: jkrrv

README.md

@@ -2,24 +2,32 @@
 
 Father's Marble is an attempt to show the status of the Good News throughout the earth.
 
-Here's a screenshot of the view from the North Pole, with the Americas toward the top of the picture:   
+Here's a screenshot of the view looking down on the North Pole, with the Americas toward the top of the picture:   
 
 ![View of Father's Marble from the North Pole.  The Americas are toward the top of the image.](documentation/NorthPole.png)
 
+In this particular screenshot (and the default setting for the application), the colors correspond to the [Progress 
+Levels defined by Joshua Project](https://joshuaproject.net/global/progress).
+
 ## Data Sources
 
-Data regarding people groups and their beliefs come from [Joshua Project's public datasets and APIs](http://joshuaproject.net/resources/datasets). 
-The Joshua Project exists to "Bring Definition to the Unfinished Task."  
+Data regarding people groups and their beliefs come from [Joshua Project's public datasets and 
+APIs](http://joshuaproject.net/resources/datasets). The Joshua Project exists to "Bring Definition to the Unfinished 
+Task."  Joshua Project data is updated in this application roughly once every two weeks. 
 
 Data regarding general global population distributions comes from NASA's 
 [Gridded Population of the World, Version 3](http://sedac.ciesin.columbia.edu/data/set/gpw-v3-population-density) 
-provided through CIESIN and CIAT, and are scaled such that the total world population roughly matches Joshua Project data.  
+provided through CIESIN and CIAT, and are scaled such that the total world population roughly matches Joshua Project 
+data.  
 
 Over different versions of this project, the imagery used on the globe has come from a variety of different sources: 
 
- - NASA's Black Marble Imagery.  Original data courtesy NASA Earth Observatory and in the public domain.  
  - Bing Maps.  Licensed from Microsoft. 
  - Natural Earth II. Public Domain. 
+ - NASA's Black Marble Imagery.  Original data courtesy NASA Earth Observatory and in the public domain; this iteration 
+  is graciously hosted by AGI. 
+  
+The particular copyrights that apply to the imagery actively in-use are listed at the bottom left of the application. 
 
 The graphics tool used here is [Cesium](http://cesiumjs.org), which is a really awesome mapping tool. 
 
@@ -38,8 +46,9 @@ specifically refers to _a people group in a particular location_.  For instance,
 "Villages".  Villages can be of drastically different sizes, both in terms of population, and in terms of geographic 
 area covered. 
 
-A __Pile__ is _a collection of peoples who are designated into one statistical point_.  One Pile may contain several 
-Villages, and many Villages are spread between several piles. 
+A __Pile__ is _a collection of peoples who are designated into a geographical point_.  One Pile may contain several 
+Villages, and many Villages are spread between several piles.  Generally, one pile corresponds to one vertical 
+multi-colored stack.  Hence, "pile".
 
 ## How It Works
 
@@ -86,7 +95,8 @@ there will appear to be an unrealistically high number of Han Chinese listed in
 ### Ambiguous Population Distribution Data
 
 While we have distribution information for the human race as a whole, there is no readily available data that addresses 
-the issue of which Piles should contain each Village, when the Village population is larger than that of the pile. 
+the issue of which Piles should contain each Village, when the Village population is larger than that of the closest 
+pile. 
 
 ## Contributing, Building and Other Participation
 
@@ -128,6 +138,8 @@ To __update__ the node dependencies, from the root directory of the repository,
 
 	npm update
 
-There is no build procedure for the application, as it is (for now, anyway) completely static.  Just put the files in a
-web server, and you'll have a working application. 
+<strike>There is no build procedure for the application, as it is (for now, anyway) completely static.  Just put the 
+files in a web server, and you'll have a working application. </strike>  
+To build this application, you need LESS, and probably should minify everything. Creating a simplified build procedure 
+is [issue #2](https://github.com/jkrrv/FathersMarble/issues/2). 
 

app/main.js

@@ -42,7 +42,9 @@ requirejs(['Cesium'], function(Cesium) {
     Pile.prototype.calcHeights = function(format) {
         var out = {
             r: 0,
+            o: 0,
             y: 0,
+            s: 0,
             g: 0,
             sum: 0
         };
@@ -57,7 +59,11 @@ requirejs(['Cesium'], function(Cesium) {
                         if (people.jps < 2) {
                             out.r += people.pop;
                         } else if (people.jps < 3) {
+                            out.o += people.pop;
+                        } else if (people.jps < 4) {
                             out.y += people.pop;
+                        } else if (people.jps < 5) {
+                            out.s += people.pop;
                         } else {
                             out.g += people.pop;
                         }
@@ -208,7 +214,7 @@ requirejs(['Cesium'], function(Cesium) {
          * Gets or sets the name of the series to display.  WebGL JSON is designed
          * so that only one series is viewed at a time.  Valid values are defined
          * in the seriesNames property.
-         * @memberof WebGLGlobeDataSource.prototype
+         * @memberOf WebGLGlobeDataSource.prototype
          * @type {String}
          */
         seriesToDisplay : {
@@ -347,14 +353,16 @@ requirejs(['Cesium'], function(Cesium) {
             var peoples = new Pile(geo.peoples);
 
             // TODO make calculation selection a dynamic feature
-            // var heights = peoples.calcHeights(Peoples.heightFormat.JPS);
-            var heights = peoples.calcHeights(Pile.heightFormat.PROFESS);
+            var heights = peoples.calcHeights(Pile.heightFormat.JPS);
+            // var heights = peoples.calcHeights(Pile.heightFormat.PROFESS);
 
             // TODO break this into more functions so things are more readily callable when user options are made available.
 
             // Calculate heights for each colored bar
             heights.g = heights.g >> heightScale;
+            heights.s = heights.s >> heightScale;
             heights.y = heights.y >> heightScale;
+            heights.o = heights.o >> heightScale;
             heights.r = heights.r >> heightScale;
 
 
@@ -366,9 +374,9 @@ requirejs(['Cesium'], function(Cesium) {
                     position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g/2),
                     cylinder: {
                         length: heights.g,
-                        topRadius: widthScale,
+                        topRadius: parseInt(widthScale),
                         slices: slices,
-                        bottomRadius: widthScale,
+                        bottomRadius: parseInt(widthScale),
                         material: Cesium.Color.GREEN.withAlpha(.4)
                     },
                     seriesName : "g"
@@ -377,17 +385,36 @@ requirejs(['Cesium'], function(Cesium) {
                 h++;
             }
 
+            // Create "SpringGreeen" bar
+            if (heights.s > 1) {
+                entities.add(new Cesium.Entity({
+                    id : "s" + ' index ' + x.toString(),
+                    show : true,
+                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + (heights.s/2)),
+                    cylinder: {
+                        length: heights.s,
+                        topRadius: parseInt(widthScale),
+                        slices: slices,
+                        bottomRadius: parseInt(widthScale),
+                        material: Cesium.Color.GREENYELLOW.withAlpha(.4)
+                    },
+                    seriesName : "s"
+                }));
+
+                h++;
+            }
+
             // Create Yellow bar
             if (heights.y > 1) {
                 entities.add(new Cesium.Entity({
                     id : "y" + ' index ' + x.toString(),
                     show : true,
-                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + (heights.y/2)),
+                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + heights.s + (heights.y/2)),
                     cylinder: {
                         length: heights.y,
-                        topRadius: widthScale,
+                        topRadius: parseInt(widthScale),
                         slices: slices,
-                        bottomRadius: widthScale,
+                        bottomRadius: parseInt(widthScale),
                         material: Cesium.Color.YELLOW.withAlpha(.4)
                     },
                     seriesName : "y"
@@ -396,17 +423,36 @@ requirejs(['Cesium'], function(Cesium) {
                 h++;
             }
 
+            // Create Orange bar
+            if (heights.o > 1) {
+                entities.add(new Cesium.Entity({
+                    id : "o" + ' index ' + x.toString(),
+                    show : true,
+                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + heights.s + heights.y + (heights.o/2)),
+                    cylinder: {
+                        length: heights.o,
+                        topRadius: parseInt(widthScale),
+                        slices: slices,
+                        bottomRadius: parseInt(widthScale),
+                        material: Cesium.Color.ORANGE.withAlpha(.4)
+                    },
+                    seriesName : "o"
+                }));
+
+                h++;
+            }
+
             // Create Red bar
             if (heights.r > 1) {
                 entities.add(new Cesium.Entity({
                     id : "r" + ' index ' + x.toString(),
                     show : true,
-                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + heights.y + (heights.r/2)),
+                    position: Cesium.Cartesian3.fromDegrees(longitude, latitude, heights.g + heights.s + heights.y + heights.o + (heights.r/2)),
                     cylinder: {
                         length: heights.r,
-                        topRadius: widthScale,
+                        topRadius: parseInt(widthScale),
                         slices: slices,
-                        bottomRadius: widthScale,
+                        bottomRadius: parseInt(widthScale),
                         material: Cesium.Color.RED.withAlpha(.4)
                     },
                     seriesName : "r"
@@ -437,12 +483,8 @@ requirejs(['Cesium'], function(Cesium) {
     var dataSource = new WebGLGlobeDataSource();
     dataSource.loadUrl('data/geo.json').then(function() {
 
-        //After the initial load, create buttons to let the user switch among series.
-        function createSeriesSetter(seriesName) {
-            return function() {
-                dataSource.seriesToDisplay = seriesName;
-            };
-        }
+        // TODO UI Option population
+
     });
 
     Cesium.BingMapsApi.defaultKey =  'AjUK0-UaaYujmmlMT2iXlFADNDnttZM4F5ADqiCfdP-y_JojoP8089gU-nzdGhNe';
@@ -493,7 +535,7 @@ requirejs(['Cesium'], function(Cesium) {
     //     // layer.brightness = 0.8;
     // }
 
-    viewer.dataSources.add(dataSource);
+    viewer.dataSources.add(dataSource).then(); // TODO use this to close the loading overlay
 
     // Add credit footnote for Joshua Project
     var credit = new Cesium.Credit('Joshua Project', 'assets/jp_logo_color.png', 'http://joshuaproject.net');