Displaying differences for changeset
 
display as  

test/service_tests/STest.java

@@ -73,11 +73,14 @@
     @Test public void  m_nutrient_slp_1_0__ser_1() throws Exception { run(); }
     @Test public void  m_nutrient_slp_1_0__ser_2() throws Exception { run(); }    
     @Test public void  m_nutrient_slp_1_0__test1() throws Exception { run(); }
-    @Test public void  m_nutrient_slp_1_0__test2() throws Exception { run(); }
+    @Test public void  m_nutrient_slp_1_0__test2() throws Exception { run(); }  
     
     @Test public void  m_nutrientslpsrp_1_0__ser_1() throws Exception { run(); }
     @Test public void  m_nutrientslpsrp_1_0__ser_2() throws Exception { run(); }
-    
+    @Test public void  m_nutrientslpsrp_1_0__NRCS_1() throws Exception { run(); }
+    @Test public void  m_nutrientslpsrp_1_0__NRCS_2() throws Exception { run(); }      
+    @Test public void  m_nutrientslpsrp_1_0__NRCS_3() throws Exception { run(); } 
+     
     @Test public void  m_pest_hazrating_1_0__test_1() throws Exception { run(); }
     @Test public void  m_pest_hazrating_1_0__test2() throws Exception { run(); }
     @Test public void  m_pest_hazrating_1_0__ser_1() throws Exception { run(); }

test/service_tests/m_nutrientslpsrp_1_0__ser_2.json

@@ -1,451 +1,69 @@
 {
   "metainfo": {
     "status": "Finished",
-    "suid": "7df3a9c6-5732-11e5-9246-696306917710",
-    "cloud_node": "192.168.56.1",
-    "tstamp": "2015-09-09 14:36:47",
-    "service_url": "http://csip.engr.colostate.edu:8092/csip-wqm/m/nutrientslpsrp/1.0",
-    "request_ip": "0:0:0:0:0:0:0:1",
-    "cpu_time": 701,
-    "expiration_date": "2015-09-09 14:41:48"
+    "suid": "7ba65150-2e74-11e6-a70d-91d62f98a3c8",
+    "cloud_node": "2002:ac02:7e3d:0:0:0:ac02:7e3d",
+    "tstamp": "2016-06-09 13:00:50",
+    "service_url": "http://129.82.20.238:8080/NRCS_RS_ConservationResourcesWQM/m/nutrientslpsrp/1.0",
+    "request_ip": "10.84.64.44",
+    "cpu_time": 1500,
+    "expiration_date": "2016-06-09 13:01:22",
+    "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-08 14:34 by jenkins$"
   },
   "parameter": [
     {
       "name": "AoAId",
-      "value": 1,
-      "Description": "Area of analysis identifier"
+      "value": 1098765,
+      "description": "Area of Analysis Identifier"
     },
     {
       "name": "aoa_comp_drained",
-      "value": false,
+      "value": true,
       "description": "Is this AoA drained"
-    },    
+    },
     {
-      "name": "soilcomponents",
-      "value": [
-        [
+      "name": "aoa_geometry",
+      "value": {
+        "type": "FeatureCollection",
+        "features": [
           {
-            "name": "cokey",
-            "value": "11150284",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 45.84,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "B",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Aridisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.24,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 8,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 3.7,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": true,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "None",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": false,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150285",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 63.72,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "A",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Mollisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.37,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 12,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 0,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": true,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "Apparent",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": false,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150286",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 25.6,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "A/D",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Spodosols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.21,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 15,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 12,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "None",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": false,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150287",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 33.5,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "C",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Inceptisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.42,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 16,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 6,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "None",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": false,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150288",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 10.77,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "D",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Histosols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.02,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 3,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 2,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "Apparent",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": true,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150289",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 36.93,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "B/D",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Entisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.28,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 1,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 3,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "Perched",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": true,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150290",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 44.33,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "D",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Mollisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.32,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 14,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 7,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "None",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": false,
-            "Description": "High water table within 24 inches of soil surface"
-          }
-        ],
-        [
-          {
-            "name": "cokey",
-            "value": "11150291",
-            "Description": "Soil component key"
-          },
-          {
-            "name": "aoa_comp_area",
-            "value": 21.76,
-            "Description": "Soil component area in the area of analysis"
-          },
-          {
-            "name": "aoa_comp_hsg",
-            "value": "B",
-            "Description": "Hydrologic soil group of the soil component"
-          },
-          {
-            "name": "aoa_comp_taxorder",
-            "value": "Mollisols",
-            "Description": "Taxonomic order of the soil component "
-          },
-          {
-            "name": "aoa_comp_kfact",
-            "value": 0.48,
-            "Description": "Representative K factor of the soil component"
-          },
-          {
-            "name": "aoa_comp_slope",
-            "value": 5,
-            "Description": "Representative slope of the soil component"
-          },
-          {
-            "name": "aoa_comp_coarse_frag",
-            "value": 5,
-            "Description": "Representative coarse rock fragments of the soil component"
-          },
-          {
-            "name": "aoa_comp_drained",
-            "value": false,
-            "Description": "Whether this soil component instance is drained"
-          },
-          {
-            "name": "aoa_comp_wtbl",
-            "value": "Perched",
-            "Description": "Kind of water table"
-          },
-          {
-            "name": "aoa_comp_hwt_lt_24",
-            "value": true,
-            "Description": "High water table within 24 inches of soil surface"
+            "type": "Feature",
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [
+                  [
+                    -105.1452112,
+                    40.5596521
+                  ],
+                  [
+                    -105.1435697,
+                    40.5596276
+                  ],
+                  [
+                    -105.1435,
+                    40.5586658
+                  ],
+                  [
+                    -105.1448143,
+                    40.5589348
+                  ],
+                  [
+                    -105.1452112,
+                    40.5596521
+                  ]
+                ]
+              ]
+            }
           }
         ]
-      ]
+      }
     }
   ],
   "result": [
     {
       "name": "AoAId",
-      "value": "1",
+      "value": "1098765",
       "description": "Area of analysis identifier"
     },
     {
@@ -467,7 +85,7 @@
             "value": [
               {
                 "name": "cokey",
-                "value": "11150284",
+                "value": "10720738",
                 "description": "Soil component key"
               },
               {
@@ -477,7 +95,7 @@
               },
               {
                 "name": "comp_srp",
-                "value": "HIGH",
+                "value": "MODERATELY HIGH",
                 "description": "Soil runoff potential for soil component"
               }
             ],
@@ -488,70 +106,7 @@
             "value": [
               {
                 "name": "cokey",
-                "value": "11150285",
-                "description": "Soil component key"
-              },
-              {
-                "name": "comp_nslp",
-                "value": "HIGH",
-                "description": "Soil leaching potential of the soil component"
-              },
-              {
-                "name": "comp_srp",
-                "value": "LOW",
-                "description": "Soil runoff potential for soil component"
-              }
-            ],
-            "description": "Soil Component"
-          },
-          {
-            "name": "soil_component",
-            "value": [
-              {
-                "name": "cokey",
-                "value": "11150286",
-                "description": "Soil component key"
-              },
-              {
-                "name": "comp_nslp",
-                "value": "MODERATE",
-                "description": "Soil leaching potential of the soil component"
-              },
-              {
-                "name": "comp_srp",
-                "value": "HIGH",
-                "description": "Soil runoff potential for soil component"
-              }
-            ],
-            "description": "Soil Component"
-          },
-          {
-            "name": "soil_component",
-            "value": [
-              {
-                "name": "cokey",
-                "value": "11150287",
-                "description": "Soil component key"
-              },
-              {
-                "name": "comp_nslp",
-                "value": "MODERATE",
-                "description": "Soil leaching potential of the soil component"
-              },
-              {
-                "name": "comp_srp",
-                "value": "HIGH",
-                "description": "Soil runoff potential for soil component"
-              }
-            ],
-            "description": "Soil Component"
-          },
-          {
-            "name": "soil_component",
-            "value": [
-              {
-                "name": "cokey",
-                "value": "11150288",
+                "value": "10720739",
                 "description": "Soil component key"
               },
               {
@@ -572,49 +127,7 @@
             "value": [
               {
                 "name": "cokey",
-                "value": "11150289",
-                "description": "Soil component key"
-              },
-              {
-                "name": "comp_nslp",
-                "value": "LOW",
-                "description": "Soil leaching potential of the soil component"
-              },
-              {
-                "name": "comp_srp",
-                "value": "MODERATE",
-                "description": "Soil runoff potential for soil component"
-              }
-            ],
-            "description": "Soil Component"
-          },
-          {
-            "name": "soil_component",
-            "value": [
-              {
-                "name": "cokey",
-                "value": "11150290",
-                "description": "Soil component key"
-              },
-              {
-                "name": "comp_nslp",
-                "value": "LOW",
-                "description": "Soil leaching potential of the soil component"
-              },
-              {
-                "name": "comp_srp",
-                "value": "HIGH",
-                "description": "Soil runoff potential for soil component"
-              }
-            ],
-            "description": "Soil Component"
-          },
-          {
-            "name": "soil_component",
-            "value": [
-              {
-                "name": "cokey",
-                "value": "11150291",
+                "value": "10720853",
                 "description": "Soil component key"
               },
               {