Commitbe6d14f

Vincent Landau

committed

add Band dim to generated GeoArrays

1 parent7942efb commitbe6d14fCopy full SHA for be6d14f

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,13 @@ end`
`16`	`16`	`functionconstruct_nodemap(cost_surface::GeoData.GeoArray)`
`17`	`17`	`# Handle dimensions, get them so the order matches the input`
`18`	`18`	`lat_lon_dims=get_lat_lon_dims(cost_surface)`
	`19`	`+ cost_surface_band1= cost_surface[Band(Between(1,1))]`
	`20`	`+`
	`21`	`+# Make an array of unique node identifiers`
	`22`	`+ nodemap=zeros(Int64,size(cost_surface_band1.data))`
	`23`	`+ is_node= (cost_surface_band1.data.!= cost_surface.missingval).&`
	`24`	`+ ((!).(isnan.(cost_surface_band1.data)))`
`19`	`25`
`20`		`-# Make an resistance of unique node identifiers`
`21`		`- nodemap=zeros(Int64,size(cost_surface.data[:, :,1]))`
`22`		`- is_node= (cost_surface.data[:, :,1].!= cost_surface.missingval).&`
`23`		`- ((!).(isnan.(cost_surface.data[:, :,1])))`
`24`	`26`	`nodemap[is_node]=1:sum(is_node)`
`25`	`27`
`26`	`28`	`nodemap= GeoData.GeoArray(nodemap, dims= lat_lon_dims)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ function get_lat_lon_dims(A::GeoData.GeoArray)`
`13`	`13`	`first_dim_type= lat_first? Lat: Lon`
`14`	`14`	`second_dim_type= lat_first? Lon: Lat`
`15`	`15`
`16`		`- (dims(A, first_dim_type),dims(A, second_dim_type))`
	`16`	`+ (dims(A, first_dim_type),dims(A, second_dim_type),Band(1:1,Categorical(order=Ordered())))`
`17`	`17`	`end`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ function pathstate_to_geoarray(cdist::LightGraphs.AbstractPathState,`
`34`	`34`	`cost_threshold= cost_threshold)`
`35`	`35`	`lat_lon_dims=get_lat_lon_dims(nodemap)`
`36`	`36`
`37`		`- cd_geoarray= GeoData.GeoArray(cd_array,`
	`37`	`+ cd_geoarray= GeoData.GeoArray(reshape(cd_array,size(nodemap)),`
`38`	`38`	`dims= lat_lon_dims,`
`39`	`39`	`missingval=-1)`
`40`	`40`	`cd_geoarray`
`@@ -190,7 +190,8 @@ end`
`190`	`190`
`191`	`191`	`functionpath_to_geoarray(path::Vector{Int},`
`192`	`192`	`nodemap::GeoData.GeoArray)`
`193`		`- path_array=path_to_array(path, nodemap.data[:, :,1])`
	`193`	`+ path_array=reshape(path_to_array(path, nodemap.data[:, :,1]),`
	`194`	`+size(nodemap.data))`
`194`	`195`	`lat_lon_dims=get_lat_lon_dims(nodemap)`
`195`	`196`
`196`	`197`	`return GeoData.GeoArray(path_array, dims= lat_lon_dims)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ garray = GeoArray(GDALarray("nlcd_2016_frederick_md.tif", missingval = -9))`
`54`	`54`	`old_data=deepcopy(garray.data[:, :,1])`
`55`	`55`	`nodemap=construct_nodemap(garray)`
`56`	`56`
`57`		`-@testsize(nodemap)==size(garray.data[:, :,1])`
	`57`	`+@testsize(nodemap)==size(garray[Band(Between(1,1))])`
`58`	`58`	`g=construct_graph(garray, nodemap,`
`59`	`59`	`cost_layer_is_conductance=true,`
`60`	`60`	`connect_four_neighbors_only=true,`

Comments

(0)