From ebd7143e9f7578055a212c4a052c375c882f547c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 27 May 2020 10:59:43 +0300 Subject: [PATCH] non-default colors --- II/Referatas/Makefile | 4 ++-- II/Referatas/layer2img.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 7672367..ef3c0db 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -22,7 +22,7 @@ crossing-$(1)-$(2)-%.pdf: layer2img.py db/.faux_$(1)-$(2)-% endef define gpkg2pdf -$(2).pdf: $(1).gpkg +$(2).pdf: $(1).gpkg ./layer2img.py $(4) ./layer2img.py $(3) --infile=$(1).gpkg --outfile $(2).pdf endef @@ -31,7 +31,7 @@ $(eval $(call algo2img,sinewave,visvalingam,52x12)) $(eval $(call algo2img,zeimena,douglas,52x74)) $(eval $(call algo2img,zeimena,visvalingam,52x74)) $(eval $(call gpkg2pdf,sinewave,sinewave,--size=52x15)) -$(eval $(call gpkg2pdf,zeimena,zeimena,--size=135x191 --rect $(CROSSING))) +$(eval $(call gpkg2pdf,zeimena,zeimena,--size=135x191 --overlay-infile rectangle.gpkg,rectangle.gpkg)) $(eval $(call gpkg2pdf,zeimena,crossing,--size=105x74 --clip $(CROSSING))) sinewave.gpkg: fig2layer.py diff --git a/II/Referatas/layer2img.py b/II/Referatas/layer2img.py index a2fe677..347753a 100755 --- a/II/Referatas/layer2img.py +++ b/II/Referatas/layer2img.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# https://gis.stackexchange.com/questions/131716/plot-shapefile-with-matplotlib +# blue: #377eb8 import argparse import geopandas @@ -57,13 +57,13 @@ def main(): fig, ax = plt.subplots() if args.size: fig.set_size_inches(args.size) - primary.plot(ax=ax) + primary.plot(ax=ax, color='#4daf4a') if c := args.clip: ax.set_xlim(left=c[0], right=c[2]) ax.set_ylim(bottom=c[1], top=c[3]) if overlay is not None: - overlay.plot(ax=ax) + overlay.plot(ax=ax, color='#e41a1c') ax.axis('off') ax.margins(0, 0)