Merge branch 'master' of github.com:intersystems-ru/spatialindex

Author: ARechitsky

SpatialIndex_Index.xml

@@ -19,14 +19,18 @@
 This method is invoked when an existing instance of va class is deleted.</Description>
 <ClassMethod>1</ClassMethod>
 <CodeMode>generator</CodeMode>
-<FormalSpec>rect:%Binary</FormalSpec>
+<FormalSpec>queryType:%Binary,queryParams:%String</FormalSpec>
 <ReturnType>%Library.Binary</ReturnType>
 <SqlProc>1</SqlProc>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-$$$GENERATE($C(9)_"set result = ##class(SpatialIndex.SQLResult).%New()")
-$$$GENERATE($C(9)_"do result.PrepareFind(rect)")
-$$$GENERATE($C(9)_"quit result")
+if %mode'="method" {
+set IndexGlobal = ..IndexLocation(%class,%property)
+set IndexGlobalQ = $$$QUOTE(IndexGlobal)
+$$$GENERATE($C(9)_"set result = ##class(SpatialIndex.SQLResult).%New()")
+$$$GENERATE($C(9)_"do result.PrepareFind($Name("_IndexGlobal_"), queryType, queryParams)")
+$$$GENERATE($C(9)_"quit result")
+}
 ]]></Implementation>
 </Method>
 

SpatialIndex_QueryExecutor.xml

@@ -27,7 +27,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 set index = $i(qHandle("index"))
-set AtEnd = index>=qHandle("data")
+set AtEnd = index>=$G(qHandle("data"))
 set Row = $lb(qHandle("data", index))
 return $$$OK
 ]]></Implementation>

SpatialIndex_SQLResult.xml

@@ -20,15 +20,31 @@
 </Method>
 
 <Method name="PrepareFind">
-<FormalSpec>rect:%Binary</FormalSpec>
+<FormalSpec>indexGlobal:%String,queryType:%String,queryParams:%Binary</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-set str = ""
-set $BIT(str,10 + 1) = 1
-set $BIT(str,15 + 1) = 1
-set $BIT(str,17 + 1) = 1
-set i%ResultBits = 1
-set i%ResultBits(1) = str
+//for now we only have queryType = window
+for i = 1:1:4 {
+set item = $Piece(queryParams, ",", i)
+set param = $Piece(item, "=", 1)
+set value = $Piece(item, "=" ,2)
+if param = "minx" {
+set minx = value
+} elseif param = "maxx" {
+set maxx = value
+} elseif param = "maxy"{
+set maxy = value
+} elseif param = "miny" {
+set miny = value
+}
+}
+set rset = ##class(%ResultSet).%New("SpatialIndex.QueryExecutor:FindWindow")
+	do rset.Execute(indexGlobal,minx,miny,maxx,maxy)
+	while (rset.Next()){
+	set id = rset.Get("Id")
+	set tChunk = (id\64000)+1, tPos=(id#64000)+1
+	set $BIT(i%ResultBits(tChunk),tPos) = 1
+}
 quit $$$OK
 ]]></Implementation>
 </Method>
@@ -38,14 +54,14 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 set tChunk = (pItem\64000)+1, tPos=(pItem#64000)+1
-quit $bit($g(i%ResultBits(tChunk)),tPos)
+quit $bit($get(i%ResultBits(tChunk)),tPos)
 ]]></Implementation>
 </Method>
 
 <Method name="GetChunk">
 <FormalSpec>pChunk:%Integer</FormalSpec>
 <ReturnType>%Binary</ReturnType>
-<Implementation><![CDATA[quit $g(i%ResultBits(pChunk))
+<Implementation><![CDATA[quit $get(i%ResultBits(pChunk))
 ]]></Implementation>
 </Method>
 

SpatialIndex_Test.xml

@@ -54,22 +54,18 @@
 <IndexLocation>^SpatialIndex.TestI</IndexLocation>
 <StreamLocation>^SpatialIndex.TestS</StreamLocation>
 <Data name="TestDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
 <Value name="2">
 <Value>Name</Value>
 </Value>
 <Value name="3">
-<Value>X</Value>
-</Value>
-<Value name="4">
-<Value>Y</Value>
-</Value>
-<Value name="5">
 <Value>Latitude</Value>
 </Value>
-<Value name="6">
+<Value name="4">
 <Value>Longitude</Value>
 </Value>
 </Data>