From 9297a3195ec0c1d9c63f858348d52929f3f934c8 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Mon, 7 Mar 2022 10:01:33 -0800 Subject: [PATCH] Move geodata folder --- Makefile.am | 1 + geodata/Makefile.mk | 11 +++++++++++ .../geodata => geodata}/autotest/test_datasets.glm | 0 {gldcore/geodata => geodata}/autotest/unittest.sh | 0 {gldcore/geodata => geodata}/geodata_address.py | 0 {gldcore/geodata => geodata}/geodata_census.py | 0 {gldcore/geodata => geodata}/geodata_distance.py | 0 {gldcore/geodata => geodata}/geodata_elevation.py | 0 {gldcore/geodata => geodata}/geodata_powerline.py | 0 .../geodata_powerline_cabletypes.csv | 0 {gldcore/geodata => geodata}/geodata_utility.py | 0 {gldcore/geodata => geodata}/geodata_vegetation.py | 0 {gldcore/geodata => geodata}/geodata_weather.py | 0 {gldcore/geodata => geodata}/requirements.txt | 0 gldcore/Makefile.mk | 1 - gldcore/geodata/Makefile.mk | 10 ---------- gldcore/geodata/geodata.conf | 1 - 17 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 geodata/Makefile.mk rename {gldcore/geodata => geodata}/autotest/test_datasets.glm (100%) rename {gldcore/geodata => geodata}/autotest/unittest.sh (100%) rename {gldcore/geodata => geodata}/geodata_address.py (100%) rename {gldcore/geodata => geodata}/geodata_census.py (100%) rename {gldcore/geodata => geodata}/geodata_distance.py (100%) rename {gldcore/geodata => geodata}/geodata_elevation.py (100%) rename {gldcore/geodata => geodata}/geodata_powerline.py (100%) rename {gldcore/geodata => geodata}/geodata_powerline_cabletypes.csv (100%) rename {gldcore/geodata => geodata}/geodata_utility.py (100%) rename {gldcore/geodata => geodata}/geodata_vegetation.py (100%) rename {gldcore/geodata => geodata}/geodata_weather.py (100%) rename {gldcore/geodata => geodata}/requirements.txt (100%) delete mode 100644 gldcore/geodata/Makefile.mk delete mode 100644 gldcore/geodata/geodata.conf diff --git a/Makefile.am b/Makefile.am index 8aa566edd..ec38b1db8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ include $(top_srcdir)/gldcore/Makefile.mk include $(top_srcdir)/python_extras/Makefile.mk include $(top_srcdir)/cloud/Makefile.mk include $(top_srcdir)/utilities/Makefile.mk +include $(top_srcdir)/geodata/Makefile.mk # approved modules include $(top_srcdir)/modules.mk diff --git a/geodata/Makefile.mk b/geodata/Makefile.mk new file mode 100644 index 000000000..11155bf0c --- /dev/null +++ b/geodata/Makefile.mk @@ -0,0 +1,11 @@ +# geodata/Makefile.mk +dist_pkgdata_DATA += geodata/geodata_address.py +dist_pkgdata_DATA += geodata/geodata_census.py +dist_pkgdata_DATA += geodata/geodata_distance.py +dist_pkgdata_DATA += geodata/geodata_elevation.py +dist_pkgdata_DATA += geodata/geodata_powerline.py +dist_pkgdata_DATA += geodata/geodata_powerline_cabletypes.csv +# dist_pkgdata_DATA += geodata/geodata_transportation.py +dist_pkgdata_DATA += geodata/geodata_utility.py +dist_pkgdata_DATA += geodata/geodata_vegetation.py +dist_pkgdata_DATA += geodata/geodata_weather.py diff --git a/gldcore/geodata/autotest/test_datasets.glm b/geodata/autotest/test_datasets.glm similarity index 100% rename from gldcore/geodata/autotest/test_datasets.glm rename to geodata/autotest/test_datasets.glm diff --git a/gldcore/geodata/autotest/unittest.sh b/geodata/autotest/unittest.sh similarity index 100% rename from gldcore/geodata/autotest/unittest.sh rename to geodata/autotest/unittest.sh diff --git a/gldcore/geodata/geodata_address.py b/geodata/geodata_address.py similarity index 100% rename from gldcore/geodata/geodata_address.py rename to geodata/geodata_address.py diff --git a/gldcore/geodata/geodata_census.py b/geodata/geodata_census.py similarity index 100% rename from gldcore/geodata/geodata_census.py rename to geodata/geodata_census.py diff --git a/gldcore/geodata/geodata_distance.py b/geodata/geodata_distance.py similarity index 100% rename from gldcore/geodata/geodata_distance.py rename to geodata/geodata_distance.py diff --git a/gldcore/geodata/geodata_elevation.py b/geodata/geodata_elevation.py similarity index 100% rename from gldcore/geodata/geodata_elevation.py rename to geodata/geodata_elevation.py diff --git a/gldcore/geodata/geodata_powerline.py b/geodata/geodata_powerline.py similarity index 100% rename from gldcore/geodata/geodata_powerline.py rename to geodata/geodata_powerline.py diff --git a/gldcore/geodata/geodata_powerline_cabletypes.csv b/geodata/geodata_powerline_cabletypes.csv similarity index 100% rename from gldcore/geodata/geodata_powerline_cabletypes.csv rename to geodata/geodata_powerline_cabletypes.csv diff --git a/gldcore/geodata/geodata_utility.py b/geodata/geodata_utility.py similarity index 100% rename from gldcore/geodata/geodata_utility.py rename to geodata/geodata_utility.py diff --git a/gldcore/geodata/geodata_vegetation.py b/geodata/geodata_vegetation.py similarity index 100% rename from gldcore/geodata/geodata_vegetation.py rename to geodata/geodata_vegetation.py diff --git a/gldcore/geodata/geodata_weather.py b/geodata/geodata_weather.py similarity index 100% rename from gldcore/geodata/geodata_weather.py rename to geodata/geodata_weather.py diff --git a/gldcore/geodata/requirements.txt b/geodata/requirements.txt similarity index 100% rename from gldcore/geodata/requirements.txt rename to geodata/requirements.txt diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk index f3fb69a9a..768383d02 100644 --- a/gldcore/Makefile.mk +++ b/gldcore/Makefile.mk @@ -5,7 +5,6 @@ include gldcore/rt/Makefile.mk include gldcore/converters/Makefile.mk include gldcore/solvers/Makefile.mk include gldcore/scripts/Makefile.mk -include gldcore/geodata/Makefile.mk dist_pkgdata_DATA += gldcore/tzinfo.txt dist_pkgdata_DATA += gldcore/unitfile.txt diff --git a/gldcore/geodata/Makefile.mk b/gldcore/geodata/Makefile.mk deleted file mode 100644 index a34604146..000000000 --- a/gldcore/geodata/Makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ -dist_pkgdata_DATA += gldcore/geodata/geodata_address.py -dist_pkgdata_DATA += gldcore/geodata/geodata_census.py -dist_pkgdata_DATA += gldcore/geodata/geodata_distance.py -dist_pkgdata_DATA += gldcore/geodata/geodata_elevation.py -dist_pkgdata_DATA += gldcore/geodata/geodata_powerline.py -dist_pkgdata_DATA += gldcore/geodata/geodata_powerline_cabletypes.csv -# dist_pkgdata_DATA += gldcore/geodata/geodata_transportation.py -dist_pkgdata_DATA += gldcore/geodata/geodata_utility.py -dist_pkgdata_DATA += gldcore/geodata/geodata_vegetation.py -dist_pkgdata_DATA += gldcore/geodata/geodata_weather.py diff --git a/gldcore/geodata/geodata.conf b/gldcore/geodata/geodata.conf deleted file mode 100644 index a3cea9ea5..000000000 --- a/gldcore/geodata/geodata.conf +++ /dev/null @@ -1 +0,0 @@ -{"vegetation.username": "name@example.com", "vegetation.password": "password5839"}