From a481189c8416a7d9ec440be040a9d7057ec201ee Mon Sep 17 00:00:00 2001 From: BenjaminGolub <107389350+BenjaminGolub@users.noreply.github.com> Date: Mon, 26 Aug 2024 07:26:06 +0200 Subject: [PATCH] Update germany_plot_v04.py test with moving if-loop --- germany_plot_v04.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/germany_plot_v04.py b/germany_plot_v04.py index ca42430..8c1c152 100644 --- a/germany_plot_v04.py +++ b/germany_plot_v04.py @@ -122,10 +122,23 @@ # ms = standardms coordinates = {"latitude": [long[n]], "longitude": [lat[n]]} dftest = pd.DataFrame(coordinates) - locations = geopandas.GeoDataFrame(coordinates, geometry=geopandas.points_from_xy(dftest.longitude, dftest.latitude),crs = "EPSG:4326") + + if topic[n] =='RDM' and status[n]=='done': + markersymbol = 'o' + if status[n] =='done': + colordata = nfdi4chempetrol + if labelcheck[0] == 0: + topiclabel = 'RDM (past)' + labelcheck[0] = 1 + else: + colordata = nfdi4chemorange + if labelcheck[1] == 0: + topiclabel = 'RDM (planned)' + labelcheck[1] = 1 + locations = geopandas.GeoDataFrame(coordinates, geometry=geopandas.points_from_xy(dftest.longitude, dftest.latitude),crs = "EPSG:4326") # locations.plot(ax=ax, marker=markersymbol, markersize=ms, color=colordata, label=topiclabel, linestyle='None') #style 01, style 02 borderstyle 01 - locations.plot(ax=ax, marker=markersymbol, markersize=ms, color=colordata, label=topiclabel, linestyle='None', edgecolor="black", linewidth=0.2) #style 03 + locations.plot(ax=ax, marker=markersymbol, markersize=ms, color=colordata, label=topiclabel, linestyle='None', edgecolor="black", linewidth=0.2) #style 03 # add location name to point if not city[n] in citychecklist: x = locations.geometry.x