Skip to content

Commit

Permalink
GOSTRocks to GOSTrocks to match name change
Browse files Browse the repository at this point in the history
  • Loading branch information
@elbeejay
elbeejay committed Mar 20, 2024
1 parent 5bf7594 commit 907ab71
Show file tree
Hide file tree
Showing 21 changed files with 47 additions and 47 deletions.
6 changes: 3 additions & 3 deletions notebooks/Implementations/KAZ_SCADR_UrbanizationReview/ECA_Urban_Extents.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"from shapely.geometry import Point\n",
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.ntlMisc as ntl\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.ntlMisc as ntl\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"sys.path.append(\"../../../src\")\n",
"import GOST_Urban.country_helper as country_helper\n",
Expand Down
6 changes: 3 additions & 3 deletions notebooks/Implementations/KAZ_SCADR_UrbanizationReview/KAZ_Urbanization_Review.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"# import GOSTNetsRaster.conversion_tables as speed_tables\n",
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.ntlMisc as ntl\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.ntlMisc as ntl\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"sys.path.append(\"../../../src\")\n",
"import GOST_Urban.UrbanRaster as urban\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/Implementations/POV_EEAPV_COG_urban_assessment/Summarize_Urban.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.dataMisc as dataMisc\n",
"import GOSTrocks.dataMisc as dataMisc\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Implementations/URB_DECAT_B_ExploringGHSSMODcode.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"# Import raster helpers\n",
"sys.path.append(\"../../gostrocks/src\")\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"from GOSTRocks.misc import tPrint"
"import GOSTrocks.rasterMisc as rMisc\n",
"from GOSTrocks.misc import tPrint"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions ...entations/URB_SCAUR_UKR_B_I_urbanizationReview/URB_SCAUR_UKR_B_I_urbanizationReview.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"\n",
"sys.path.insert(0, \"../../../../gostrocks/src\")\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.ntlMisc as ntl\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.ntlMisc as ntl\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"sys.path.append(\"../../../src\")\n",
"\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Implementations/URB_SEAU1_B_A_Ka_ExtractDataUrban.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"# Import raster helpers\n",
"sys.path.append(\"../../../gostrocks/src\")\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../\")\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Implementations/URB_SEAU1_NovelUrbanization/Create_Mosaick_Datasets.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
6 changes: 3 additions & 3 deletions notebooks/Implementations/URB_SEAU1_NovelUrbanization/GHSL_Standardize_To_Country.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.mapMisc as mapMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.mapMisc as mapMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/Implementations/URB_SEAU1_NovelUrbanization/MAP_Urbanization.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"from GOSTRocks.misc import tPrint\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Implementations/URB_SEAU1_NovelUrbanization/NGA_specific_results.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.dataMisc as dataMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.dataMisc as dataMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
2 changes: 1 addition & 1 deletion ...books/Implementations/URB_SEAU1_NovelUrbanization/URB_SEAU1_B_A_Ka_NovelUrbanizaton.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"# Import raster helpers\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.metadataMisc as meta\n",
"import GOSTrocks.metadataMisc as meta\n",
"\n",
"# Import GOST urban functions\n",
"sys.path.append(\"../../../src\")\n",
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Implementations/URB_SEAU1_NovelUrbanization/novelUrbanization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@


# Import raster helpers
import GOSTRocks.rasterMisc as rMisc
from GOSTRocks.misc import tPrint
import GOSTrocks.rasterMisc as rMisc
from GOSTrocks.misc import tPrint

# Import GOST urban functions
sys.path.append("../../../src")
Expand Down
12 changes: 6 additions & 6 deletions notebooks/Implementations/URB_SURDR_ZAF_Energy_Transition/Data_Preparation.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.dataMisc as dataMisc\n",
"import GOSTRocks.ntlMisc as ntlMisc\n",
"import GOSTRocks.ghslMisc as ghslMisc\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.mapMisc as mapMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.dataMisc as dataMisc\n",
"import GOSTrocks.ntlMisc as ntlMisc\n",
"import GOSTrocks.ghslMisc as ghslMisc\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.mapMisc as mapMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/GOSTNets_Raster/src\")\n",
"import GOSTNetsRaster.market_access as ma\n",
Expand Down
6 changes: 3 additions & 3 deletions notebooks/Implementations/URB_SURDR_ZAF_Energy_Transition/Zonal_statistics.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/gostrocks/src\")\n",
"\n",
"import GOSTRocks.dataMisc as dataMisc\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"from GOSTRocks.misc import tPrint\n",
"import GOSTrocks.dataMisc as dataMisc\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"from GOSTrocks.misc import tPrint\n",
"\n",
"sys.path.insert(0, \"/home/wb411133/Code/GOSTNets_Raster/src\")\n",
"import GOSTNetsRaster.market_access as ma\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/Implementations/WSF_DECAT_B_ExploringIDCerrors.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"import geopandas as gpd\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"\n",
"#reference the module in the WSF/ folder\n",
"from WSF import wsfdata"
Expand Down
6 changes: 3 additions & 3 deletions notebooks/Tutorials/LEI_Example.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"import geopandas as gpd\n",
"import pandas as pd\n",
"\n",
"import GOSTRocks.rasterMisc as rMisc\n",
"import GOSTRocks.ghslMisc as ghslMisc\n",
"import GOSTrocks.rasterMisc as rMisc\n",
"import GOSTrocks.ghslMisc as ghslMisc\n",
"import GOSTurban.LEI as lei\n",
"import GOSTRocks.mapMisc as mapMisc\n",
"import GOSTrocks.mapMisc as mapMisc\n",
"\n",
"%load_ext autoreload\n",
"%autoreload 2"
Expand Down
4 changes: 2 additions & 2 deletions notebooks/Tutorials/UrbanAreas_tutorials.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"import pandas as pd\n",
"\n",
"import GOSTurban.UrbanRaster as urban\n",
"import GOSTRocks.mapMisc as mapMisc"
"import GOSTrocks.mapMisc as mapMisc"
]
},
{
Expand All @@ -47,7 +47,7 @@
"# you will need to find a global population to extract from\n",
"if not os.path.exists(pop_file):\n",
" sys.path.append(\"../../../gostrocks/src\")\n",
" import GOSTRocks.rasterMisc as rMisc\n",
" import GOSTrocks.rasterMisc as rMisc\n",
"\n",
" global_population = \"/path/to/global/pop_layer/ppp_2020_1km_Aggregated.tif\"\n",
" inR = rasterio.open(global_population)\n",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"pyproj",
"elevation",
"geojson",
"GOSTRocks",
"GOSTrocks",
"richdem"
]

Expand Down
2 changes: 1 addition & 1 deletion src/GOSTurban/LEI.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pandas as pd
import numpy as np

from GOSTRocks.misc import tPrint
from GOSTrocks.misc import tPrint
from shapely.geometry import shape
from shapely.wkt import loads

Expand Down
6 changes: 3 additions & 3 deletions src/GOSTurban/country_helper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@


# Import raster helpers
import GOSTRocks.rasterMisc as rMisc
import GOSTRocks.ntlMisc as ntl
from GOSTRocks.misc import tPrint
import GOSTrocks.rasterMisc as rMisc
import GOSTrocks.ntlMisc as ntl
from GOSTrocks.misc import tPrint

# Import GOST urban functions
import GOSTurban.UrbanRaster as urban
Expand Down
4 changes: 2 additions & 2 deletions src/GOSTurban/urban_helper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import numpy as np


import GOSTRocks.rasterMisc as rMisc
from GOSTRocks.misc import tPrint
import GOSTrocks.rasterMisc as rMisc
from GOSTrocks.misc import tPrint


class summarize_population(object):
Expand Down

0 comments on commit 907ab71

Please sign in to comment.