From cccd671c99d0f37768cae41fcaacfd338e2eb2f5 Mon Sep 17 00:00:00 2001
From: Joshua Darnell <josh@kurotek.com>
Date: Wed, 18 Mar 2020 12:17:46 -0700
Subject: [PATCH] Minor corrections to generic.resoscript templates. See issues
 #4 and #5

---
 generic.gold.resoscript |  8 ++++----
 generic.resoscript      | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/generic.gold.resoscript b/generic.gold.resoscript
index fcf1b15..acc66bf 100644
--- a/generic.gold.resoscript
+++ b/generic.gold.resoscript
@@ -126,7 +126,7 @@
     <Parameter Name="EndpointDataSystem" Value="REQUIRED: YOUR DATA SYSTEMS ENDPOINT GOES HERE" />
 
     <!-- REQUIRED: Core - The name of the resource being tested -->
-    <Parameter Name="EndpointResource" Value="REQUIRED: YOUR RESOURCE GOES HERE, FOR EXAMPLE 'Property'" />
+    <Parameter Name="EndpointResource" Value="REQUIRED: YOUR RESOURCE GOES HERE, FOR EXAMPLE, Property" />
 
 
     <!--
@@ -261,7 +261,7 @@
     Requests Section - Queries used during testing,
                        DO NOT CHANGE
   ############################################################-->
-  <Requests>
+    <Requests>
 
     <Request
       TestDescription="Metadata Endpoint"
@@ -730,7 +730,7 @@
       Capability="Query functions"
       WebAPIReference="2.4.7"
       OutputFile="REQ-WA103-QM5_GeoSpatialLongLat_PointGeo.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=*Parameter_GeoSpatialField* ne null and geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue*"
+      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue*"
     />
 
     <Request
@@ -740,7 +740,7 @@
       Capability="Query functions"
       WebAPIReference="2.4.7"
       OutputFile="REQ-WA103-QM5_GeoSpatialLongLat_LatGT1_PointGeo.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=*Parameter_GeoSpatialField* ne null and geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue* and *Parameter_GeoSpatialLatitudeField* gt 1"
+      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue* and *Parameter_GeoSpatialLatitudeField* gt 1"
     />
 
     <Request
diff --git a/generic.resoscript b/generic.resoscript
index 8b46d2b..ec7ad3e 100644
--- a/generic.resoscript
+++ b/generic.resoscript
@@ -67,7 +67,7 @@
   ############################################################-->
 
   <!-- The current version of this RESOScript -->
-  <RESOScriptVersion>1.0.6</RESOScriptVersion>
+  <RESOScriptVersion>1.0.7</RESOScriptVersion>
 
 
   <!--
@@ -126,7 +126,7 @@
     <Parameter Name="EndpointDataSystem" Value="REQUIRED: YOUR DATA SYSTEMS ENDPOINT GOES HERE" />
 
     <!-- REQUIRED: Core - The name of the resource being tested -->
-    <Parameter Name="EndpointResource" Value="REQUIRED: YOUR RESOURCE GOES HERE, FOR EXAMPLE 'Property'" />
+    <Parameter Name="EndpointResource" Value="REQUIRED: YOUR RESOURCE GOES HERE, FOR EXAMPLE, Property" />
 
 
     <!--
@@ -170,17 +170,17 @@
     <Parameter Name="GeoSpatialLatitudeField" Value="Latitude" />
     <Parameter Name="GeoSpatialLongitudeField" Value="Longitude" />
     <Parameter Name="GeoSpatialField" Value="Coordinates" />
-    <Parameter Name="GeoSpatialValue" Value="REQUIRED: YOUR COORDINATES GO HERE in 'Longitude Latitude' format" /> <!-- "Longitude Latitude" -->
+    <Parameter Name="GeoSpatialValue" Value="REQUIRED: YOUR COORDINATES GO HERE in Longitude Latitude format" /> <!-- "Longitude Latitude" -->
 
     <!-- REQUIRED: New Fields for WS103 Testing -->
     <Parameter Name="ValueField" Value="AboveGradeFinishedArea" />
     <Parameter Name="CastField" Value="AboveGradeFinishedArea" />
-    <Parameter Name="CastFieldValue" Value="YOUR CastFieldValue GOES HERE, FOR EXAMPLE 1200" />
+    <Parameter Name="CastFieldValue" Value="YOUR CastFieldValue GOES HERE. FOR EXAMPLE, 1200" />
     <Parameter Name="ConcatFieldOne" Value="StreetName" />
     <Parameter Name="ConcatFieldOneValue" Value="REQUIRED: Your OneValue GOES HERE>" />
     <Parameter Name="ConcatFieldTwo" Value="City" />
     <Parameter Name="ConcatFieldTwoValue" Value="YOUR TwoValue GOES HERE" />
-    <Parameter Name="ConcatFieldBothValue" Value="Your 'OneValue: TwoValue' GOES HERE" /> <!-- format 'OneValue: TwoValue' -->
+    <Parameter Name="ConcatFieldBothValue" Value="Your OneValue: TwoValue GOES HERE" /> <!-- format: "OneValue: TwoValue" -->
 
 
     <!--
@@ -277,6 +277,12 @@
     <Parameter Name="SelectList"
                Value="*Parameter_PlatinumSelectList*" />
 
+    <!-- Computed Has Value - uses SingleValueLookup field -->
+    <Parameter Name="FilterHasField" Value="*Parameter_SingleValueLookupField*" />
+    <Parameter Name="FilterHasValue" Value="*Parameter_SingleValueLookupValue*" />
+    <Parameter Name="FilterHasLookupNamespace" Value="*Parameter_SingleValueLookupNamespace*" />
+    <Parameter Name="FilterHasLookupValue" Value="*Parameter_SingleLookupValue*" />
+
     <!-- Computed Enumeration Values - do not change -->
     <Parameter Name="SingleValueLookupValue" Value="*Parameter_SingleValueLookupNamespace*'*Parameter_SingleLookupValue*'" />
     <Parameter Name="FilterHasValueLookupValue" Value="*Parameter_FilterHasLookupNamespace*'*Parameter_FilterHasLookupValue*'" />
@@ -772,7 +778,7 @@
       Capability="Query functions"
       WebAPIReference="2.4.7"
       OutputFile="REQ-WA103-QM5_GeoSpatialLongLat_PointGeo.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=*Parameter_GeoSpatialField* ne null and geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue*"
+      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue*"
     />
 
     <Request
@@ -782,7 +788,7 @@
       Capability="Query functions"
       WebAPIReference="2.4.7"
       OutputFile="REQ-WA103-QM5_GeoSpatialLongLat_LatGT1_PointGeo.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=*Parameter_GeoSpatialField* ne null and geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue* and *Parameter_GeoSpatialLatitudeField* gt 1"
+      Url="*ClientSettings_WebAPIURI*/*Parameter_EndpointResource*?$top=*Parameter_TopCount*&amp;$select=*Parameter_SelectList*&amp;$filter=geo.distance(*Parameter_GeoSpatialField*, geography'SRID=*Parameter_SRID*;POINT(*Parameter_GeoSpatialValue*)' le *Parameter_GeoSpatialDistanceValue* and *Parameter_GeoSpatialLatitudeField* gt 1"
     />
 
     <Request