master
quadrismegistus 4 years ago
parent 9394c8378a
commit ea89cae02b

@ -132,6 +132,7 @@ class Map(Logger):
# print(land if value else water, end="") # print(land if value else water, end="")
# print("") # print("")
# stringl+=['\n'] # stringl+=['\n']
import pandas as pd
df=pd.DataFrame(ld) df=pd.DataFrame(ld)
# self.log(df,'!!') # self.log(df,'!!')
df['x_norm']=self.do_norm(df['x']) df['x_norm']=self.do_norm(df['x'])
@ -145,6 +146,7 @@ class Map(Logger):
# self.log('<--',xcol) # self.log('<--',xcol)
minn=xcol.min() minn=xcol.min()
maxx=xcol.max() maxx=xcol.max()
import pandas as pd
xcol=pd.Series([x + minn for x in xcol]) xcol=pd.Series([x + minn for x in xcol])
minn=xcol.min() minn=xcol.min()
maxx=xcol.max() maxx=xcol.max()
@ -154,6 +156,7 @@ class Map(Logger):
def add_base_map(self): def add_base_map(self):
# x,y coords # x,y coords
import pandas as pd
self.base_df=df=pd.read_csv(os.path.join(os.path.dirname(__file__),'data/basemap.csv')) self.base_df=df=pd.read_csv(os.path.join(os.path.dirname(__file__),'data/basemap.csv'))
# self.log(df) # self.log(df)

@ -274,7 +274,7 @@ path_venv="$path_repo/venv"
# cd $path_comrad # cd $path_comrad
cd $path_repo cd $path_repo
echo "Now using python 1: `which python`" echo "Now using python 1: `which python`"
$condaexec create -y -p "$path_venv" python=3.7 cartopy pip virtualenv $condaexec create -y -p "$path_venv" python=3.7 cartopy pip virtualenv rtree
#$condaexec activate "$path_venv" #$condaexec activate "$path_venv"

Loading…
Cancel
Save