From 700962c4bc34aef136216ab6afdb425a45ccda45 Mon Sep 17 00:00:00 2001
From: Riccardo Boero <ribo@nilu.no>
Date: Wed, 9 Oct 2024 15:03:08 +0200
Subject: [PATCH] Moved data services source code, fixed references in tests.
---
src/FACT_data_API_reader.jl | 24 +++++++++++-----------
src/{ => data_services}/FACT_air.jl | 0
src/{ => data_services}/FACT_bldgs.jl | 0
src/{ => data_services}/FACT_elevation.jl | 0
src/{ => data_services}/FACT_geo.jl | 0
src/{ => data_services}/FACT_jobs.jl | 0
src/{ => data_services}/FACT_lulc.jl | 0
src/{ => data_services}/FACT_mine.jl | 0
src/{ => data_services}/FACT_population.jl | 0
src/{ => data_services}/FACT_ports.jl | 0
src/{ => data_services}/FACT_power.jl | 0
src/{ => data_services}/FACT_rail.jl | 0
src/{ => data_services}/FACT_road.jl | 0
test/nm_test/FACT_air.jl | 2 +-
test/nm_test/FACT_bldgs.jl | 2 +-
test/nm_test/FACT_elevation.jl | 2 +-
test/nm_test/FACT_geo.jl | 2 +-
test/nm_test/FACT_jobs.jl | 2 +-
test/nm_test/FACT_lulc.jl | 2 +-
test/nm_test/FACT_mine.jl | 2 +-
test/nm_test/FACT_population.jl | 2 +-
test/nm_test/FACT_ports.jl | 2 +-
test/nm_test/FACT_power.jl | 2 +-
test/nm_test/FACT_rail.jl | 2 +-
test/nm_test/FACT_road_NA.jl | 2 +-
test/no_test/FACT_air.jl | 2 +-
test/no_test/FACT_bldgs.jl | 2 +-
test/no_test/FACT_elevation.jl | 2 +-
test/no_test/FACT_geo.jl | 2 +-
test/no_test/FACT_jobs.jl | 2 +-
test/no_test/FACT_lulc.jl | 2 +-
test/no_test/FACT_mine.jl | 2 +-
test/no_test/FACT_population.jl | 2 +-
test/no_test/FACT_ports.jl | 2 +-
test/no_test/FACT_power.jl | 2 +-
test/no_test/FACT_rail.jl | 2 +-
test/no_test/FACT_road_EU.jl | 2 +-
test/runtests.jl | 6 +++---
38 files changed, 39 insertions(+), 39 deletions(-)
rename src/{ => data_services}/FACT_air.jl (100%)
rename src/{ => data_services}/FACT_bldgs.jl (100%)
rename src/{ => data_services}/FACT_elevation.jl (100%)
rename src/{ => data_services}/FACT_geo.jl (100%)
rename src/{ => data_services}/FACT_jobs.jl (100%)
rename src/{ => data_services}/FACT_lulc.jl (100%)
rename src/{ => data_services}/FACT_mine.jl (100%)
rename src/{ => data_services}/FACT_population.jl (100%)
rename src/{ => data_services}/FACT_ports.jl (100%)
rename src/{ => data_services}/FACT_power.jl (100%)
rename src/{ => data_services}/FACT_rail.jl (100%)
rename src/{ => data_services}/FACT_road.jl (100%)
diff --git a/src/FACT_data_API_reader.jl b/src/FACT_data_API_reader.jl
index f324bff..937970c 100644
--- a/src/FACT_data_API_reader.jl
+++ b/src/FACT_data_API_reader.jl
@@ -31,29 +31,29 @@ module FACT_data_API_reader
include("utils/web_service.jl")
include("utils/containers_configuration.jl")
export get_data_container_config
- include("FACT_geo.jl")
+ include("data_services/FACT_geo.jl")
export get_geo_objects
- include("FACT_road.jl")
+ include("data_services/FACT_road.jl")
export get_travel_data_eu, get_travel_data_na
- include("FACT_jobs.jl")
+ include("data_services/FACT_jobs.jl")
export get_annual_jobs
- include("FACT_population.jl")
+ include("data_services/FACT_population.jl")
export get_annual_population
- include("FACT_air.jl")
+ include("data_services/FACT_air.jl")
export get_airports_traffic
- include("FACT_elevation.jl")
+ include("data_services/FACT_elevation.jl")
export get_elevation_data
- include("FACT_rail.jl")
+ include("data_services/FACT_rail.jl")
export get_rail_stations_lines
- include("FACT_ports.jl")
+ include("data_services/FACT_ports.jl")
export get_ports_tonnage
- include("FACT_power.jl")
+ include("data_services/FACT_power.jl")
export get_power_stations_lines
- include("FACT_lulc.jl")
+ include("data_services/FACT_lulc.jl")
export get_land_use_data
- include("FACT_mine.jl")
+ include("data_services/FACT_mine.jl")
export get_geology, get_minerals
- include("FACT_bldgs.jl")
+ include("data_services/FACT_bldgs.jl")
export get_bldgs_footprint_height
diff --git a/src/FACT_air.jl b/src/data_services/FACT_air.jl
similarity index 100%
rename from src/FACT_air.jl
rename to src/data_services/FACT_air.jl
diff --git a/src/FACT_bldgs.jl b/src/data_services/FACT_bldgs.jl
similarity index 100%
rename from src/FACT_bldgs.jl
rename to src/data_services/FACT_bldgs.jl
diff --git a/src/FACT_elevation.jl b/src/data_services/FACT_elevation.jl
similarity index 100%
rename from src/FACT_elevation.jl
rename to src/data_services/FACT_elevation.jl
diff --git a/src/FACT_geo.jl b/src/data_services/FACT_geo.jl
similarity index 100%
rename from src/FACT_geo.jl
rename to src/data_services/FACT_geo.jl
diff --git a/src/FACT_jobs.jl b/src/data_services/FACT_jobs.jl
similarity index 100%
rename from src/FACT_jobs.jl
rename to src/data_services/FACT_jobs.jl
diff --git a/src/FACT_lulc.jl b/src/data_services/FACT_lulc.jl
similarity index 100%
rename from src/FACT_lulc.jl
rename to src/data_services/FACT_lulc.jl
diff --git a/src/FACT_mine.jl b/src/data_services/FACT_mine.jl
similarity index 100%
rename from src/FACT_mine.jl
rename to src/data_services/FACT_mine.jl
diff --git a/src/FACT_population.jl b/src/data_services/FACT_population.jl
similarity index 100%
rename from src/FACT_population.jl
rename to src/data_services/FACT_population.jl
diff --git a/src/FACT_ports.jl b/src/data_services/FACT_ports.jl
similarity index 100%
rename from src/FACT_ports.jl
rename to src/data_services/FACT_ports.jl
diff --git a/src/FACT_power.jl b/src/data_services/FACT_power.jl
similarity index 100%
rename from src/FACT_power.jl
rename to src/data_services/FACT_power.jl
diff --git a/src/FACT_rail.jl b/src/data_services/FACT_rail.jl
similarity index 100%
rename from src/FACT_rail.jl
rename to src/data_services/FACT_rail.jl
diff --git a/src/FACT_road.jl b/src/data_services/FACT_road.jl
similarity index 100%
rename from src/FACT_road.jl
rename to src/data_services/FACT_road.jl
diff --git a/test/nm_test/FACT_air.jl b/test/nm_test/FACT_air.jl
index e483ef5..0326500 100644
--- a/test/nm_test/FACT_air.jl
+++ b/test/nm_test/FACT_air.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_air test" begin
+@testset "FACT_data_API_reader FACT_air test" begin
df1 = get_geo_objects("nm_counties")
selection_dict = Dict(
"geo_id" => df1[!, :geo_id],
diff --git a/test/nm_test/FACT_bldgs.jl b/test/nm_test/FACT_bldgs.jl
index f05d092..e07c4ec 100644
--- a/test/nm_test/FACT_bldgs.jl
+++ b/test/nm_test/FACT_bldgs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_bldgs test" begin
+@testset "FACT_data_API_reader FACT_bldgs test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_elevation.jl b/test/nm_test/FACT_elevation.jl
index 9bd00cc..9a0adf9 100644
--- a/test/nm_test/FACT_elevation.jl
+++ b/test/nm_test/FACT_elevation.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_elevation test" begin
+@testset "FACT_data_API_reader FACT_elevation test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 1)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_geo.jl b/test/nm_test/FACT_geo.jl
index 8261c9a..15d99b3 100644
--- a/test/nm_test/FACT_geo.jl
+++ b/test/nm_test/FACT_geo.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_geo test" begin
+@testset "FACT_data_API_reader FACT_geo test" begin
df = get_geo_objects("nm_counties")
# Test if the result is a DataFrame
@test df isa DataFrame
diff --git a/test/nm_test/FACT_jobs.jl b/test/nm_test/FACT_jobs.jl
index 7590fa3..305a0dc 100644
--- a/test/nm_test/FACT_jobs.jl
+++ b/test/nm_test/FACT_jobs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_jobs test" begin
+@testset "FACT_data_API_reader FACT_jobs test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
year = 2018
diff --git a/test/nm_test/FACT_lulc.jl b/test/nm_test/FACT_lulc.jl
index 145c97d..2c71a3e 100644
--- a/test/nm_test/FACT_lulc.jl
+++ b/test/nm_test/FACT_lulc.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_lulc test" begin
+@testset "FACT_data_API_reader FACT_lulc test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_mine.jl b/test/nm_test/FACT_mine.jl
index 6ff962b..0e3e013 100644
--- a/test/nm_test/FACT_mine.jl
+++ b/test/nm_test/FACT_mine.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_mine test" begin
+@testset "FACT_data_API_reader FACT_mine test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_population.jl b/test/nm_test/FACT_population.jl
index 1c9839e..f1fc739 100644
--- a/test/nm_test/FACT_population.jl
+++ b/test/nm_test/FACT_population.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_population test" begin
+@testset "FACT_data_API_reader FACT_population test" begin
df1 = get_geo_objects("nm_blocks")
resize!(df1, 5)
year = 2020
diff --git a/test/nm_test/FACT_ports.jl b/test/nm_test/FACT_ports.jl
index 99651de..f074ffd 100644
--- a/test/nm_test/FACT_ports.jl
+++ b/test/nm_test/FACT_ports.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_ports test" begin
+@testset "FACT_data_API_reader FACT_ports test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_power.jl b/test/nm_test/FACT_power.jl
index 5ed2fe8..0f91f4f 100644
--- a/test/nm_test/FACT_power.jl
+++ b/test/nm_test/FACT_power.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_power test" begin
+@testset "FACT_data_API_reader FACT_power test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_rail.jl b/test/nm_test/FACT_rail.jl
index 333cfe0..c5c6675 100644
--- a/test/nm_test/FACT_rail.jl
+++ b/test/nm_test/FACT_rail.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_rail test" begin
+@testset "FACT_data_API_reader FACT_rail test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/nm_test/FACT_road_NA.jl b/test/nm_test/FACT_road_NA.jl
index f6b7774..0348a77 100644
--- a/test/nm_test/FACT_road_NA.jl
+++ b/test/nm_test/FACT_road_NA.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_road_NA test" begin
+@testset "FACT_data_API_reader FACT_road_NA test" begin
df1 = get_geo_objects("nm_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_air.jl b/test/no_test/FACT_air.jl
index 1c466b0..9ed22dd 100644
--- a/test/no_test/FACT_air.jl
+++ b/test/no_test/FACT_air.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_air test" begin
+@testset "FACT_data_API_reader FACT_air test" begin
df1 = get_geo_objects("no_counties")
selection_dict = Dict(
"geo_id" => df1[!, :geo_id],
diff --git a/test/no_test/FACT_bldgs.jl b/test/no_test/FACT_bldgs.jl
index 7dfd8b2..d7d55f5 100644
--- a/test/no_test/FACT_bldgs.jl
+++ b/test/no_test/FACT_bldgs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_bldgs test" begin
+@testset "FACT_data_API_reader FACT_bldgs test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_elevation.jl b/test/no_test/FACT_elevation.jl
index 6b84ef5..dd19661 100644
--- a/test/no_test/FACT_elevation.jl
+++ b/test/no_test/FACT_elevation.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_elevation test" begin
+@testset "FACT_data_API_reader FACT_elevation test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 1)
selection_dict = Dict(
diff --git a/test/no_test/FACT_geo.jl b/test/no_test/FACT_geo.jl
index 5632d80..22b2184 100644
--- a/test/no_test/FACT_geo.jl
+++ b/test/no_test/FACT_geo.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_geo test" begin
+@testset "FACT_data_API_reader FACT_geo test" begin
df = get_geo_objects("no_counties")
# Test if the result is a DataFrame
@test df isa DataFrame
diff --git a/test/no_test/FACT_jobs.jl b/test/no_test/FACT_jobs.jl
index 968d8d4..4921aa6 100644
--- a/test/no_test/FACT_jobs.jl
+++ b/test/no_test/FACT_jobs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_jobs test" begin
+@testset "FACT_data_API_reader FACT_jobs test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
year = 2018
diff --git a/test/no_test/FACT_lulc.jl b/test/no_test/FACT_lulc.jl
index 58c4dcd..54999da 100644
--- a/test/no_test/FACT_lulc.jl
+++ b/test/no_test/FACT_lulc.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_lulc test" begin
+@testset "FACT_data_API_reader FACT_lulc test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_mine.jl b/test/no_test/FACT_mine.jl
index a7e8440..c3460b6 100644
--- a/test/no_test/FACT_mine.jl
+++ b/test/no_test/FACT_mine.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_mine test" begin
+@testset "FACT_data_API_reader FACT_mine test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_population.jl b/test/no_test/FACT_population.jl
index ff9a93e..07bdb6e 100644
--- a/test/no_test/FACT_population.jl
+++ b/test/no_test/FACT_population.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_population test" begin
+@testset "FACT_data_API_reader FACT_population test" begin
df1 = get_geo_objects("no_lau")
year = 2011
selection_dict = Dict(
diff --git a/test/no_test/FACT_ports.jl b/test/no_test/FACT_ports.jl
index 7381bd0..839a67c 100644
--- a/test/no_test/FACT_ports.jl
+++ b/test/no_test/FACT_ports.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_ports test" begin
+@testset "FACT_data_API_reader FACT_ports test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_power.jl b/test/no_test/FACT_power.jl
index 6f40a97..78938a8 100644
--- a/test/no_test/FACT_power.jl
+++ b/test/no_test/FACT_power.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_power test" begin
+@testset "FACT_data_API_reader FACT_power test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/no_test/FACT_rail.jl b/test/no_test/FACT_rail.jl
index ec64782..0d59918 100644
--- a/test/no_test/FACT_rail.jl
+++ b/test/no_test/FACT_rail.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_rail test" begin
+@testset "FACT_data_API_reader FACT_rail test" begin
df1 = get_geo_objects("no_counties")
selection_dict = Dict(
"geo_id" => df1[!, :geo_id],
diff --git a/test/no_test/FACT_road_EU.jl b/test/no_test/FACT_road_EU.jl
index 49f86ea..f2ce0aa 100644
--- a/test/no_test/FACT_road_EU.jl
+++ b/test/no_test/FACT_road_EU.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_road_EU test" begin
+@testset "FACT_data_API_reader FACT_road_EU test" begin
df1 = get_geo_objects("no_counties")
resize!(df1, 3)
selection_dict = Dict(
diff --git a/test/runtests.jl b/test/runtests.jl
index 9792602..7fa2cfe 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,8 +1,8 @@
using Test
using DataFrames
-using FACTDataReader
+using FACT_data_API_reader
-@testset "FACTDataREader New Mexico Tests" begin
+@testset "FACT_data_API_reader New Mexico Tests" begin
include("nm_test/FACT_geo.jl")
include("nm_test/FACT_jobs.jl")
include("nm_test/FACT_population.jl")
@@ -17,7 +17,7 @@ using FACTDataReader
include("nm_test/FACT_bldgs.jl")
end
-@testset "FACTDataREader Norway Tests" begin
+@testset "FACT_data_API_reader Norway Tests" begin
include("no_test/FACT_geo.jl")
include("no_test/FACT_jobs.jl")
include("no_test/FACT_population.jl")
--
GitLab