Update, with a bug found in RegionGrid

GeoRegionsEcosystem · Jun 24, 2021 · e04299f · e04299f · natgeo-wong · Jun 24, 2021
1 parent f76b279
commit e04299f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GeoRegions"
 uuid = "b001f823-fa75-4bff-bf55-6610c8f3688a"
 authors = ["natgeo-wong <[email protected]>"]
-version = "2.0.0"
+version = "2.0.1"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/Extract.jl b/src/Extract.jl
@@ -101,7 +101,7 @@ function RegionGrid(
     mask = Array{FT,2}(undef,length(nlon),length(nlat))
     for ilat = 1 : length(nlat), ilon = 1 : length(nlon)
         ipnt = Point2(nlon[ilon],nlat[ilat])
-        if isPointinGeoRegion(ipnt,geo,throw=false)
+        if isinGeoRegion(ipnt,geo,throw=false)
               mask[ilon,ilat] = 1
         else; mask[ilon,ilat] = NaN
         end

diff --git a/src/IsInGeoRegion.jl b/src/IsInGeoRegion.jl
@@ -200,8 +200,8 @@ function isinGeoRegion(
     mask = zeros(Bool,nlon,nlat)
 
     for ilat in 1 : nlat, ilon = 1 : nlon
-        if isPointinGeoRegion(Point2(lon[ilon],lat[ilat]),Child,throw=false)
-            if !isPointinGeoRegion(Point2(lon[ilon],lat[ilat]),GeoReg,throw=false)
+        if isinGeoRegion(Point2(lon[ilon],lat[ilat]),Child,throw=false)
+            if !isinGeoRegion(Point2(lon[ilon],lat[ilat]),GeoReg,throw=false)
                 mask[ilon,ilat] = 1
             end
         end
@@ -251,7 +251,7 @@ function isinGeoRegion(
 
     isin = isgridinregion(
         [Child.N,Child.S,Child.E,Child.W],
-        [GeoReg.N,GeoReg.S,GeoReg.E,GeoReg,W],
+        [GeoReg.N,GeoReg.S,GeoReg.E,GeoReg.W],
         throw=false
     )