From ea89cae02bbd93349ee72539cec7dc5e9280096b Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Mon, 5 Oct 2020 12:56:56 +0100 Subject: [PATCH] updates --- comrad/cli/worldmap_curses.py | 3 +++ script/install | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/comrad/cli/worldmap_curses.py b/comrad/cli/worldmap_curses.py index fa5987b..b85cca7 100644 --- a/comrad/cli/worldmap_curses.py +++ b/comrad/cli/worldmap_curses.py @@ -132,6 +132,7 @@ class Map(Logger): # print(land if value else water, end="") # print("") # stringl+=['\n'] + import pandas as pd df=pd.DataFrame(ld) # self.log(df,'!!') df['x_norm']=self.do_norm(df['x']) @@ -145,6 +146,7 @@ class Map(Logger): # self.log('<--',xcol) minn=xcol.min() maxx=xcol.max() + import pandas as pd xcol=pd.Series([x + minn for x in xcol]) minn=xcol.min() maxx=xcol.max() @@ -154,6 +156,7 @@ class Map(Logger): def add_base_map(self): # 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.log(df) diff --git a/script/install b/script/install index d334fb6..abd85ee 100644 --- a/script/install +++ b/script/install @@ -274,7 +274,7 @@ path_venv="$path_repo/venv" # cd $path_comrad cd $path_repo 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"