fix Selectors for Projected lookups (#869)

* changes to selectindices

* fix and text for `IntSelector{<:Tuple}`

* fix for intselector of tuple take 2

* remove stray code in tests

Author: tiemvanderdeure

src/lookup.jl

@@ -91,28 +91,25 @@ dim(lookup::Projected) = lookup.dim
 
 @inline function LA.selectindices(l::Projected, sel::LA.Selector; kw...)
     selval = reproject(mappedcrs(l), crs(l), dim(l), val(sel))
-    LA._selectindices(l, rebuild(sel; val=selval); kw...)
-end
-@inline function LA.selectindices(l::Projected, sel::LA.Selector{<:AbstractVector}; kw...)
-    selval = reproject(mappedcrs(l), crs(l), dim(l), val(sel))
-    LA._selectvec(l, rebuild(sel; val=selval); kw...)
-end
-@inline function LA.selectindices(l::Projected, sel::LA.IntSelector{<:Tuple}; kw...)
-    selval = reproject(mappedcrs(l), crs(l), dim(l), val(sel))
-    LA._selecttuple(l, rebuild(sel; val=selval); kw...)
+    LA._selectindices(l, rebuild(sel, selval); kw...)
 end
+@inline LA.selectindices(l::Projected, sel::LA.Selector{<:AbstractVector}; kw...) =
+    LA._selectvec(l, sel; kw...) # no reprojecting because _selectvec calls selectindices
+@inline LA.selectindices(l::Projected, sel::LA.IntSelector{<:Tuple}; kw...) =
+    LA._selecttuple(l, sel; kw...)
 @inline LA.selectindices(l::Projected{<:Tuple}, sel::LA.IntSelector{<:Tuple}; kw...) = LA._selectindices(l, sel; kw...)
 @inline LA.selectindices(l::Projected{<:Tuple}, sel::LA.IntSelector{<:Tuple{<:Tuple,<:Tuple}}; kw...) = 
     LA._selecttuple(l, sel; kw...)
 
 function LA.selectindices(l::Projected, sel::Between{<:Tuple})
     selval = map(v -> reproject(mappedcrs(l), crs(l), dim(l), v), val(sel))
-    LA.between(l, rebuild(sel; val=selval))
+    LA.between(l, rebuild(sel, selval))
 end
 function LA.selectindices(l::Projected, sel::T) where T<:DD.IntervalSets.Interval
     left, right = map(v -> reproject(mappedcrs(l), crs(l), dim(l), v), (sel.left, sel.right))
-    LA.between(l, T(left, right))
+    LA.between(l, basetypeof(T)(left, right))
 end
+LA.selectindices(l::Projected, sel::Where) = LA.selectindices(convertlookup(Mapped, l), sel)
 
 """
     Mapped <: AbstractProjected

test/reproject.jl

@@ -88,3 +88,19 @@ end
     @test index(Aconv) == (index(convertedlon), index(convertedlat))
     @test val.(span(Aconv)) == val.(span.((convertedlon, convertedlat)))
 end
+
+@testset "selectors on projected dims" begin
+    x = X(Projected(0:1e5:2e5; 
+            order = ForwardOrdered(), crs=EPSG(3857), mappedcrs = EPSG(4326), 
+            sampling=Intervals(Start()), span = Regular(1e5)
+        ))
+    A = Raster(rand(x))
+    @test A[X = 2:3] == 
+        A[X = Near([1, 2])] == 
+        A[X = Near((1, 2))] == 
+        A[X = 0.5 .. 3] ==
+        A[X = Contains([1,2])] ==
+        A[X = Between(0.5,3)] ==
+        A[X = Where(x -> 3 > x > 0.5)] ==
+        A[X = Not(At(0))]
+end