Displaying differences for changeset
 
display as  

test/service_tests/m_nut_pract_scores_1_0__test1.json

@@ -12,150 +12,150 @@
     "expiration_date": "2016-04-22 11:28:03"
   },
  "parameter": [
-  {
-   "name": "pestcomponents",
-   "value": [
-    [
-     {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 1,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
-     
-    ],
-    
-    [
-    {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 5,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
-    ],
-    [
         {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 8,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "Soil test result",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "Medium",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
-    ],
-    [
-        {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 14,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
-    ],
-    [
-        {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 2,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
-    ],
-    [
-        {
-      "name": "AoAid",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_techn_id",
-      "value": 9,
-      "Description":"nutrient management technique identifier corresponding to nutrient_technique_score_id value in WQM data mart"
-     },
-     {
-      "name": "plan_techn_discrim_type",
-      "value": "",
-      "Description":"type of discriminator for varying nutrient management technique scores; value is “soil test result” otherwise NULL"
-     },
-     {
-      "name": "plan_techn_discrim",
-      "value": "",
-      "Description":"value of the discriminator:  HIGH,MEDIUM, LOW, NO SOIL TEST"
-     }
+            "name": "pestcomponents",
+            "value": [
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 1,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "",
+                        "Description": "Practice Discriminator Value"
+                    }
+
+                ],
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 5,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "",
+                        "Description": "Practice Discriminator Value"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 8,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "Soil test resul",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "Medium",
+                        "Description": "Practice Discriminator Value"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 14,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "",
+                        "Description": "Practice Discriminator Value"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 2,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "",
+                        "Description": "Practice Discriminator Value"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAid",
+                        "value": 1,
+                        "Description": "Area of Analysis Identifier"
+
+                    },
+                    {
+                        "name": "plan_practice_id",
+                        "value": 9,
+                        "Description": "Conservation Practice Identifier"
+                    },
+                    {
+                        "name": "plan_practice_discrim_type",
+                        "value": "",
+                        "Description": "Practice Discriminator;"
+                    },
+                    {
+                        "name": "plan_practice_discrim_value",
+                        "value": "",
+                        "Description": "Practice Discriminator Value"
+                    }
+                ]
+
+            ]
+        }
     ]
-   ]
-  }
- ]
 }

test/service_tests/m_pesticide_practice_score_1_0__test4.json

@@ -1,91 +1,101 @@
 {
- "metainfo": {
- },
- "parameter": [
-  {
-   "name": "pestcomponents",
-   "value": [
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"Area of Analysis Identifier"
-      
-     },
-     {
-      "name": "plan_ipm_practice",
-      "value": 12,
-      "Description":"Integrated Pest Management Conservation practice"
-      
-     },
-     {
-      "name": "plan_pract_variant",
-      "value": "",
-      "Description":"Variation of IPM Conservation practice"
-      
-     }
+    "metainfo": {
+        "status": "Finished",
+        "suid": "0fd895fb-33dd-11e6-b22c-c319006b2e4d",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-16 10:12:02",
+        "service_url": "http://localhost:8080/csip-wqm/m/pesticide_practice_score/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 74,
+        "expiration_date": "2016-06-16 10:12:32"
+    },
+    "parameter": [
+        {
+            "name": "AoAId",
+            "value": 1,
+            "Description": "Area of Analysis Identifier"
+        },
+        {
+            "name": "pestcomponents",
+            "value": [
+                [
+                    {
+                        "name": "plan_ipm_practice",
+                        "value": 12,
+                        "Description": "Integrated Pest Management Conservation practice"
+                    },
+                    {
+                        "name": "plan_pract_variant",
+                        "value": "",
+                        "Description": "Variation of IPM Conservation practice"
+                    }
+                ],
+                [
+                    {
+                        "name": "plan_ipm_practice",
+                        "value": 20,
+                        "Description": "Integrated Pest Management Conservation practice"
+                    },
+                    {
+                        "name": "plan_pract_variant",
+                        "value": "Weed Suppression",
+                        "Description": "Variation of IPM Conservation practice"
+                    }
+                ],
+                [
+                    {
+                        "name": "plan_ipm_practice",
+                        "value": 80,
+                        "Description": "Integrated Pest Management Conservation practice"
+                    },
+                    {
+                        "name": "plan_pract_variant",
+                        "value": "Natural Materials",
+                        "Description": "Variation of IPM Conservation practice"
+                    }
+                ],
+                [
+                    {
+                        "name": "plan_ipm_practice",
+                        "value": 66,
+                        "Description": "Integrated Pest Management Conservation practice"
+                    },
+                    {
+                        "name": "plan_pract_variant",
+                        "value": "",
+                        "Description": "Variation of IPM Conservation practice"
+                    }
+                ]
+            ]
+        }
     ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"AoA Identifier"
-      
-     },
-     {
-      "name": "plan_ipm_practice",
-      "value": 20,
-      "Description":"Integrated Pest Management Conservation practice"
-      
-     },
-     {
-      "name": "plan_pract_variant",
-      "value": "Weed Suppression",
-      "Description":"Variation of IPM Conservation practice"
-      
-     }
-    ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"AoA Identifier"
-      
-     },
-     {
-      "name": "plan_ipm_practice",
-      "value": 80,
-      "Description":"Integrated Pest Management Conservation practice"
-      
-     },
-     {
-      "name": "plan_pract_variant",
-      "value": "Natural Materials",
-      "Description":"Variation of IPM Conservation practice"
-      
-     }
-    ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"AoA Identifier"
-      
-     },
-     {
-      "name": "plan_ipm_practice",
-      "value": 66,
-      "Description":"Integrated Pest Management Conservation practice"
-      
-     },
-     {
-      "name": "plan_pract_variant",
-      "value": "",
-      "Description":"Variation of IPM Conservation practice"
-      
-     }
+    "result": [
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
+        },
+        {
+            "name": "pleach_practice_score",
+            "value": 45,
+            "description": "pleach_practice_score"
+        },
+        {
+            "name": "psolsurf_practice_score",
+            "value": 45,
+            "description": "psolsurf_practice_score"
+        },
+        {
+            "name": "padsurf_practice_score",
+            "value": 45,
+            "description": "padsurf_practice_score"
+        },
+        {
+            "name": "pdrift_practice_score",
+            "value": 10,
+            "description": "pdrift_practice_score"
+        }
     ]
-   ]
-  }
- ]
-}
+}
\ No newline at end of file

test/service_tests/m_pesticide_slp_1_0__test4.json

@@ -1,262 +1,361 @@
 {
- "metainfo": {
-    "status": "Finished",
-    "suid": "7b097370-08ad-11e6-be78-ed757ea1f7d2",
-    "cloud_node": "192.168.142.1",
-    "tstamp": "2016-04-22 11:13:06",
-    "service_url": "http://localhost:8080/csip-wqm/m/pesticide_slp/1.0",
-    "request_ip": "0:0:0:0:0:0:0:1",
-    "csip-wqm.version": "$version: 0.0.0 xxxxxxx date, built at 2016-04-22 09:55 by ks_an$",
-    "csip.version": "$version: 0.0.0 xxxxxxx date, built at 2016-04-22 09:54 by ks_an$",
-    "cpu_time": 326,
-    "expiration_date": "2016-04-22 11:13:37"
-  },
- "parameter": [
-  {
-   "name": "soilcomponents",
-   "value": [
-    [
-     {
-      "name": "AoAId",
-      "value": 1
-     },
-     {
-      "name": "cokey",
-      "value": "11510284"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 45.84,
-      "description":"Area of the soil component in the AoA"
-      
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "A",
-      "description":"Hydrologic soil group of the soil component"
-      
-     },
-     {
-      "name": "aoa_comp_kfact",
-      "value": 0.24,
-      "description":"#K factor of the horizon representing the soil component; usually the surface horizon"
-     },
-     {
-         "name":" aoa_comp_om",
-         "value":2.30,
-         "description":"#Organic matter content of the horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_hzdepth",
-         "value":14,
-         "unit":"inches",
-         "description":"#Thickness of horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_cracksgr24",
-         "value":true,
-         "description":"#Whether the soil has surface connected macropores to 24 inches"
-     },
-     {
-         "name":"aoa_comp_hwt_lt_24",
-         "value":false,
-         "description":"#Whether the soil has a water table less than 24 inches from the surface"
-     }
+    "metainfo": {
+        "status": "Finished",
+        "suid": "ff59cfbe-33e2-11e6-b22c-19f1f574aa8f",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-16 10:54:32",
+        "service_url": "http://localhost:8080/csip-wqm/m/pesticide_slp/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 1,
+        "expiration_date": "2016-06-16 10:55:02"
+    },
+    "parameter": [
+        {
+            "name": "AoAList",
+            "value": [
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1
+                    },
+                    {
+                        "name": "componentlist",
+                        "value": [
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": "Berrend",
+                                    "description": "Soil Component Name"
+                                },
+                                {
+                                    "name": "aoa_comp_area",
+                                    "value": 45.84,
+                                    "description": "Area of the soil component in the AoA"
+                                },
+                                {
+                                    "name": "aoa_comp_hsg",
+                                    "value": "A",
+                                    "description": "Hydrologic soil group of the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_kfact",
+                                    "value": 0.24,
+                                    "description": "#K factor of the horizon representing the soil component; usually the surface horizon"
+                                },
+                                {
+                                    "name": "aoa_comp_om",
+                                    "value": 2.3,
+                                    "description": "#Organic matter content of the horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_hzdepth",
+                                    "value": 14,
+                                    "unit": "inches",
+                                    "description": "#Thickness of horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_cracksgr24",
+                                    "value": true,
+                                    "description": "#Whether the soil has surface connected macropores to 24 inches"
+                                },
+                                {
+                                    "name": "aoa_comp_hwt_lt_24",
+                                    "value": false,
+                                    "description": "#Whether the soil has a water table less than 24 inches from the surface"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284"
+                                },
+                                {
+                                    "name": "aoa_comp_area",
+                                    "value": 25.84,
+                                    "description": "Area of the soil component in the AoA"
+                                },
+                                {
+                                    "name": "aoa_comp_hsg",
+                                    "value": "B",
+                                    "description": "Hydrologic soil group of the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_kfact",
+                                    "value": 0.34,
+                                    "description": "#K factor of the horizon representing the soil component; usually the surface horizon"
+                                },
+                                {
+                                    "name": "aoa_comp_om",
+                                    "value": 2.3,
+                                    "description": "#Organic matter content of the horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_hzdepth",
+                                    "value": 20,
+                                    "unit": "inches",
+                                    "description": "#Thickness of horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_cracksgr24",
+                                    "value": true,
+                                    "description": "#Whether the soil has surface connected macropores to 24 inches"
+                                },
+                                {
+                                    "name": "aoa_comp_hwt_lt_24",
+                                    "value": false,
+                                    "description": "#Whether the soil has a water table less than 24 inches from the surface"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284"
+                                },
+                                {
+                                    "name": "aoa_comp_area",
+                                    "value": 15.84,
+                                    "description": "Area of the soil component in the AoA"
+                                },
+                                {
+                                    "name": "aoa_comp_hsg",
+                                    "value": "A/D",
+                                    "description": "Hydrologic soil group of the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_kfact",
+                                    "value": 0.34,
+                                    "description": "#K factor of the horizon representing the soil component; usually the surface horizon"
+                                },
+                                {
+                                    "name": "aoa_comp_om",
+                                    "value": 1.3,
+                                    "description": "#Organic matter content of the horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_hzdepth",
+                                    "value": 45,
+                                    "unit": "inches",
+                                    "description": "#Thickness of horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_cracksgr24",
+                                    "value": true,
+                                    "description": "#Whether the soil has surface connected macropores to 24 inches"
+                                },
+                                {
+                                    "name": "aoa_comp_hwt_lt_24",
+                                    "value": false,
+                                    "description": "#Whether the soil has a water table less than 24 inches from the surface"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "AoAId",
+                                    "value": 1
+                                },
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284"
+                                },
+                                {
+                                    "name": "aoa_comp_area",
+                                    "value": 55.84,
+                                    "description": "Area of the soil component in the AoA"
+                                },
+                                {
+                                    "name": "aoa_comp_hsg",
+                                    "value": "B/D",
+                                    "description": "Hydrologic soil group of the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_kfact",
+                                    "value": 0.34,
+                                    "description": "#K factor of the horizon representing the soil component; usually the surface horizon"
+                                },
+                                {
+                                    "name": "aoa_comp_om",
+                                    "value": 3.3,
+                                    "description": "#Organic matter content of the horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_hzdepth",
+                                    "value": 64,
+                                    "unit": "inches",
+                                    "description": "#Thickness of horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_cracksgr24",
+                                    "value": false,
+                                    "description": "#Whether the soil has surface connected macropores to 24 inches"
+                                },
+                                {
+                                    "name": "aoa_comp_hwt_lt_24",
+                                    "value": false,
+                                    "description": "#Whether the soil has a water table less than 24 inches from the surface"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284"
+                                },
+                                {
+                                    "name": "aoa_comp_area",
+                                    "value": 45.84,
+                                    "description": "Area of the soil component in the AoA"
+                                },
+                                {
+                                    "name": "aoa_comp_hsg",
+                                    "value": "C/D",
+                                    "description": "Hydrologic soil group of the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_kfact",
+                                    "value": 0.24,
+                                    "description": "#K factor of the horizon representing the soil component; usually the surface horizon"
+                                },
+                                {
+                                    "name": "aoa_comp_om",
+                                    "value": 4,
+                                    "description": "#Organic matter content of the horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_hzdepth",
+                                    "value": 14,
+                                    "unit": "inches",
+                                    "description": "#Thickness of horizon representing the soil component"
+                                },
+                                {
+                                    "name": "aoa_comp_cracksgr24",
+                                    "value": false,
+                                    "description": "#Whether the soil has surface connected macropores to 24 inches"
+                                },
+                                {
+                                    "name": "aoa_comp_hwt_lt_24",
+                                    "value": true,
+                                    "description": "#Whether the soil has a water table less than 24 inches from the surface"
+                                }
+                            ]
+                        ]
+                    }
+                ]
+            ]
+        }
     ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1
-     },
-     {
-      "name": "cokey",
-      "value": "11510284"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 25.84,
-      "description":"Area of the soil component in the AoA"
-      
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "B",
-      "description":"Hydrologic soil group of the soil component"
-      
-     },
-     {
-      "name": "aoa_comp_kfact",
-      "value": 0.34,
-      "description":"#K factor of the horizon representing the soil component; usually the surface horizon"
-     },
-     {
-         "name":" aoa_comp_om",
-         "value":2.30,
-         "description":"#Organic matter content of the horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_hzdepth",
-         "value":20,
-         "unit":"inches",
-         "description":"#Thickness of horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_cracksgr24",
-         "value":true,
-         "description":"#Whether the soil has surface connected macropores to 24 inches"
-     },
-     {
-         "name":"aoa_comp_hwt_lt_24",
-         "value":false,
-         "description":"#Whether the soil has a water table less than 24 inches from the surface"
-     }
-    ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1
-     },
-     {
-      "name": "cokey",
-      "value": "11510284"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 15.84,
-      "description":"Area of the soil component in the AoA"
-      
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "A/D",
-      "description":"Hydrologic soil group of the soil component"
-      
-     },
-     {
-      "name": "aoa_comp_kfact",
-      "value": 0.34,
-      "description":"#K factor of the horizon representing the soil component; usually the surface horizon"
-     },
-     {
-         "name":" aoa_comp_om",
-         "value":1.30,
-         "description":"#Organic matter content of the horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_hzdepth",
-         "value":45,
-         "unit":"inches",
-         "description":"#Thickness of horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_cracksgr24",
-         "value":true,
-         "description":"#Whether the soil has surface connected macropores to 24 inches"
-     },
-     {
-         "name":"aoa_comp_hwt_lt_24",
-         "value":false,
-         "description":"#Whether the soil has a water table less than 24 inches from the surface"
-     }
-    ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1
-     },
-     {
-      "name": "cokey",
-      "value": "11510284"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 55.84,
-      "description":"Area of the soil component in the AoA"
-      
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "B/D",
-      "description":"Hydrologic soil group of the soil component"
-      
-     },
-     {
-      "name": "aoa_comp_kfact",
-      "value": 0.34,
-      "description":"#K factor of the horizon representing the soil component; usually the surface horizon"
-     },
-     {
-         "name":" aoa_comp_om",
-         "value":3.30,
-         "description":"#Organic matter content of the horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_hzdepth",
-         "value":64,
-         "unit":"inches",
-         "description":"#Thickness of horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_cracksgr24",
-         "value":false,
-         "description":"#Whether the soil has surface connected macropores to 24 inches"
-     },
-     {
-         "name":"aoa_comp_hwt_lt_24",
-         "value":false,
-         "description":"#Whether the soil has a water table less than 24 inches from the surface"
-     }
-    ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1
-     },
-     {
-      "name": "cokey",
-      "value": "11510284"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 45.84,
-      "description":"Area of the soil component in the AoA"
-      
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "C/D",
-      "description":"Hydrologic soil group of the soil component"
-      
-     },
-     {
-      "name": "aoa_comp_kfact",
-      "value": 0.24,
-      "description":"#K factor of the horizon representing the soil component; usually the surface horizon"
-     },
-     {
-         "name":" aoa_comp_om",
-         "value":4.00,
-         "description":"#Organic matter content of the horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_hzdepth",
-         "value":14,
-         "unit":"inches",
-         "description":"#Thickness of horizon representing the soil component"
-     },
-     {
-         "name":"aoa_comp_cracksgr24",
-         "value":false,
-         "description":"#Whether the soil has surface connected macropores to 24 inches"
-     },
-     {
-         "name":"aoa_comp_hwt_lt_24",
-         "value":true,
-         "description":"#Whether the soil has a water table less than 24 inches from the surface"
-     }
+    "result": [
+        {
+            "name": "AoAList",
+            "value": [
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "description": "Area of Analysis Identifier"
+                    },
+                    {
+                        "name": "aoa_pslp",
+                        "value": "INTERMEDIATE",
+                        "description": "Pesticide soil leaching potential representing the AoA"
+                    },
+                    {
+                        "name": "componentlist",
+                        "value": [
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284",
+                                    "description": "Soil component key"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": "Berrend",
+                                    "description": "Soil component name"
+                                },
+                                {
+                                    "name": "comp_pslp",
+                                    "value": "HIGH",
+                                    "description": "Pesticide soil leaching potential representing the soil component"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284",
+                                    "description": "Soil component key"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": " ",
+                                    "description": "Soil component name"
+                                },
+                                {
+                                    "name": "comp_pslp",
+                                    "value": "INTERMEDIATE",
+                                    "description": "Pesticide soil leaching potential representing the soil component"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284",
+                                    "description": "Soil component key"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": " ",
+                                    "description": "Soil component name"
+                                },
+                                {
+                                    "name": "comp_pslp",
+                                    "value": "HIGH",
+                                    "description": "Pesticide soil leaching potential representing the soil component"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284",
+                                    "description": "Soil component key"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": " ",
+                                    "description": "Soil component name"
+                                },
+                                {
+                                    "name": "comp_pslp",
+                                    "value": "LOW",
+                                    "description": "Pesticide soil leaching potential representing the soil component"
+                                }
+                            ],
+                            [
+                                {
+                                    "name": "cokey",
+                                    "value": "11510284",
+                                    "description": "Soil component key"
+                                },
+                                {
+                                    "name": "compname",
+                                    "value": " ",
+                                    "description": "Soil component name"
+                                },
+                                {
+                                    "name": "comp_pslp",
+                                    "value": "HIGH",
+                                    "description": "Pesticide soil leaching potential representing the soil component"
+                                }
+                            ]
+                        ],
+                        "description": "List of soil components"
+                    }
+                ]
+            ]
+        }
     ]
-    
-   ]
-  }
- ]
-}
+}
\ No newline at end of file

test/service_tests/m_pesticide_ssrp_1_0__test1.json

@@ -1,202 +1,392 @@
 {
-  "metainfo": {},
-  "parameter": [
-      {
-    "name": "soilcomponents",
-    "value": [
-      [
+    "metainfo": {
+        "status": "Finished",
+        "suid": "a1d974b9-334d-11e6-b22c-7f51615ffc28",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-15 17:05:20",
+        "service_url": "http://localhost:8080/csip-wqm/m/pesticide_ssrp/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 2,
+        "expiration_date": "2016-06-15 17:05:50"
+    },
+    "parameter": [
         {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "soilcomponents",
+            "value": [
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510284",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 45.84,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "B",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510290",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 63.72,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "D",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510291",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 33.22,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "C",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": false,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510292",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 15.19,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "B/D",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510293",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 32.84,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "A/D",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510294",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 9.64,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "C",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": false,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510295",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 15.32,
+                        "Description": "Area of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "D",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ]
+            ]
+        }
+    ],
+    "result": [
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
         },
         {
-          "name": "cokey",
-          "value": "11510284",
-          "Description":"Soil Component Key"
+            "name": "cokey",
+            "value": "11510284",
+            "description": "Cokey of each soil component"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 45.84,
-          "Description":"Area of the soil component"
+            "name": "aoa_comp_area",
+            "value": 45.84,
+            "description": "Soil Component Area"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "B",
-          "Description":"#Hydrologic soil group of the soil component"
-        },
-        
-        {
-          "name": "aoa_comp_drained",
-          "value": true,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "comp_ssrp",
+            "value": "INTERMEDIATE",
+            "description": "Calculated SSRP for soil component"
         },
         {
-          "name": "cokey",
-          "value": "11510290",
-          "Description":"Soil Component Key"
+            "name": "comp_ssrp_number",
+            "value": 2,
+            "description": "Number representing the SSRP"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 63.72,
-          "Description":"Area of the soil component"
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "D",
-          "Description":"#Hydrologic soil group of the soil component"
-        },
-        
-        {
-          "name": "aoa_comp_drained",
-          "value": true,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "cokey",
+            "value": "11510290",
+            "description": "Cokey of each soil component"
         },
         {
-          "name": "cokey",
-          "value": "11510291",
-          "Description":"Soil Component Key"
+            "name": "aoa_comp_area",
+            "value": 63.72,
+            "description": "Soil Component Area"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 33.22,
-          "Description":"Area of the soil component"
+            "name": "comp_ssrp",
+            "value": "HIGH",
+            "description": "Calculated SSRP for soil component"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "C",
-          "Description":"#Hydrologic soil group of the soil component"
-        },
-        
-        {
-          "name": "aoa_comp_drained",
-          "value": false,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "comp_ssrp_number",
+            "value": 3,
+            "description": "Number representing the SSRP"
         },
         {
-          "name": "cokey",
-          "value": "11510292",
-          "Description":"Soil Component Key"
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 15.19,
-          "Description":"Area of the soil component"
+            "name": "cokey",
+            "value": "11510291",
+            "description": "Cokey of each soil component"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "B/D",
-          "Description":"#Hydrologic soil group of the soil component"
+            "name": "aoa_comp_area",
+            "value": 33.22,
+            "description": "Soil Component Area"
         },
         {
-          "name": "aoa_comp_drained",
-          "value": true,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "comp_ssrp",
+            "value": "HIGH",
+            "description": "Calculated SSRP for soil component"
         },
         {
-          "name": "cokey",
-          "value": "11510293",
-          "Description":"Soil Component Key"
+            "name": "comp_ssrp_number",
+            "value": 3,
+            "description": "Number representing the SSRP"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 32.84,
-          "Description":"Area of the soil component"
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "A/D",
-          "Description":"#Hydrologic soil group of the soil component"
+            "name": "cokey",
+            "value": "11510292",
+            "description": "Cokey of each soil component"
         },
         {
-          "name": "aoa_comp_drained",
-          "value": true,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "aoa_comp_area",
+            "value": 15.19,
+            "description": "Soil Component Area"
         },
         {
-          "name": "cokey",
-          "value": "11510294",
-          "Description":"Soil Component Key"
+            "name": "comp_ssrp",
+            "value": "INTERMEDIATE",
+            "description": "Calculated SSRP for soil component"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 9.64,
-          "Description":"Area of the soil component"
+            "name": "comp_ssrp_number",
+            "value": 2,
+            "description": "Number representing the SSRP"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "C",
-          "Description":"#Hydrologic soil group of the soil component"
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
         },
         {
-          "name": "aoa_comp_drained",
-          "value": false,
-          "Description":"Whether the soil component drained or not"
-        }
-      ],
-      [
-        {
-          "name": "AoAId",
-          "value": 1,
-          "Description":"Area of analysis Identifier"
+            "name": "cokey",
+            "value": "11510293",
+            "description": "Cokey of each soil component"
         },
         {
-          "name": "cokey",
-          "value": "11510295",
-          "Description":"Soil Component Key"
+            "name": "aoa_comp_area",
+            "value": 32.84,
+            "description": "Soil Component Area"
         },
         {
-          "name": "aoa_comp_area",
-          "value": 15.32,
-          "Description":"Area of the soil component"
+            "name": "comp_ssrp",
+            "value": "LOW",
+            "description": "Calculated SSRP for soil component"
         },
         {
-          "name": "aoa_comp_hsg",
-          "value": "D",
-          "Description":"#Hydrologic soil group of the soil component"
+            "name": "comp_ssrp_number",
+            "value": 1,
+            "description": "Number representing the SSRP"
         },
-         {
-          "name": "aoa_comp_drained",
-          "value": true,
-          "Description":"Whether the soil component drained or not"
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
+        },
+        {
+            "name": "cokey",
+            "value": "11510294",
+            "description": "Cokey of each soil component"
+        },
+        {
+            "name": "aoa_comp_area",
+            "value": 9.64,
+            "description": "Soil Component Area"
+        },
+        {
+            "name": "comp_ssrp",
+            "value": "HIGH",
+            "description": "Calculated SSRP for soil component"
+        },
+        {
+            "name": "comp_ssrp_number",
+            "value": 3,
+            "description": "Number representing the SSRP"
+        },
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
+        },
+        {
+            "name": "cokey",
+            "value": "11510295",
+            "description": "Cokey of each soil component"
+        },
+        {
+            "name": "aoa_comp_area",
+            "value": 15.32,
+            "description": "Soil Component Area"
+        },
+        {
+            "name": "comp_ssrp",
+            "value": "HIGH",
+            "description": "Calculated SSRP for soil component"
+        },
+        {
+            "name": "comp_ssrp_number",
+            "value": 3,
+            "description": "Number representing the SSRP"
+        },
+        {
+            "name": "aoa_ssrp",
+            "value": "INTERMEDIATE",
+            "description": "Overall SSRP of the area of analysis"
         }
-      ]
     ]
-  }
-  ]
 }
\ No newline at end of file

test/service_tests/m_pesticide_ssrp_1_0__test3_1.json

@@ -1,66 +1,132 @@
 {
- "metainfo": {
- },
- "parameter": [
-  {
-   "name": "soilcomponents",
-   "value": [
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"Area of analysis Identifier"
-     },
-     {
-      "name": "cokey",
-      "value": "11510284",
-      "Description":"Soil Component Key"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 45.84,
-      "Description":"areo of the soil component"
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "B",
-          "Description":"#Hydrologic soil group of the soil component"
-     },
-     
-     {
-         "name":"aoa_comp_drained",
-         "value":true,
-         "Description":"Whether the soil component is drained or not"
-     }
+    "metainfo": {
+        "status": "Finished",
+        "suid": "71e637c8-334d-11e6-b22c-4f45e8034aba",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-15 17:03:59",
+        "service_url": "http://localhost:8080/csip-wqm/m/pesticide_ssrp/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 2,
+        "expiration_date": "2016-06-15 17:04:29"
+    },
+    "parameter": [
+        {
+            "name": "soilcomponents",
+            "value": [
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis Identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510284",
+                        "Description": "Soil Component Key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 45.84,
+                        "Description": "areo of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "B",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component is drained or not"
+                    }
+                ],
+                [
+                    {
+                        "name": "AoAId",
+                        "value": 1,
+                        "Description": "Area of analysis identifier"
+                    },
+                    {
+                        "name": "cokey",
+                        "value": "11510290",
+                        "Description": "soil component key"
+                    },
+                    {
+                        "name": "aoa_comp_area",
+                        "value": 63.72,
+                        "Decription": "areo of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_hsg",
+                        "value": "D",
+                        "Description": "#Hydrologic soil group of the soil component"
+                    },
+                    {
+                        "name": "aoa_comp_drained",
+                        "value": true,
+                        "Description": "Whether the soil component drained or not"
+                    }
+                ]
+            ]
+        }
     ],
-    [
-     {
-      "name": "AoAId",
-      "value": 1,
-      "Description":"Area of analysis identifier"
-     },
-     {
-      "name": "cokey",
-      "value": "11510290",
-      "Description":"soil component key"
-     },
-     {
-      "name": "aoa_comp_area",
-      "value": 63.72,
-      "Decription":"areo of the soil component"
-     },
-     {
-      "name": "aoa_comp_hsg",
-      "value": "D",
-          "Description":"#Hydrologic soil group of the soil component"
-     },
-     {
-         "name":"aoa_comp_drained",
-         "value":true,
-         "Description":"Whether the soil component drained or not"
-     }
+    "result": [
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
+        },
+        {
+            "name": "cokey",
+            "value": "11510284",
+            "description": "Cokey of each soil component"
+        },
+        {
+            "name": "aoa_comp_area",
+            "value": 45.84,
+            "description": "Soil Component Area"
+        },
+        {
+            "name": "comp_ssrp",
+            "value": "INTERMEDIATE",
+            "description": "Calculated SSRP for soil component"
+        },
+        {
+            "name": "comp_ssrp_number",
+            "value": 2,
+            "description": "Number representing the SSRP"
+        },
+        {
+            "name": "AoAId",
+            "value": 1,
+            "description": "Area of Analysis ID"
+        },
+        {
+            "name": "cokey",
+            "value": "11510290",
+            "description": "Cokey of each soil component"
+        },
+        {
+            "name": "aoa_comp_area",
+            "value": 63.72,
+            "description": "Soil Component Area"
+        },
+        {
+            "name": "comp_ssrp",
+            "value": "HIGH",
+            "description": "Calculated SSRP for soil component"
+        },
+        {
+            "name": "comp_ssrp_number",
+            "value": 3,
+            "description": "Number representing the SSRP"
+        },
+        {
+            "name": "aoa_ssrp",
+            "value": "HIGH",
+            "description": "Overall SSRP of the area of analysis"
+        }
     ]
-   ]
-  }
- ]
-}
+}
\ No newline at end of file

test/service_tests/m_pestlosspot_1_0__test1.json

@@ -1,13 +1,15 @@
 {
     "metainfo": {
         "status": "Finished",
-        "suid": "d4c3ae28-79ba-11e5-86e4-2dc358c2cac4",
-        "cloud_node": "172.1.6.28",
-        "tstamp": "2015-10-23 13:18:24",
+        "suid": "3cb434d7-334d-11e6-b22c-bfc6f77a5a6e",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-15 17:02:30",
         "service_url": "http://localhost:8080/csip-wqm/m/pestlosspot/1.0",
-        "request_ip": "129.82.23.197",
-        "cpu_time": 12,
-        "expiration_date": "2015-10-23 13:23:24"
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 6,
+        "expiration_date": "2016-06-15 17:03:00"
     },
     "parameter": [
         {
@@ -207,5 +209,588 @@
                 ]
             ]
         }
+    ],
+    "result": [
+        {
+            "name": "operation",
+            "value": [
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 4,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "105001",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Standard",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "Terbufos",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 4,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 5,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 500,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 5,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 0.4,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "HA",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 0.05,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Broadcast",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Surface Applied",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                },
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 2,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "108801",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Standard",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "Metolachlor",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 0,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 90,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 200,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 530,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 700,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "HA",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 1117,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Banded",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Surface Applied",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                },
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 5,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "128008",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Standard",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "boscalid",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 0,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 200,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 1225,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 6,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 153,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "HA*",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 167,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "HIGH",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "HIGH",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Broadcast",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Surface Applied",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                },
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 1,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "53501",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Low",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "Methyl parathion",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 0,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 5,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 5100,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 60,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 1,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "HA",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 13,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "VERY LOW",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Broadcast",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Surface Applied",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                },
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 6,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "81901",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Standard",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "Chlorothalonil",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 0,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 30,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 1380,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 0.6,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 15,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "CHCL",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 4.4,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "INTERMEDIATE",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Broadcast",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Surface Applied",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                },
+                {
+                    "name": "pesticide summary",
+                    "value": [
+                        {
+                            "name": "AoAId",
+                            "value": 1,
+                            "description": "Area of Analysis Identifier"
+                        },
+                        {
+                            "name": "operation_id",
+                            "value": 3,
+                            "description": "Operation ID"
+                        },
+                        {
+                            "name": "op_pest_id",
+                            "value": "98301",
+                            "description": "Pesticide Identifier (PC_CODE)"
+                        },
+                        {
+                            "name": "app_rate",
+                            "value": "Standard",
+                            "description": "Pesticide Application Rating"
+                        },
+                        {
+                            "name": "ai_name",
+                            "value": "Aldicarb",
+                            "description": "Active Ingredient Name (AI_NAME)"
+                        },
+                        {
+                            "name": "ai_ph",
+                            "value": 0,
+                            "description": "Active ingredient pH of associate properties (PH)"
+                        },
+                        {
+                            "name": "ai_hl",
+                            "value": 30,
+                            "description": "Active ingredient field half life (HL)"
+                        },
+                        {
+                            "name": "ai_koc",
+                            "value": 30,
+                            "description": "Active ingredient soil organic carbon sorption coefficient (KOC)"
+                        },
+                        {
+                            "name": "ai_sol",
+                            "value": 6000,
+                            "description": "Active ingredient solubility in water (SOL)"
+                        },
+                        {
+                            "name": "ai_humtox",
+                            "value": 3,
+                            "description": "Active ingredient human toxicity value – long term"
+                        },
+                        {
+                            "name": "ai_humtoxtype",
+                            "value": "MCL",
+                            "description": "Active ingredient human toxicity type"
+                        },
+                        {
+                            "name": "ai_fistox",
+                            "value": 3.8,
+                            "description": "Active ingredient maximum acceptable toxicant concentration-fish"
+                        },
+                        {
+                            "name": "ai_fishtoxtype",
+                            "value": "MATC",
+                            "description": "Active ingredient fish toxicity type"
+                        },
+                        {
+                            "name": "ai_plp",
+                            "value": "HIGH",
+                            "description": "Active ingredient pesticide leaching potential"
+                        },
+                        {
+                            "name": "ai_psrp",
+                            "value": "LOW",
+                            "description": "Active ingredient pesticide solution runoff potential"
+                        },
+                        {
+                            "name": "ai_parp",
+                            "value": "VERY LOW",
+                            "description": "Active ingredient pesticide adsorbed runoff potential"
+                        },
+                        {
+                            "name": "op_app_area",
+                            "value": "Broadcast",
+                            "description": "Pesticide application operation area"
+                        },
+                        {
+                            "name": "op_app_method",
+                            "value": "Soil Incorporated",
+                            "description": "Pesticide application operation method"
+                        }
+                    ],
+                    "description": "Pest"
+                }
+            ]
+        }
     ]
 }
\ No newline at end of file

test/service_tests/m_wqsr_1_0__test1.json

@@ -1,79 +1,84 @@
 {
-  "metainfo": {
-    "status": "Finished",
-    "suid": "e268dd74-5c8f-11e5-a835-c9317d9f649a",
-    "cloud_node": "129.82.226.52",
-    "tstamp": "2015-09-16 10:27:55",
-    "service_url": "http://localhost:8080/csip-wqm/m/wqm/wqsr/1.0",
-    "request_ip": "10.1.197.65",
-    "cpu_time": 406,
-    "expiration_date": "2015-09-16 10:32:55"
-  },
-  "parameter": [
-    {
-      "name": "aoas",
-      "value": [
-        [
-          {
-            "name": "aoa_id",
-            "value": 1,
-            "description": "AoA identifier"
-          },
-          {
-            "name": "aoa_geometry",
+    "metainfo": {
+        "status": "Finished",
+        "suid": "87262960-33de-11e6-b22c-0b3a2cbd4902",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-16 10:22:32",
+        "service_url": "http://localhost:8080/csip-wqm/m/wqm/wqsr/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 149,
+        "expiration_date": "2016-06-16 10:23:02"
+    },
+    "parameter": [
+        {
+            "name": "aoas",
             "value": [
-              [
                 [
-                  -104.612,
-                  40.404
-                ],
+                    {
+                        "name": "aoa_id",
+                        "value": 1,
+                        "description": "AoA identifier"
+                    },
+                    {
+                        "name": "aoa_geometry",
+                        "value": {
+                            "type": "Polygon",
+                            "coordinates": [
+                                [
+                                    [
+                                        -104.612,
+                                        40.404
+                                    ],
+                                    [
+                                        -104.61,
+                                        40.404
+                                    ],
+                                    [
+                                        -104.61,
+                                        40.402
+                                    ],
+                                    [
+                                        -104.612,
+                                        40.402
+                                    ],
+                                    [
+                                        -104.612,
+                                        40.404
+                                    ]
+                                ]
+                            ],
+                            "description": "Area of Analysis Geometry"
+                        }
+                    }
+                ]
+            ],
+            "description": "List of AoAs"
+        }
+    ],
+    "result": [
+        {
+            "name": "",
+            "value": [
                 [
-                  -104.61,
-                  40.404
-                ],
-                [
-                  -104.61,
-                  40.402
-                ],
-                [
-                  -104.612,
-                  40.402
-                ],
-                [
-                  -104.612,
-                  40.404
+                    {
+                        "name": "AoAId",
+                        "value": "1",
+                        "description": "Area of Analysis Identifier"
+                    },
+                    {
+                        "name": "wqs_Rating",
+                        "value": "Base",
+                        "description": "WQS Rating"
+                    },
+                    {
+                        "name": "wqs_treatment_level",
+                        "value": "I",
+                        "description": "WQS Treatment Level"
+                    }
                 ]
-              ]
-            ],
-            "decription": "AoA coordinate geometry"
-          }
-        ]
-      ],
-      "description": "List of AoAs"
-    }
-  ],
-  "result": [
-    {
-      "name": "",
-      "value": [
-        [
-          {
-            "name": "AoAId",
-            "value": "1",
-            "description": "Area of Analysis Identifier"
-          },
-          {
-            "name": "wqs_Rating",
-            "value": "Base",
-            "description": "WQS Rating"
-          },
-          {
-            "name": "wqs_treatment_level",
-            "value": "I",
-            "description": "WQS Treatment Level"
-          }
-        ]
-      ]
-    }
-  ]
+            ]
+        }
+    ]
 }
\ No newline at end of file

test/service_tests/m_wqsr_1_0__test2.json

@@ -1,13 +1,15 @@
 {
     "metainfo": {
         "status": "Finished",
-        "suid": "1b2aa6be-6161-11e5-b889-331a90887e84",
-        "cloud_node": "129.82.226.52",
-        "tstamp": "2015-09-22 13:35:40",
+        "suid": "ca9d95c1-33de-11e6-b22c-a5aa71d9b63b",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-16 10:24:25",
         "service_url": "http://localhost:8080/csip-wqm/m/wqm/wqsr/1.0",
-        "request_ip": "129.82.225.102",
-        "cpu_time": 10,
-        "expiration_date": "2015-09-22 13:40:40"
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 144,
+        "expiration_date": "2016-06-16 10:24:55"
     },
     "parameter": [
         {
@@ -21,31 +23,34 @@
                     },
                     {
                         "name": "aoa_geometry",
-                        "value": [
-                            [
+                        "value": {
+                            "type": "Polygon",
+                            "coordinates": [
                                 [
-                                    -104.66,
-                                    40.4
-                                ],
-                                [
-                                    -104.64,
-                                    40.4
-                                ],
-                                [
-                                    -104.64,
-                                    40.39
-                                ],
-                                [
-                                    -104.66,
-                                    40.39
-                                ],
-                                [
-                                    -104.66,
-                                    40.4
+                                    [
+                                        -104.66,
+                                        40.4
+                                    ],
+                                    [
+                                        -104.64,
+                                        40.4
+                                    ],
+                                    [
+                                        -104.64,
+                                        40.39
+                                    ],
+                                    [
+                                        -104.66,
+                                        40.39
+                                    ],
+                                    [
+                                        -104.66,
+                                        40.4
+                                    ]
                                 ]
-                            ]
-                        ],
-                        "decription": "AoA coordinate geometry"
+                            ],
+                            "description": "Area of Analysis Geometry"
+                        }
                     }
                 ]
             ],
@@ -64,12 +69,12 @@
                     },
                     {
                         "name": "wqs_Rating",
-                        "value": "Critical",
+                        "value": "Base",
                         "description": "WQS Rating"
                     },
                     {
                         "name": "wqs_treatment_level",
-                        "value": "III",
+                        "value": "I",
                         "description": "WQS Treatment Level"
                     }
                 ]

test/service_tests/m_wqsr_1_0__test3.json

@@ -1,79 +1,84 @@
 {
-  "metainfo": {
-    "status": "Finished",
-    "suid": "2d673065-6160-11e5-b889-df83e435cb12",
-    "cloud_node": "129.82.226.52",
-    "tstamp": "2015-09-22 13:29:01",
-    "service_url": "http://localhost:8080/csip-wqm/m/wqm/wqsr/1.0",
-    "request_ip": "129.82.225.102",
-    "cpu_time": 33,
-    "expiration_date": "2015-09-22 13:34:01"
-  },
-  "parameter": [
-    {
-      "name": "aoas",
-      "value": [
-        [
-          {
-            "name": "aoa_id",
-            "value": 1,
-            "description": "AoA identifier"
-          },
-          {
-            "name": "aoa_geometry",
+    "metainfo": {
+        "status": "Finished",
+        "suid": "223a7aa2-33df-11e6-b22c-11cbbd5d1310",
+        "cloud_node": "10.2.228.74",
+        "tstamp": "2016-06-16 10:26:52",
+        "service_url": "http://localhost:8080/csip-wqm/m/wqm/wqsr/1.0",
+        "request_ip": "0:0:0:0:0:0:0:1",
+        "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 14:38 by robert$",
+        "csip.version": "$version: 2.1.66 112a2203473b 2016-05-26 od, built at 2016-06-15 14:38 by robert$",
+        "cpu_time": 129,
+        "expiration_date": "2016-06-16 10:27:22"
+    },
+    "parameter": [
+        {
+            "name": "aoas",
             "value": [
-              [
                 [
-                  -104.649,
-                  40.407
-                ],
+                    {
+                        "name": "aoa_id",
+                        "value": 1,
+                        "description": "AoA identifier"
+                    },
+                    {
+                        "name": "aoa_geometry",
+                        "value": {
+                            "type": "Polygon",
+                            "coordinates": [
+                                [
+                                    [
+                                        -104.649,
+                                        40.407
+                                    ],
+                                    [
+                                        -104.647,
+                                        40.406
+                                    ],
+                                    [
+                                        -104.647,
+                                        40.403
+                                    ],
+                                    [
+                                        -104.65,
+                                        40.403
+                                    ],
+                                    [
+                                        -104.649,
+                                        40.407
+                                    ]
+                                ]
+                            ],
+                            "description": "Area of Analysis Geometry"
+                        }
+                    }
+                ]
+            ],
+            "description": "List of AoAs"
+        }
+    ],
+    "result": [
+        {
+            "name": "",
+            "value": [
                 [
-                  -104.647,
-                  40.406
-                ],
-                [
-                  -104.647,
-                  40.403
-                ],
-                [
-                  -104.65,
-                  40.403
-                ],
-                [
-                  -104.649,
-                  40.407
+                    {
+                        "name": "AoAId",
+                        "value": "1",
+                        "description": "Area of Analysis Identifier"
+                    },
+                    {
+                        "name": "wqs_Rating",
+                        "value": "Base",
+                        "description": "WQS Rating"
+                    },
+                    {
+                        "name": "wqs_treatment_level",
+                        "value": "I",
+                        "description": "WQS Treatment Level"
+                    }
                 ]
-              ]
-            ],
-            "decription": "AoA coordinate geometry"
-          }
-        ]
-      ],
-      "description": "List of AoAs"
-    }
-  ],
-  "result": [
-    {
-      "name": "",
-      "value": [
-        [
-          {
-            "name": "AoAId",
-            "value": "1",
-            "description": "Area of Analysis Identifier"
-          },
-          {
-            "name": "wqs_Rating",
-            "value": "Sensitive",
-            "description": "WQS Rating"
-          },
-          {
-            "name": "wqs_treatment_level",
-            "value": "II",
-            "description": "WQS Treatment Level"
-          }
-        ]
-      ]
-    }
-  ]
+            ]
+        }
+    ]
 }
\ No newline at end of file