Move to github.com/motiejus/wm
This commit is contained in:
Motiejus Jakštys
parent
72d025c1f8
commit
6d9c9d9267
@ -1,13 +0,0 @@
|
||||
FROM debian:bullseye
|
||||
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
texlive-full poppler-utils \
|
||||
osm2pgsql postgresql-client \
|
||||
python3-pygments python3-geopandas \
|
||||
latexmk make \
|
||||
docker.io
|
||||
|
||||
COPY layer2img.py /tmp/layer2img.py
|
||||
RUN python3 /tmp/layer2img.py -o /tmp/foo.pdf && \
|
||||
rm /tmp/layer2img.py /tmp/foo.pdf
|
||||
386
IV/Makefile
386
IV/Makefile
@ -1,386 +0,0 @@
|
||||
OSM ?= lithuania-latest.osm.pbf
|
||||
RIVERFILTER = Visinčia|Šalčia|Nemunas
|
||||
SLIDES = slides-2021-03-29.pdf
|
||||
|
||||
GDB10LT ?= $(wildcard GDB10LT-static-*.zip)
|
||||
|
||||
# Max figure size (in meters) is when it's width is TEXTWIDTH_CM on scale 1:25k
|
||||
SCALEDWIDTH = $(shell awk '/^TEXTWIDTH_CM/{print 25000/100*$$3}' layer2img.py)
|
||||
|
||||
##############################################################################
|
||||
# These variables have to come before first use due to how macros are expanded
|
||||
##############################################################################
|
||||
|
||||
NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt
|
||||
ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .))
|
||||
|
||||
LISTINGS = aggregate-rivers.sql wm.sql extract-and-generate
|
||||
|
||||
FIGURES = \
|
||||
test-figures \
|
||||
fig8-definition-of-a-bend \
|
||||
fig8-elimination-gen1 \
|
||||
fig8-elimination-gen2 \
|
||||
fig8-elimination-gen3 \
|
||||
fig5-gentle-inflection-before \
|
||||
fig5-gentle-inflection-after \
|
||||
inflection-1-gentle-inflection-before \
|
||||
inflection-1-gentle-inflection-after \
|
||||
fig6-selfcrossing \
|
||||
selfcrossing-1 \
|
||||
isolated-1-exaggerated
|
||||
|
||||
RIVERS = \
|
||||
salvis-25k \
|
||||
salvis-2x50k \
|
||||
salvis-250k-10x \
|
||||
salvis-grpk250-2x \
|
||||
salvis-dp64-2x50k \
|
||||
salvis-vw64-2x50k \
|
||||
salvis-dpchaikin64-2x50k \
|
||||
salvis-vwchaikin64-2x50k \
|
||||
salvis-overlaid-dpchaikin64-2x50k \
|
||||
salvis-overlaid-vwchaikin64-2x50k \
|
||||
salvis-wm220-10x \
|
||||
salvis-wm220-2x \
|
||||
salvis-wm-overlaid-250k-zoom \
|
||||
salvis-wm220
|
||||
|
||||
################################################################################
|
||||
# FIGURES
|
||||
################################################################################
|
||||
test-figures_1SELECT = wm_figures
|
||||
|
||||
fig8-definition-of-a-bend_1SELECT = wm_debug where name='fig8' AND stage='afigures' AND gen=1
|
||||
fig8-definition-of-a-bend_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1
|
||||
fig8-definition-of-a-bend_3SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1
|
||||
fig8-definition-of-a-bend_3LINESTYLE = dotted
|
||||
|
||||
fig8-elimination-gen1_1SELECT = wm_debug where name='fig8' AND stage='afigures' AND gen=1
|
||||
fig8-elimination-gen1_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1
|
||||
fig8-elimination-gen1_3SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1
|
||||
fig8-elimination-gen1_3LINESTYLE = dotted
|
||||
|
||||
fig8-elimination-gen2_1SELECT = wm_debug where name='fig8' AND stage='afigures' AND gen=2
|
||||
fig8-elimination-gen2_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=2
|
||||
fig8-elimination-gen2_3SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=2
|
||||
fig8-elimination-gen2_3LINESTYLE = dotted
|
||||
fig8-elimination-gen3_1SELECT = wm_debug where name='fig8' AND stage='bbends' AND gen=3
|
||||
fig8-elimination-gen3_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=3
|
||||
fig8-elimination-gen3_3SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=3
|
||||
fig8-elimination-gen3_3LINESTYLE = dotted
|
||||
|
||||
fig5-gentle-inflection-before_WITHDIV = 2
|
||||
fig5-gentle-inflection-before_1SELECT = wm_debug where name='fig5' AND stage='afigures' AND gen=1
|
||||
fig5-gentle-inflection-before_2SELECT = wm_debug where name='fig5' AND stage='bbends-polygon' AND gen=1
|
||||
fig5-gentle-inflection-before_3SELECT = wm_debug where name='fig5' AND stage='bbends-polygon' AND gen=1
|
||||
fig5-gentle-inflection-before_3LINESTYLE = dotted
|
||||
fig5-gentle-inflection-after_WITHDIV = 2
|
||||
fig5-gentle-inflection-after_1SELECT = wm_debug where name='fig5' AND stage='cinflections' AND gen=1
|
||||
fig5-gentle-inflection-after_2SELECT = wm_debug where name='fig5' AND stage='cinflections-polygon' AND gen=1
|
||||
fig5-gentle-inflection-after_3SELECT = wm_debug where name='fig5' AND stage='cinflections-polygon' AND gen=1
|
||||
fig5-gentle-inflection-after_3LINESTYLE = dotted
|
||||
|
||||
inflection-1-gentle-inflection-before_WIDTHDIV = 2
|
||||
inflection-1-gentle-inflection-before_1SELECT = wm_debug where name='inflection-1' AND stage='afigures' AND gen=1
|
||||
inflection-1-gentle-inflection-before_2SELECT = wm_debug where name='inflection-1' AND stage='bbends-polygon' AND gen=1
|
||||
inflection-1-gentle-inflection-before_3SELECT = wm_debug where name='inflection-1' AND stage='bbends-polygon' AND gen=1
|
||||
inflection-1-gentle-inflection-before_3LINESTYLE = dotted
|
||||
inflection-1-gentle-inflection-after_WIDTHDIV = 2
|
||||
inflection-1-gentle-inflection-after_1SELECT = wm_debug where name='inflection-1' AND stage='cinflections' AND gen=1
|
||||
inflection-1-gentle-inflection-after_2SELECT = wm_debug where name='inflection-1' AND stage='cinflections-polygon' AND gen=1
|
||||
inflection-1-gentle-inflection-after_3SELECT = wm_debug where name='inflection-1' AND stage='cinflections-polygon' AND gen=1
|
||||
inflection-1-gentle-inflection-after_3LINESTYLE = dotted
|
||||
|
||||
fig6-selfcrossing_WIDTHDIV = 2
|
||||
fig6-selfcrossing_1SELECT = wm_debug where name='fig6' AND stage='afigures' AND gen=1
|
||||
fig6-selfcrossing_1LINESTYLE = dotted
|
||||
fig6-selfcrossing_2SELECT = wm_debug where name='fig6' AND stage='dcrossings' AND gen=1
|
||||
fig6-selfcrossing_3SELECT = wm_visuals where name='fig6-baseline'
|
||||
fig6-selfcrossing_3COLOR = orange
|
||||
|
||||
selfcrossing-1_WIDTHDIV = 2
|
||||
selfcrossing-1_1SELECT = wm_debug where name='selfcrossing-1' AND stage='afigures' AND gen=1
|
||||
selfcrossing-1_1LINESTYLE = dotted
|
||||
selfcrossing-1_2SELECT = wm_debug where name='selfcrossing-1' AND stage='dcrossings' AND gen=1
|
||||
selfcrossing-1_3SELECT = wm_visuals where name='selfcrossing-1-baseline'
|
||||
selfcrossing-1_3COLOR = orange
|
||||
|
||||
isolated-1-exaggerated_WIDTHDIV = 2
|
||||
isolated-1-exaggerated_1SELECT = wm_debug where name='isolated-1' AND stage='afigures' AND gen=2
|
||||
isolated-1-exaggerated_2SELECT = wm_debug where name='isolated-1' AND stage='afigures' AND gen=1
|
||||
isolated-1-exaggerated_1COLOR = orange
|
||||
|
||||
################################################################################
|
||||
# 250K
|
||||
################################################################################
|
||||
|
||||
salvis-wm220-250k-2x_1SELECT = wm_visuals where name='salvis-wm220'
|
||||
salvis-wm220-250k-2x_WIDTHDIV = 2
|
||||
|
||||
salvis-wm220-250k-10x_1SELECT = wm_visuals where name='salvis-wm220'
|
||||
salvis-wm220-250k-10x_WIDTHDIV = 10
|
||||
|
||||
salvis-250k-10x_1SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-250k-10x_WIDTHDIV = 10
|
||||
|
||||
salvis-wm-overlaid-250k-zoom_1SELECT = wm_visuals where name='salvis-wm220'
|
||||
salvis-wm-overlaid-250k-zoom_2SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-wm-overlaid-250k-zoom_1COLOR = orange
|
||||
|
||||
salvis-grpk250-2x_1SELECT = wm_visuals where name='salvis-grpk250'
|
||||
salvis-grpk250-2x_WIDTHDIV = 2
|
||||
|
||||
################################################################################
|
||||
# 50K
|
||||
################################################################################
|
||||
|
||||
label_wm75 = Wang--Müller 1:\numprint{50000}
|
||||
label_wm220 = Wang--Müller 1:\numprint{250000}
|
||||
label_vw64 = Visvalingam--Whyatt
|
||||
label_dp64 = Douglas \& Peucker
|
||||
label_grpk10 = GRPK 1:\numprint{10000}
|
||||
label_grpk50 = GRPK 1:\numprint{50000}
|
||||
label_vwchaikin64 = $(label_vw64) and Chaikin
|
||||
label_dpchaikin64 = $(label_dp64) and Chaikin
|
||||
legend_ = lower left
|
||||
legend_tr = lower right
|
||||
legend_tl = lower center
|
||||
|
||||
define wm_vwdp50k
|
||||
RIVERS += salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_1SELECT = wm_visuals where name='salvis-$(1)'
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_1COLOR = orange
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_1LABEL = $(label_$(1))
|
||||
$(if $(2),
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_2SELECT = wm_visuals where name='salvis-$(2)'
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_2COLOR = green
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_2LABEL = $(label_$(2))
|
||||
,)
|
||||
$(if $(3),
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_3SELECT = wm_visuals where name='salvis-$(3)'
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_3LINESTYLE = $(6)
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_3LABEL = $(label_$(3))
|
||||
,)
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_WIDTHDIV = $(4)
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_QUADRANT = $(5)
|
||||
salvis-$(1)-$(2)-$(3)-$(4)x50k$(5)_LEGEND = $(legend_$(5))
|
||||
endef
|
||||
|
||||
wm_vwdp50kblack = $(call wm_vwdp50k,$(1),$(2),$(3),$(4),$(5))
|
||||
wm_vwdp50kdotted = $(call wm_vwdp50k,$(1),$(2),$(3),$(4),$(5),dotted)
|
||||
|
||||
$(foreach x,vw64 dp64 vwchaikin64 dpchaikin64,\
|
||||
$(eval $(call wm_vwdp50kdotted,wm75,$(x),grpk10,1,)) \
|
||||
)
|
||||
$(eval $(call wm_vwdp50kblack,wm75,grpk50,grpk10,1))
|
||||
$(eval $(call wm_vwdp50kblack,wm75,grpk50,grpk10,1,tr))
|
||||
$(eval $(call wm_vwdp50kblack,wm75,grpk50,grpk10,1,tl))
|
||||
|
||||
$(eval $(call wm_vwdp50kblack,wm75,,grpk10,1))
|
||||
$(eval $(call wm_vwdp50kblack,wm75,,grpk10,1,tr))
|
||||
$(eval $(call wm_vwdp50kblack,wm75,,grpk10,1,tl))
|
||||
|
||||
salvis-25k_1SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-25k_WIDTHDIV = 1
|
||||
|
||||
salvis-2x50k_1SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-2x50k_WIDTHDIV = 2
|
||||
|
||||
salvis-dp64-2x50k_1SELECT = wm_visuals where name='salvis-dp64'
|
||||
salvis-dp64-2x50k_WIDTHDIV = 2
|
||||
|
||||
salvis-vw64-2x50k_1SELECT = wm_visuals where name='salvis-vw64'
|
||||
salvis-vw64-2x50k_WIDTHDIV = 2
|
||||
|
||||
salvis-dpchaikin64-2x50k_2SELECT = wm_visuals where name='salvis-dpchaikin64'
|
||||
salvis-dpchaikin64-2x50k_WIDTHDIV = 2
|
||||
|
||||
salvis-vwchaikin64-2x50k_2SELECT = wm_visuals where name='salvis-vwchaikin64'
|
||||
salvis-vwchaikin64-2x50k_WIDTHDIV = 2
|
||||
|
||||
salvis-overlaid-dpchaikin64-2x50k_1SELECT = wm_visuals where name='salvis-dpchaikin64'
|
||||
salvis-overlaid-dpchaikin64-2x50k_2SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-overlaid-dpchaikin64-2x50k_1COLOR = orange
|
||||
salvis-overlaid-dpchaikin64-2x50k_WIDTHDIV = 2
|
||||
salvis-overlaid-dpchaikin64-2x50k_QUADRANT = tl
|
||||
|
||||
salvis-overlaid-vwchaikin64-2x50k_1SELECT = wm_visuals where name='salvis-vwchaikin64'
|
||||
salvis-overlaid-vwchaikin64-2x50k_2SELECT = wm_visuals where name='salvis-grpk10'
|
||||
salvis-overlaid-vwchaikin64-2x50k_1COLOR = orange
|
||||
salvis-overlaid-vwchaikin64-2x50k_WIDTHDIV = 2
|
||||
salvis-overlaid-vwchaikin64-2x50k_QUADRANT = tl
|
||||
|
||||
salvis-wm220_1SELECT = wm_visuals where name='salvis-wm220'
|
||||
salvis-wm220_WIDTHDIV = 2
|
||||
|
||||
define FIG_template
|
||||
$(1).pdf: layer2img.py Makefile $(2)
|
||||
python3 ./layer2img.py --outfile=$(1).pdf \
|
||||
$$(if $$($(1)_LEGEND),--legend="$$($(1)_LEGEND)") \
|
||||
$$(if $$($(1)_WIDTHDIV),--widthdiv=$$($(1)_WIDTHDIV)) \
|
||||
$$(if $$($(1)_QUADRANT),--quadrant=$$($(1)_QUADRANT)) \
|
||||
$$(foreach i,1 2 3, \
|
||||
$$(if $$($(1)_$$(i)LABEL),--g$$(i)-label="$$($(1)_$$(i)LABEL)") \
|
||||
$$(if $$($(1)_$$(i)COLOR),--g$$(i)-color="$$($(1)_$$(i)COLOR)") \
|
||||
$$(if $$($(1)_$$(i)SELECT),--g$$(i)-select="$$($(1)_$$(i)SELECT)") \
|
||||
$$(if $$($(1)_$$(i)LINESTYLE),--g$$(i)-linestyle="$$($(1)_$$(i)LINESTYLE)") \
|
||||
)
|
||||
endef
|
||||
|
||||
$(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_test)))
|
||||
$(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals)))
|
||||
|
||||
#################################
|
||||
# The thesis, publishable version
|
||||
#################################
|
||||
|
||||
mj-msc-full.pdf: mj-msc.pdf version.inc.tex $(ARCHIVABLES) ## Thesis for publishing
|
||||
cp $< .tmp-$@
|
||||
for f in $^; do \
|
||||
if [ "$$f" = "$<" ]; then continue; fi; \
|
||||
pdfattach .tmp-$@ $$f .tmp2-$@; \
|
||||
mv .tmp2-$@ .tmp-$@; \
|
||||
done
|
||||
mv .tmp-$@ $@
|
||||
|
||||
###############################
|
||||
# Auxiliary targets for humans
|
||||
###############################
|
||||
|
||||
.PHONY: test
|
||||
test: .faux_test ## Unit tests (fast)
|
||||
|
||||
.PHONY: visuals
|
||||
visuals: .faux_visuals # Generate visuals for paper (fast)
|
||||
|
||||
.PHONY: test-rivers
|
||||
test-rivers: .faux_test-rivers ## Rivers tests (slow)
|
||||
|
||||
.PHONY: slides
|
||||
slides: $(SLIDES)
|
||||
|
||||
.PHONY: refresh-rivers
|
||||
refresh-rivers: refresh-rivers-10.sql refresh-rivers-50.sql refresh-rivers-250.sql ## Refresh river data from national datasets
|
||||
|
||||
###########################
|
||||
# The report, quick version
|
||||
###########################
|
||||
|
||||
mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib \
|
||||
$(LISTINGS) $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS))
|
||||
latexmk -shell-escape -pdf $<
|
||||
|
||||
############################
|
||||
# Report's test dependencies
|
||||
############################
|
||||
|
||||
.PHONY: allfigs
|
||||
allfigs: $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS))
|
||||
|
||||
.faux_db_pre: db init.sql
|
||||
bash db start
|
||||
bash db -f init.sql
|
||||
touch $@
|
||||
|
||||
.faux_db: rivers-10.sql rivers-50.sql rivers-250.sql
|
||||
bash db $(addprefix -f ,$^)
|
||||
touch $@
|
||||
.faux_db: .EXTRA_PREREQS = .faux_db_pre
|
||||
|
||||
.faux_test: test.sql wm.sql .faux_db
|
||||
bash db -f $<
|
||||
touch $@
|
||||
|
||||
.faux_visuals: visuals.sql .faux_test
|
||||
bash db -v scaledwidth=$(SCALEDWIDTH) -f $<
|
||||
touch $@
|
||||
|
||||
.faux_test-rivers: test-rivers.sql wm.sql Makefile .faux_db
|
||||
bash db -f $<
|
||||
touch $@
|
||||
|
||||
################################
|
||||
# Report's non-test dependencies
|
||||
################################
|
||||
|
||||
REF = $(shell git describe --abbrev=12 --always --dirty)
|
||||
version.inc.tex: Makefile $(shell git rev-parse --git-dir 2>/dev/null)
|
||||
TZ=UTC date '+\gdef\VCDescribe{%F (revision $(REF))}%' > $@
|
||||
|
||||
vars.inc.tex: vars.awk wm.sql Makefile
|
||||
awk -f $< wm.sql
|
||||
|
||||
###############
|
||||
# Misc commands
|
||||
###############
|
||||
|
||||
slides-2021-03-29.pdf: slides-2021-03-29.txt
|
||||
pandoc -t beamer -i $< -o $@
|
||||
|
||||
dump-debug_wm.sql.xz:
|
||||
docker exec -ti wm-mj pg_dump -Uosm osm -t wm_devug | xz -v > $@
|
||||
|
||||
release.zip: mj-msc.tex mj-msc.bbl version.inc.tex vars.inc.tex \
|
||||
$(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS)) \
|
||||
$(shell git ls-files .)
|
||||
-rm $@
|
||||
mkdir -p .tmp; touch .tmp/editorial-version
|
||||
zip $@ $^
|
||||
zip $@ -j .tmp/editorial-version
|
||||
|
||||
mj-msc.bbl: mj-msc.tex bib.bib
|
||||
biber mj-msc
|
||||
|
||||
mj-msc-gray.pdf: mj-msc.pdf
|
||||
gs \
|
||||
-sOutputFile=$@ \
|
||||
-sDEVICE=pdfwrite \
|
||||
-sColorConversionStrategy=Gray \
|
||||
-dProcessColorModel=/DeviceGray \
|
||||
-dCompatibilityLevel=1.4 \
|
||||
-dNOPAUSE \
|
||||
-dBATCH \
|
||||
$<
|
||||
|
||||
.PHONY: clean
|
||||
clean: ## Clean the current working directory
|
||||
-bash db stop
|
||||
-rm -r .faux_test .faux_aggregate-rivers .faux_test-rivers .faux_visuals \
|
||||
.faux_db .faux_db_pre version.inc.tex vars.inc.tex version.aux \
|
||||
version.fdb_latexmk _minted-mj-msc .tmp \
|
||||
$(shell git ls-files -o mj-msc*) \
|
||||
$(addsuffix .pdf,$(FIGURES)) \
|
||||
$(addsuffix .pdf,$(RIVERS)) \
|
||||
$(SLIDES)
|
||||
|
||||
.PHONY: clean-tables
|
||||
clean-tables: ## Remove tables created during unit or rivers tests
|
||||
bash db -c '\dt wm_*' | awk '/_/{print "drop table "$$3";"}' | bash db -f -
|
||||
-rm .faux_db
|
||||
|
||||
.PHONY: help
|
||||
help: ## Print this help message
|
||||
@awk -F':.*?## ' '/^[a-z0-9.-]*: *.*## */{printf "%-18s %s\n",$$1,$$2}' \
|
||||
$(MAKEFILE_LIST)
|
||||
|
||||
.PHONY: wc
|
||||
wc: mj-msc.pdf ## Character and page count
|
||||
@pdftotext $< - | \
|
||||
awk '/\yReferences\y/{exit}; {print}' | \
|
||||
tr -d '[:space:]' | wc -c | \
|
||||
awk '{printf("Chars: %d, pages: %.1f\n", $$1, $$1/1500)}'
|
||||
|
||||
define refresh_rivers_template
|
||||
.PHONY: refresh-$(1)
|
||||
refresh-$(1): aggregate-rivers.sql gdr2pgsql .faux_db_pre
|
||||
@if [ ! -f "$$($(2))" ]; then \
|
||||
echo "ERROR: $(2)-static-*.zip not found. Run env $(2)=<...>"; \
|
||||
exit 1; \
|
||||
fi
|
||||
./gdr2pgsql "$$($(2))" "$(3)" "$(RIVERFILTER)" "$(1)"
|
||||
endef
|
||||
|
||||
$(eval $(call rivers_template,rivers-10.sql,GDB10LT,wm_rivers))
|
||||
$(eval $(call rivers_template,rivers-50.sql,grpk50LT,wm_rivers_50))
|
||||
$(eval $(call rivers_template,rivers-250.sql,grpk250LT,wm_rivers_250))
|
||||
78
IV/README.md
78
IV/README.md
@ -1,80 +1,4 @@
|
||||
Wang–Müller algorithm in PostGIS
|
||||
--------------------------------
|
||||
|
||||
This is a work-in-progress implementation following "Line generalization based
|
||||
on analysis of shape characteristics" by Wang and Müller, 1998.
|
||||
|
||||
Structure
|
||||
---------
|
||||
|
||||
There will be 2 deliverables from this folder:
|
||||
|
||||
- `wm.sql`, the implementation.
|
||||
- paper `mj-msc-full.pdf`, a MSc thesis, explaining it.
|
||||
|
||||
It contains a few supporting files, notably:
|
||||
|
||||
- `tests.sql` synthetic unit tests.
|
||||
- `test-rivers.sql` tests with real rivers.
|
||||
- `Makefile` glues everything together.
|
||||
- `layer2img.py` converts a PostGIS layer to an embeddable image.
|
||||
- `aggregate-rivers.sql` combines multiple river objects (linestrings or
|
||||
multilinestrings) to a single one.
|
||||
- `init.sql` initializes PostGIS database for running the tests.
|
||||
- `rivers-*.sql` are national dataset snapshots of rivers (`Makefile`
|
||||
contains code to update them).
|
||||
- ... and a few more files necessary to build the paper.
|
||||
|
||||
Running
|
||||
-------
|
||||
|
||||
`make help` lists the select commands for humans. As of writing:
|
||||
|
||||
```
|
||||
# make help
|
||||
mj-msc-full.pdf Thesis for publishing
|
||||
test Unit tests (fast)
|
||||
test-rivers Rivers tests (slow)
|
||||
clean Clean the current working directory
|
||||
clean-tables Remove tables created during unit or rivers tests
|
||||
help Print this help message
|
||||
wc Character and page count
|
||||
refresh-rivers Refresh rivers-*.sql from Open Street Maps
|
||||
```
|
||||
|
||||
To execute the algorithm, run:
|
||||
|
||||
- `make test` for tests with synthetic data.
|
||||
- `make test-rivers` for tests with real rivers. You may adjust the rivers and
|
||||
data source (e.g. use a different country instead of Lithuania) by changing
|
||||
the `Makefile` and the test files. Left as an exercise for the reader.
|
||||
|
||||
Building the paper (pdf)
|
||||
------------------------
|
||||
|
||||
```
|
||||
# make -j$(nproc) mj-msc-full.pdf
|
||||
```
|
||||
|
||||
`mj-msc.tex` results in `mj-msc-full.pdf`, which will be at some point
|
||||
published. It needs quite a few dependencies, including a functioning Docker
|
||||
environment, postgresql client, geopandas, pygments, osm2pgsql, poppler, and a
|
||||
"quite extensive" LaTeX installation. This was tested on Debian 11.
|
||||
|
||||
Contributing
|
||||
------------
|
||||
|
||||
Please reach out to me before contributing. As of writing, this is not ready to
|
||||
accept broader contributions, TODO:
|
||||
|
||||
- [x] Elimination operator.
|
||||
- [x] Exaggeration operator.
|
||||
- [ ] Combination operator.
|
||||
- [ ] CI (unlikely to happen).
|
||||
- [x] Known bug in `wm_self_crossing`: the program crashes with a river in
|
||||
Lithuania.
|
||||
|
||||
License
|
||||
-------
|
||||
|
||||
GPL 2.0 or later, same as PostGIS.
|
||||
Moved to [github.com/motiejus/wm](https://github.com/motiejus/wm).
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
/* Aggregates rivers by name and proximity. */
|
||||
drop function if exists aggregate_rivers;
|
||||
create function aggregate_rivers() returns table(
|
||||
id integer,
|
||||
name text,
|
||||
way geometry
|
||||
) as $$
|
||||
declare
|
||||
c record;
|
||||
cc record;
|
||||
changed boolean;
|
||||
begin
|
||||
while (select count(1) from wm_rivers_tmp) > 0 loop
|
||||
select * from wm_rivers_tmp limit 1 into c;
|
||||
delete from wm_rivers_tmp a where a.id = c.id;
|
||||
changed = true;
|
||||
while changed loop
|
||||
changed = false;
|
||||
for cc in (
|
||||
select * from wm_rivers_tmp a where
|
||||
a.name = c.name and
|
||||
st_dwithin(a.way, c.way, 500)
|
||||
) loop
|
||||
c.way = st_linemerge(st_union(c.way, cc.way));
|
||||
delete from wm_rivers_tmp a where a.id = cc.id;
|
||||
changed = true;
|
||||
end loop;
|
||||
end loop; -- while changed
|
||||
return query select c.id, c.name, c.way;
|
||||
end loop; -- count(1) from wm_rivers_tmp > 0
|
||||
return;
|
||||
end
|
||||
$$ language plpgsql;
|
||||
|
||||
drop index if exists wm_rivers_tmp_id;
|
||||
drop index if exists wm_rivers_tmp_gix;
|
||||
drop table if exists wm_rivers_tmp;
|
||||
create temporary table wm_rivers_tmp (id serial, name text, way geometry);
|
||||
create index wm_rivers_tmp_id on wm_rivers_tmp(id);
|
||||
create index wm_rivers_tmp_gix on wm_rivers_tmp using gist(way) include(name);
|
||||
|
||||
insert into wm_rivers_tmp (name, way)
|
||||
select p.vardas as name, p.shape as way from :srctable p;
|
||||
|
||||
drop table if exists :dsttable;
|
||||
create table :dsttable as (
|
||||
select * from aggregate_rivers() where st_length(way) >= 50000
|
||||
);
|
||||
drop table wm_rivers_tmp;
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
262
IV/bib.bib
262
IV/bib.bib
@ -1,262 +0,0 @@
|
||||
@article{wang1998line,
|
||||
title={Line generalization based on analysis of shape characteristics},
|
||||
author={Wang, Zeshen and M{\"u}ller, Jean-Claude},
|
||||
journal={Cartography and Geographic Information Systems},
|
||||
volume={25},
|
||||
number={1},
|
||||
pages={3--15},
|
||||
year={1998},
|
||||
publisher={Taylor \& Francis}
|
||||
}
|
||||
|
||||
@article{Kolanowski_2018,
|
||||
title={Cartographic Line Generalization Based on Radius of Curvature Analysis},
|
||||
volume={7},
|
||||
ISSN={2220-9964},
|
||||
url={http://dx.doi.org/10.3390/ijgi7120477},
|
||||
DOI={10.3390/ijgi7120477},
|
||||
number={12},
|
||||
journal={ISPRS International Journal of Geo-Information},
|
||||
publisher={MDPI AG},
|
||||
author={Kolanowski, Bogdan and Augustyniak, Jacek and Latos, Dorota},
|
||||
year={2018},
|
||||
month={12},
|
||||
pages={477}
|
||||
}
|
||||
|
||||
@article{visvalingam1993line,
|
||||
title={Line generalisation by repeated elimination of points},
|
||||
author={Visvalingam, Maheswari and Whyatt, James D},
|
||||
journal={The cartographic journal},
|
||||
volume={30},
|
||||
number={1},
|
||||
pages={46--51},
|
||||
year={1993},
|
||||
publisher={Taylor \& Francis}
|
||||
}
|
||||
|
||||
@article{muller1991generalization,
|
||||
title={Generalization of spatial databases},
|
||||
author={Muller, Jean-Claude},
|
||||
journal={Geographical information systems},
|
||||
volume={1},
|
||||
pages={457--475},
|
||||
year={1991},
|
||||
publisher={John Wiley and Sons}
|
||||
}
|
||||
|
||||
@article{miuller1995generalization,
|
||||
title={Generalization-state of the art and issues},
|
||||
author={Miuller, JC and Weibel, R and Lagrange, J and {\"E}alge, F},
|
||||
journal={GIS and Generalisation: Methodology and Practice},
|
||||
pages={3--17},
|
||||
year={1995}
|
||||
}
|
||||
|
||||
@inproceedings{mcmaster1992generalization,
|
||||
title={Generalization in digital cartography},
|
||||
author={McMaster, Robert Brainerd and Shea, K Stuart},
|
||||
year={1992},
|
||||
organization={Association of American Geographers Washington, DC}
|
||||
}
|
||||
|
||||
@article{douglas1973algorithms,
|
||||
title={Algorithms for the reduction of the number of points required to represent a digitized line or its caricature},
|
||||
author={Douglas, David H and Peucker, Thomas K},
|
||||
journal={Cartographica: the international journal for geographic information and geovisualization},
|
||||
volume={10},
|
||||
number={2},
|
||||
pages={112--122},
|
||||
year={1973},
|
||||
publisher={University of Toronto Press}
|
||||
}
|
||||
|
||||
% Algorithms for generalization, not reaching satisfactory results
|
||||
@inproceedings{monmonier1986toward,
|
||||
title={Toward a practicable model of cartographic generalisation.},
|
||||
author={Monmonier, Mark},
|
||||
booktitle={Auto Carto London. Proc. conference, 1986. Vol. 2},
|
||||
pages={257--266},
|
||||
year={1986},
|
||||
organization={distributed Royal Institution of Chartered Surveyors}
|
||||
}
|
||||
@inproceedings{mcmaster1993spatial,
|
||||
title={A spatial-object level organization of transformations for cartographic generalization},
|
||||
author={McMaster, RB and Barnett, Leone},
|
||||
booktitle={AUTOCARTO-CONFERENCE-},
|
||||
pages={386--386},
|
||||
year={1993},
|
||||
organization={Citeseer}
|
||||
}
|
||||
@inproceedings{jiang2003line,
|
||||
title={Line simplification using self-organizing maps},
|
||||
author={Jiang, Bin and Nakos, Byron},
|
||||
booktitle={Proceedings of the ISPRS Workshop on Spatial Analysis and Decision Making, Hong Kong, China},
|
||||
pages={3--5},
|
||||
year={2003}
|
||||
}
|
||||
@article{dyken2009simultaneous,
|
||||
title={Simultaneous curve simplification},
|
||||
author={Dyken, Christopher and D{\ae}hlen, Morten and Sevaldrud, Thomas},
|
||||
journal={Journal of geographical systems},
|
||||
volume={11},
|
||||
number={3},
|
||||
pages={273--289},
|
||||
year={2009},
|
||||
publisher={Springer}
|
||||
}
|
||||
@article{mustafa2006dynamic,
|
||||
title={Dynamic simplification and visualization of large maps},
|
||||
author={Mustafa, Nabil and Krishnan, Shankar and Varadhan, Gokul and Venkatasubramanian, Suresh},
|
||||
journal={International Journal of Geographical Information Science},
|
||||
volume={20},
|
||||
number={3},
|
||||
pages={273--302},
|
||||
year={2006},
|
||||
publisher={Taylor \& Francis}
|
||||
}
|
||||
@article{nollenburg2008morphing,
|
||||
title={Morphing polylines: A step towards continuous generalization},
|
||||
author={N{\"o}llenburg, Martin and Merrick, Damian and Wolff, Alexander and Benkert, Marc},
|
||||
journal={Computers, Environment and Urban Systems},
|
||||
volume={32},
|
||||
number={4},
|
||||
pages={248--260},
|
||||
year={2008},
|
||||
publisher={Elsevier}
|
||||
}
|
||||
@inproceedings{stanislawski2012automated,
|
||||
title={Automated metric assessment of line simplification in humid landscapes},
|
||||
author={Stanislawski, Lawrence V and Raposo, Paulo and Howard, Michael and Buttenfield, Barbara P},
|
||||
booktitle={Proceedings of the AutoCarto},
|
||||
year={2012}
|
||||
}
|
||||
|
||||
% LIKELY UNNEEDED
|
||||
@book{buttenfield1991map,
|
||||
title={Map Generalization: Making rules for knowledge representation},
|
||||
author={Buttenfield, Barbara Pfeil and McMaster, Robert Brainerd},
|
||||
year={1991},
|
||||
publisher={Longman Scientific \& Technical London}
|
||||
}
|
||||
|
||||
@article{chaikin1974algorithm,
|
||||
title={An algorithm for high-speed curve generation},
|
||||
author={Chaikin, George Merrill},
|
||||
journal={Computer graphics and image processing},
|
||||
volume={3},
|
||||
number={4},
|
||||
pages={346--349},
|
||||
year={1974},
|
||||
publisher={Elsevier}
|
||||
}
|
||||
|
||||
@article{knuth1976big,
|
||||
title={Big omicron and big omega and big theta},
|
||||
author={Knuth, Donald E},
|
||||
journal={ACM Sigact News},
|
||||
volume={8},
|
||||
number={2},
|
||||
pages={18--24},
|
||||
year={1976},
|
||||
publisher={ACM New York, NY, USA}
|
||||
}
|
||||
|
||||
@book{bachmann1894analytische,
|
||||
title={Die analytische zahlentheorie},
|
||||
author={Bachmann, Paul},
|
||||
volume={2},
|
||||
year={1894},
|
||||
publisher={Teubner}
|
||||
}
|
||||
|
||||
@article{landau1911,
|
||||
title={Handbuch der Lehre von der Verteilung der Primzahlen},
|
||||
journal={Monatshefte f{\"u}r Mathematik und Physik},
|
||||
year={1911},
|
||||
month={12},
|
||||
day={01},
|
||||
volume={22},
|
||||
number={1},
|
||||
pages={A26-A26},
|
||||
issn={1436-5081},
|
||||
doi={10.1007/BF01742852},
|
||||
}
|
||||
|
||||
@online{mappingunits,
|
||||
author={Aileen Buckley},
|
||||
title={Guidelines for minimum size for text and symbols on maps},
|
||||
date={2008-01-16},
|
||||
url={https://www.esri.com/arcgis-blog/products/product/mapping/guidelines-for-minimum-size-for-text-and-symbols-on-maps/},
|
||||
organization={Esri},
|
||||
urldate={2021-05-03},
|
||||
}
|
||||
|
||||
@online{cartoucheMinimalDimensions,
|
||||
author={CartouCHe},
|
||||
title={Cartographic Design for Screen Maps},
|
||||
subtitle={Minimum Dimensions},
|
||||
date={2012-01-26},
|
||||
url={http://www.e-cartouche.ch/content_reg/cartouche/cartdesign/en/html/GenRules_learningObject3.html},
|
||||
urldate={2021-05-03},
|
||||
}
|
||||
|
||||
@online{epsg3857,
|
||||
author={MapTiler Team},
|
||||
title={WGS 84/Pseudo-Mercator},
|
||||
url={https://epsg.io/3857},
|
||||
urldate={2021-05-03},
|
||||
}
|
||||
|
||||
@online{postgis311,
|
||||
author={PostGIS Team},
|
||||
title={PostGIS 3.1.1},
|
||||
url={https://postgis.net/2021/01/28/postgis-3.1.1/},
|
||||
urldate={2021-05-12},
|
||||
}
|
||||
|
||||
@online{postgisref,
|
||||
author={PostGIS Team},
|
||||
title={PostGIS Reference},
|
||||
url={https://postgis.net/docs/reference.html},
|
||||
urldate={2021-05-12},
|
||||
}
|
||||
|
||||
@online{wmsql,
|
||||
author={Motiejus Jakštys},
|
||||
title={Wang--M{\"u}ller implementation in PostGIS},
|
||||
url={https://github.com/motiejus/wm},
|
||||
urldate={2021-05-19},
|
||||
}
|
||||
|
||||
@online{openstreetmap,
|
||||
author={OpenStreetMap contributors},
|
||||
title={Project that creates and distributes free world's geographic data},
|
||||
url={https://www.openstreetmap.org},
|
||||
urldate={2021-05-15},
|
||||
}
|
||||
|
||||
@online{nzt,
|
||||
author={Nacionalinė Žemės Tarnyba Prie Žemės Ūkio Ministerijos},
|
||||
title={Atviri Duomenys},
|
||||
url={http://nzt.lt/go.php/lit/Atviri-duomenys},
|
||||
urldate={2021-05-15},
|
||||
}
|
||||
|
||||
@online{openmapwm,
|
||||
author={Tomas Straupis},
|
||||
title={Test harness for Wang--M{\"u}ller algorithm},
|
||||
url={https://dev.openmap.lt/webgl/wm.html},
|
||||
urldate={2021-05-15},
|
||||
}
|
||||
|
||||
@article{devangleserrorbends,
|
||||
author={Gökgöz, Türkay and Sen, Alper and Memduhoğlu, Abdulkadir and Hacar, Müslüm},
|
||||
year={2015},
|
||||
month={10},
|
||||
pages={2185-2204},
|
||||
title={A New Algorithm for Cartographic Simplification of Streams and Lakes Using Deviation Angles and Error Bands},
|
||||
volume={4},
|
||||
journal={ISPRS International Journal of Geo-Information},
|
||||
doi={10.3390/ijgi4042185}
|
||||
}
|
||||
49
IV/db
49
IV/db
@ -1,49 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
name=wm-mj
|
||||
|
||||
_psql() {
|
||||
env \
|
||||
PGPASSWORD=osm \
|
||||
PGHOST=127.0.0.1 \
|
||||
PGUSER=osm \
|
||||
PGDATABASE=osm \
|
||||
psql "$@"
|
||||
}
|
||||
|
||||
_wait_for_postgres() {
|
||||
>&2 echo -n "Waiting for postgres"
|
||||
for _ in $(seq 240); do
|
||||
if _psql -qc '\q' 2>/dev/null; then
|
||||
>&2 echo " up"
|
||||
exit 0
|
||||
fi
|
||||
>&2 echo -n .
|
||||
sleep 1
|
||||
done
|
||||
>&2 echo " down"
|
||||
exit 1
|
||||
}
|
||||
|
||||
case ${1:-} in
|
||||
start)
|
||||
_psql -qc '\q' 2>/dev/null && exit 0
|
||||
docker run -d --rm \
|
||||
--net=host \
|
||||
-e POSTGRES_DBNAME=osm \
|
||||
-e POSTGRES_USER=osm \
|
||||
-e POSTGRES_PASSWORD=osm \
|
||||
--name "$name" \
|
||||
postgis/postgis:13-3.1-alpine \
|
||||
-c log_statement=all \
|
||||
-c listen_addresses=127.0.0.1
|
||||
_wait_for_postgres
|
||||
;;
|
||||
stop)
|
||||
docker stop "$name"
|
||||
;;
|
||||
*)
|
||||
_psql "$@"
|
||||
;;
|
||||
esac
|
||||
@ -1,11 +0,0 @@
|
||||
#!/bin/bash -eu
|
||||
s=${1:-mj-msc-full.pdf}
|
||||
d=$(mktemp -d)
|
||||
f=mj-msc.pdf
|
||||
l="$d/make.log"
|
||||
echo "Extracting $s to workdir $d/"; pdfdetach -saveall -o "$d" "$s"
|
||||
echo "Logs in $l ..."; make -j "$(nproc)" -C "$d" "$f" &> "$l" || {
|
||||
echo "Failed to generate. $l extract:"; tail -20 "$l"; exit 1
|
||||
}
|
||||
echo "Opening $d/$f ..."; xdg-open "$d/$f"
|
||||
echo "$d/$f was closed. Removing $d"; rm -r "$d"
|
||||
34
IV/gdr2pgsql
34
IV/gdr2pgsql
@ -1,34 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
dbzip=$(realpath -s "$1")
|
||||
tbl=$2
|
||||
filter=$3
|
||||
outfile=$4
|
||||
|
||||
if [[ "$dbzip" =~ " " ]]; then
|
||||
echo "ERROR: $dbzip contains spaces"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
gdbname=$(unzip -Z1 "$dbzip" | awk -Fgdb '/.gdb/{print $1"gdb";exit}')
|
||||
|
||||
now=$(TZ=UTC date +"%FT%TZ")
|
||||
here=$(whoami)@$(hostname -f)
|
||||
|
||||
mkdir -p ".tmp"
|
||||
ogr2ogr -skipfailures -f PGDump /dev/stdout -t_srs epsg:3857 \
|
||||
"/vsizip/$dbzip/$gdbname" -nln "src_$tbl" hidro_l | \
|
||||
awk "!/^INSERT/{print}; /^INSERT/&&/${filter}/{print;next}" | \
|
||||
bash ./db | \
|
||||
grep -v '^INSERT 0 1'
|
||||
|
||||
bash db -f aggregate-rivers.sql -v "srctable=src_$tbl" -v "dsttable=$tbl"
|
||||
(
|
||||
echo "-- Generated at $now on $here";
|
||||
echo "-- Rivers: $filter";
|
||||
docker exec wm-mj pg_dump --clean -Uosm osm -t "$tbl" | tr -d '\r'
|
||||
) > ".tmp/$outfile"
|
||||
mv ".tmp/$outfile" "$outfile"
|
||||
@ -1,23 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
# Prefix the 'make <...>' with this script to build the artifact in an isolated
|
||||
# container. This means host dependencies can only be Docker and a shell (to
|
||||
# run this script).
|
||||
#
|
||||
# Usage:
|
||||
# ./in-container make help
|
||||
# ./in-container make -j mj-msc-full.pdf
|
||||
# ...
|
||||
|
||||
NAME=wm-mj-build
|
||||
if [[ -z "$(docker images -q --filter "reference=$NAME")" ]]; then
|
||||
docker build -t "$NAME" .
|
||||
fi
|
||||
|
||||
exec docker run -ti --rm \
|
||||
--net=host \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v $(git rev-parse --show-toplevel):/x \
|
||||
-w /x/$(basename ${PWD}) \
|
||||
"$NAME" "$@"
|
||||
33
IV/init.sql
33
IV/init.sql
@ -1,33 +0,0 @@
|
||||
-- This file initializes tables for unit and river tests.
|
||||
-- ST_SimplifyWM, when dbgname is non-empty, expects `wm_debug` table to be
|
||||
-- created.
|
||||
|
||||
-- to preview this somewhat conveniently in QGIS:
|
||||
-- stage || '_' || name || ' gen:' || coalesce(gen, 'Ø') || ' nbend:' || lpad(nbend, 4, '0')
|
||||
drop table if exists wm_debug;
|
||||
create table wm_debug(
|
||||
id serial,
|
||||
stage text not null,
|
||||
name text not null,
|
||||
gen bigint not null,
|
||||
nbend bigint,
|
||||
way geometry,
|
||||
props jsonb
|
||||
);
|
||||
|
||||
drop table if exists wm_manual;
|
||||
create table wm_manual (
|
||||
id serial,
|
||||
name text,
|
||||
way geometry,
|
||||
props jsonb
|
||||
);
|
||||
|
||||
-- Run ST_SimplifyWM in debug mode, so `wm_debug` is populated. That table
|
||||
-- is used for geometric assertions later in the file.
|
||||
drop table if exists wm_demo;
|
||||
create table wm_demo (name text, i bigint, way geometry);
|
||||
|
||||
-- wm_visuals holds visual aids for the paper.
|
||||
drop table if exists wm_visuals;
|
||||
create table wm_visuals (name text, way geometry);
|
||||
133
IV/layer2img.py
133
IV/layer2img.py
@ -1,133 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
"""
|
||||
Convert PostGIS geometries to an image. To scale.
|
||||
|
||||
Accepts a few geometry fine-tuning parameters.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import geopandas
|
||||
import psycopg2
|
||||
from matplotlib import rc
|
||||
import matplotlib.pyplot as plt
|
||||
|
||||
CMAP = 'tab20c' # 'Set3' # is nice too
|
||||
PSQL_CREDS = "host=127.0.0.1 dbname=osm user=osm password=osm"
|
||||
COLORS = {
|
||||
'black': '#000000',
|
||||
'green': '#1b9e77',
|
||||
'orange': '#d95f02',
|
||||
'purple': '#7570b3',
|
||||
}
|
||||
# see `NOTICE` in the LaTeX document; this is the width of the main text block.
|
||||
TEXTWIDTH_CM = 12.12364
|
||||
|
||||
QUADRANTS = {'tr':1, 'tl':2, 'bl':3, 'br':4}
|
||||
|
||||
def color(string):
|
||||
return COLORS[string if string else 'black']
|
||||
|
||||
|
||||
def inch(cm):
|
||||
return cm / 2.54
|
||||
|
||||
|
||||
def parse_args():
|
||||
kwcolor = {'type': color, 'default': 'black'}
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--g1-select')
|
||||
parser.add_argument('--g1-linestyle')
|
||||
parser.add_argument('--g1-label')
|
||||
parser.add_argument('--g1-color', **kwcolor)
|
||||
parser.add_argument('--g2-select')
|
||||
parser.add_argument('--g2-linestyle')
|
||||
parser.add_argument('--g2-label')
|
||||
parser.add_argument('--g2-color', **kwcolor)
|
||||
parser.add_argument('--g3-select')
|
||||
parser.add_argument('--g3-linestyle')
|
||||
parser.add_argument('--g3-label')
|
||||
parser.add_argument('--g3-color', **kwcolor)
|
||||
parser.add_argument('--legend',
|
||||
help="Legend location, following matplotlib rules", default='best')
|
||||
parser.add_argument('--widthdiv', default=1, type=float,
|
||||
help="Divide the width by this number "
|
||||
"(useful when two images are laid horizontally "
|
||||
"in the resulting file")
|
||||
parser.add_argument('--quadrant', choices=QUADRANTS.keys(),
|
||||
help="Image is comprised of 4 quadrants. This variable, "
|
||||
"when non-empty, will clip and return the requested quadrant")
|
||||
parser.add_argument('--outfile', metavar='<file>',
|
||||
help="If unset, displayed on the screen")
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def read_layer(select, width, maybe_quadrant):
|
||||
if not select:
|
||||
return
|
||||
way = "way"
|
||||
if maybe_quadrant:
|
||||
way = "wm_quadrant(way, {})".format(QUADRANTS[maybe_quadrant])
|
||||
|
||||
conn = psycopg2.connect(PSQL_CREDS)
|
||||
sql = "SELECT {way} as way1 FROM {select}".format(way=way, select=select)
|
||||
|
||||
return geopandas.read_postgis(sql, con=conn, geom_col='way1')
|
||||
|
||||
|
||||
def plot_args(geom, color, maybe_linestyle, maybe_label):
|
||||
if geom is None:
|
||||
return
|
||||
|
||||
# polygons either have fillings or lines
|
||||
if geom.geom_type[0] == 'Polygon':
|
||||
if maybe_linestyle:
|
||||
return {
|
||||
'edgecolor': 'black',
|
||||
'linestyle': maybe_linestyle,
|
||||
'color': (0, 0, 0, 0),
|
||||
}
|
||||
else:
|
||||
return {'cmap': CMAP, 'alpha': .25}
|
||||
|
||||
r = {'color': color}
|
||||
if maybe_linestyle == 'invisible':
|
||||
r['color'] = (0, 0, 0, 0)
|
||||
elif maybe_linestyle:
|
||||
r['linestyle'] = maybe_linestyle
|
||||
|
||||
if maybe_label:
|
||||
r['label'] = '\\normalfont %s' % maybe_label
|
||||
|
||||
return r
|
||||
|
||||
|
||||
def main():
|
||||
args = parse_args()
|
||||
width = TEXTWIDTH_CM / args.widthdiv
|
||||
g1 = read_layer(args.g1_select, width, args.quadrant)
|
||||
g2 = read_layer(args.g2_select, width, args.quadrant)
|
||||
g3 = read_layer(args.g3_select, width, args.quadrant)
|
||||
c1 = plot_args(g1, args.g1_color, args.g1_linestyle, args.g1_label)
|
||||
c2 = plot_args(g2, args.g2_color, args.g2_linestyle, args.g2_label)
|
||||
c3 = plot_args(g3, args.g3_color, args.g3_linestyle, args.g3_label)
|
||||
|
||||
rc('text', usetex=True)
|
||||
rc('text.latex', preamble='\\usepackage{numprint}\n')
|
||||
fig, ax = plt.subplots(constrained_layout=True)
|
||||
fig.set_figwidth(inch(width))
|
||||
|
||||
g1 is not None and g1.plot(ax=ax, linewidth=.75, **c1)
|
||||
g2 is not None and g2.plot(ax=ax, linewidth=.75, **c2)
|
||||
g3 is not None and g3.plot(ax=ax, linewidth=.75, **c3)
|
||||
|
||||
ax.legend(loc=args.legend, frameon=False)
|
||||
ax.axis('off')
|
||||
ax.margins(0, 0)
|
||||
if args.outfile:
|
||||
fig.savefig(args.outfile, bbox_inches='tight', dpi=600)
|
||||
else:
|
||||
plt.show()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
1738
IV/mj-msc.tex
1738
IV/mj-msc.tex
File diff suppressed because it is too large
Load Diff
117
IV/notes.txt
117
IV/notes.txt
@ -1,117 +0,0 @@
|
||||
Self-line crossing when cutting a bend
|
||||
--------------------------------------
|
||||
|
||||
The self-line-crossing may happen after a few bends have been skipped. E.g.
|
||||
ends of A<->B cross the line, but "swallow" a few more in between:
|
||||
|
||||
,______
|
||||
/ \
|
||||
|___A | \ \
|
||||
\ | B\ | __
|
||||
\ | | | / \
|
||||
/ | | |___,---,___/A |
|
||||
/ | \_________________|
|
||||
\ |
|
||||
\ | \ \
|
||||
/ / B\ | _ __
|
||||
----/ / | | / \ / \
|
||||
/ ,____/ | |___/ \___/A |
|
||||
/ B| \_________________|
|
||||
|
|
||||
|
||||
|
||||
|
||||
If a bend with 180+ deg sum of inflection angles is found, its line between
|
||||
inflection angles (AB in our examples) must be crossed with all the other bends
|
||||
to detect a possible line-crossing. This is O(N*M), where N is the total number
|
||||
of line segments, and M is the number of qualifying bends. It is expensive.
|
||||
|
||||
Also, there is another way to remove self-crossing, without removing most of
|
||||
the bend. E.g. from:
|
||||
|
||||
\ /
|
||||
B\ | __
|
||||
| | / \
|
||||
| |____/A |
|
||||
\__________|
|
||||
|
||||
Instead of:
|
||||
|
||||
\ /
|
||||
\/ A'
|
||||
B
|
||||
|
||||
To:
|
||||
|
||||
\ \_
|
||||
B\ `-,_.__
|
||||
| A' \
|
||||
| |
|
||||
\__________|
|
||||
|
||||
But perhaps it doesn't look quite as natural. I will trust the original
|
||||
article to do the right thing here and remove the bend altogether.
|
||||
|
||||
ALSO: the bends should be iterated from different directions:
|
||||
|
||||
for i := 0; i < len(bends); i++ {
|
||||
for j := 0; j < i; j++ {
|
||||
...
|
||||
}
|
||||
for j := len(bends); j > i; j-- {
|
||||
...
|
||||
}
|
||||
}
|
||||
|
||||
So if there are multiple bends between the baseline, they will be cut
|
||||
correctly.
|
||||
|
||||
The Context of a Bend
|
||||
---------------------
|
||||
|
||||
Similar bends:
|
||||
|
||||
> For example, if bend 1 has four unit areas and bend 2 has six unit areas, the
|
||||
> average size is five units, and the normalized areas of bends 1 and 2 are
|
||||
> 4/5=0.8 and 6/5=1.2, respectively.
|
||||
|
||||
My comment: everything until this sentence is clear. However, "unit areas" is
|
||||
misleading: there is little reason to normalize areas, but leave the distances
|
||||
intact (if we'd like to normalize areas, it would make sense to square-root
|
||||
them).
|
||||
|
||||
Removing that removes changes the meaning of the sentence that **euclidean
|
||||
distance** is normalized (the composite of the bend properties), rather than
|
||||
a single component.
|
||||
|
||||
Offered structure
|
||||
-----------------
|
||||
|
||||
- Introduction
|
||||
- Previous research overview
|
||||
- Methodology and methodics
|
||||
- Results
|
||||
- Conclusions
|
||||
- Literature review
|
||||
- Appendix
|
||||
|
||||
for 2021-04-19
|
||||
--------------
|
||||
|
||||
- literatūros šaltinių analizė
|
||||
- literatūros šaltinių priskyrimas atskiroms magistro darbo struktūrinėms dalims
|
||||
|
||||
analizės uždaviniai:
|
||||
- galutinis problemos formulavimas
|
||||
- darbo tikslo formulavimas
|
||||
- uždavinių formulavimas
|
||||
- aktualumo
|
||||
- naujumo
|
||||
- pritaikomumo formulavimas
|
||||
|
||||
Angl.:
|
||||
|
||||
- trūksta literatūros apžvalgos: pervadinti šiuolaikinius sprendimus į tai
|
||||
- mažiausiai 2 poskyriai skyriuje.
|
||||
- techninė dalis -- į rezultatus.
|
||||
- "eksperimento rezultatai" eina į "darbo rezultatus".
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 198 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,90 +0,0 @@
|
||||
---
|
||||
title: Wang & Müller linijų generalizacijos algoritmo įgyvendinimas upių pavyzdžiu
|
||||
author: Motiejus Jakštys
|
||||
description: |
|
||||
Prezentacija apie magistrinio darbo progresą vertinimo grupei
|
||||
date: |
|
||||
2021-03-29 \
|
||||
{width=2in}
|
||||
lang: lt-LT
|
||||
header-includes: |
|
||||
\definecolor{vulightgrey}{RGB}{220,220,220}
|
||||
\definecolor{vudarkgrey}{RGB}{65,65,65}
|
||||
\definecolor{vupurple}{RGB}{123,0,63}
|
||||
\definecolor{darkgreen}{RGB}{32,96,32}
|
||||
|
||||
\setbeamercolor{title}{fg=vupurple}
|
||||
\setbeamercolor{frametitle}{fg=vupurple}
|
||||
\setbeamercolor{item}{fg=vupurple}
|
||||
\setbeamercolor{normal text}{fg=vudarkgrey}
|
||||
...
|
||||
|
||||
# Problema
|
||||
|
||||
- Dabartiniai atvirai prieinami algoritmai
|
||||
- Visvalingam-Whyatt
|
||||
- Douglas-Peucker
|
||||
|
||||
- Problematika
|
||||
- nepritaikyti gamtiniams objektams: upėms, krantų linijoms
|
||||
- prarandami raiškūs gamtinių objektų elementai: vingiai, kilpos
|
||||
|
||||
- Alternatyvos
|
||||
- egzistuoja tik teorinės
|
||||
- nėra implementacijos
|
||||
- net teorinėms -- neapibrėžti parametrai
|
||||
|
||||
# Aktualumas
|
||||
|
||||
- Smulkesnių mastelių žemėlapių georeferenciniai duomenys kuriami taikant
|
||||
automatizuoto generalizavimo metodus (pvz., GDR10LT generaluzuojant į
|
||||
GDR50LT, GDR250LT).
|
||||
- Nėra atvirai prieinamo sprendimo gamtinių linijinių objektų generalizacijai
|
||||
|
||||
# Etapai: Wang & Müller techninio įgyvendinimo
|
||||
|
||||
::: nonincremental
|
||||
- Įlinkių atpažinimas
|
||||
- Silpnas pasislinkimas įlinkio gale
|
||||
- Įlinkio kirtimas kitu įlinkiu
|
||||
- Patikrinimas su Nemunu, Šalčia ir Visinčia
|
||||
- Įlinkių matavimai:
|
||||
- dydis ir forma
|
||||
- izoliuoti, panašūs
|
||||
- Operatoriai:
|
||||
- Specifinio įlinkio pašalinimo
|
||||
- Dviejų įlinkių kombinavimo į vieną
|
||||
- Izoliuotų įlinkių padidinimo
|
||||
- Pritaikymas visoms Lietuvos upėms
|
||||
:::
|
||||
|
||||
# Etapai: analizės ir darbo rašymo
|
||||
|
||||
::: nonincremental
|
||||
- Esamų algoritmų apžvalga
|
||||
- Problemos aprašymas
|
||||
- Pasirinkto generalizacijos sprendimo apibūdinimas
|
||||
- Sukurtos implementacijos aptarimas
|
||||
- privalumai
|
||||
- trūkumai
|
||||
- Nauda praktikoje
|
||||
- Tolimesnių tyrimų kryptys
|
||||
:::
|
||||
|
||||
# Naujumas
|
||||
|
||||
Šis darbas pasiūlys iki šiol neegzistuojantį atvirą sprendimą gamtinių
|
||||
linijinių objektų generalizacijai (Lietuvoje -- GDR50 ir GDR250 analogus)
|
||||
|
||||
# Tolimesnis pritaikymas
|
||||
|
||||
- Sukurta algoritmo techninė realizacija atviro kodo GIS bus pradžia tolesniam jo
|
||||
pritaikymui kitiems gamtiniams objektams: ežerų kranto linija, jūrų,
|
||||
kontinentų, miškų ribos.
|
||||
|
||||
- Kadangi rezultatas bus techninė realizacija, o ne rašinėlis, tai suteikia
|
||||
toliau galimybę vystyti sprendimą.
|
||||
|
||||
# Klausimai
|
||||
|
||||
Ačiū už dėmesį.
|
||||
@ -1,20 +0,0 @@
|
||||
\set ON_ERROR_STOP on
|
||||
SET plpgsql.extra_errors TO 'all';
|
||||
|
||||
-- This fails with real rivers since dcf4c02307baeece51470a961a113a8fad68fad5
|
||||
-- (adding GDB10LT data). The same rivers from OpenStreetMaps work.
|
||||
-- There seems to be a bug in wm_exaggeration.
|
||||
|
||||
do $$
|
||||
declare
|
||||
npoints bigint;
|
||||
secs bigint;
|
||||
begin
|
||||
select * from ST_SimplifyWM_Estimate((select st_union(way) from wm_rivers)) into npoints, secs;
|
||||
raise notice 'Total points: %', npoints;
|
||||
raise notice 'Expected duration: %s (+-%s)', ceil(secs), floor(secs*.5);
|
||||
end $$ language plpgsql;
|
||||
|
||||
delete from wm_debug where name in (select distinct name from wm_rivers);
|
||||
delete from wm_demo where name in (select distinct name from wm_rivers);
|
||||
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, 75, null, name) from wm_rivers;
|
||||
198
IV/test.sql
198
IV/test.sql
@ -1,198 +0,0 @@
|
||||
\i wm.sql
|
||||
|
||||
-- https://stackoverflow.com/questions/19982373/which-tools-libraries-do-you-use-to-unit-test-your-pl-pgsql
|
||||
create or replace function assert_equals(expected anyelement, actual anyelement) returns void as $$
|
||||
begin
|
||||
if expected = actual or (expected is null and actual is null) then
|
||||
--do nothing
|
||||
else
|
||||
raise exception 'Assertion Error. Expected <%> but was <%>', expected, actual;
|
||||
end if;
|
||||
end $$ language plpgsql;
|
||||
|
||||
drop function if exists dbg_geomsummary;
|
||||
create function dbg_geomsummary(geoms geometry[]) returns void as $$
|
||||
declare i int4;
|
||||
begin
|
||||
raise notice 'len: %', array_length(geoms, 1);
|
||||
for i in 1..array_length(geoms, 1) loop
|
||||
raise notice '% %: %', st_geometrytype(geoms[i]), lpad(i::text, 2, '0'), st_astext(geoms[i]);
|
||||
end loop;
|
||||
end
|
||||
$$ language plpgsql;
|
||||
|
||||
drop table if exists wm_figures;
|
||||
create table wm_figures (name text, way geometry);
|
||||
-- add fig8.gpkg to postgis:
|
||||
-- ogr2ogr -update -f PostgreSQL PG:"host=127.0.0.1 user=osm password=osm dbname=osm" fig8.gpkg
|
||||
-- to "normalize" a new line when it's in `f`:
|
||||
-- select st_astext(st_snaptogrid(st_transscale(geometry, -19.5, .016, 4000, 4000), 1)) from f;
|
||||
insert into wm_figures (name, way) values
|
||||
('fig3', 'LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0,60 0)'::geometry),
|
||||
('fig3-1', 'LINESTRING(0 0,12 0,13 4,20 2,20 0,32 0,33 10,38 16,43 15,44 10,44 0)'::geometry),
|
||||
('fig5', 'LINESTRING(0 39,19 52,27 77,26 104,41 115,49 115,65 103,65 75,53 45,63 15,91 0)'::geometry),
|
||||
('fig6', 'LINESTRING(84 47,91 59,114 64,122 80,116 92,110 93,106 106,117 118,136 107,135 76,120 45,125 39,141 39,147 32)'::geometry),
|
||||
('fig8', 'LINESTRING(173 12,174 10,180 8,186 8,186 13,191 11,189 6,201 5,203 11,216 16,216 6,222 6,229 3,236 2,239 6,243 8,248 6)'::geometry),
|
||||
('inflection-1', 'LINESTRING(110 24,114 20,133 20,145 15,145 0,136 8,123 10,114 10,111 2)'::geometry),
|
||||
('multi-island', 'MULTILINESTRING((-15 10,-10 10,-5 11,0 11,5 11,10 10,11 9,13 10,15 9),(-5 11,-2 15,0 16,2 15,5 11))'::geometry),
|
||||
('selfcrossing-1','LINESTRING(-27 180,-20 166,-21 142,-18 136,55 136,55 136,71 145,44 165,37 146,22 145,14 164,11 164,3 146,-12 146,-13 176,-18 184)'::geometry),
|
||||
('isolated-1', 'LINESTRING(-50 103,-48 102,-30 103,-31 105,-31 107,-27 107,-26 103,-6 103,-4 104)'::geometry),
|
||||
('isolated-2', 'LINESTRING(250 100,246 104,234 105,230 106,225 101,224 93,217 78,206 69)'::geometry);
|
||||
|
||||
insert into wm_figures (name, way) values ('fig6-rev',ST_Reverse(
|
||||
ST_Translate((select way from wm_figures where name='fig6'), 60, 0)));
|
||||
insert into wm_figures (name, way) values ('fig6-combi', ST_Union(
|
||||
ST_Translate((select way from wm_figures where name='fig6'), 0, 90),
|
||||
ST_Translate((select way from wm_figures where name='fig6'), 80, 90)
|
||||
));
|
||||
|
||||
insert into wm_figures (name, way) values ('selfcrossing-1-rev',ST_Reverse(
|
||||
ST_Translate((select way from wm_figures where name='selfcrossing-1'), 0, 60)));
|
||||
|
||||
-- 3395 is now "reserved" for figures.
|
||||
update wm_figures set way=st_setsrid(way, 3395);
|
||||
|
||||
delete from wm_debug where name in (select distinct name from wm_figures);
|
||||
delete from wm_demo where name in (select distinct name from wm_figures);
|
||||
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, .1, null, name) from wm_figures where name not in ('fig8', 'isolated-1');
|
||||
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, 14, null, name) from wm_figures where name in ('fig8', 'isolated-1', 'isolated-2');
|
||||
|
||||
drop function if exists wm_debug_get;
|
||||
create function wm_debug_get( _stage text, _name text, OUT ways geometry[]) as $$
|
||||
declare
|
||||
begin
|
||||
ways = array((select way from wm_debug where stage=_stage and name=_name order by id));
|
||||
end $$ language plpgsql;
|
||||
|
||||
do $$
|
||||
declare
|
||||
vbends geometry[];
|
||||
begin
|
||||
vbends = wm_debug_get('bbends', 'fig3');
|
||||
perform assert_equals(5, array_length(vbends, 1));
|
||||
perform assert_equals('LINESTRING(0 0,12 0,13 4)', st_astext(vbends[1]));
|
||||
perform assert_equals('LINESTRING(12 0,13 4,20 2,20 0)', st_astext(vbends[2]));
|
||||
perform assert_equals('LINESTRING(20 2,20 0,32 0,33 10)', st_astext(vbends[3]));
|
||||
perform assert_equals('LINESTRING(32 0,33 10,38 16,43 15,44 10,44 0)', st_astext(vbends[4]));
|
||||
perform assert_equals(4, array_length(wm_detect_bends((select way from wm_figures where name='fig3-1')), 1));
|
||||
select wm_detect_bends((select way from wm_figures where name='fig5')) into vbends;
|
||||
perform assert_equals(3, array_length(vbends, 1));
|
||||
end $$ language plpgsql;
|
||||
|
||||
do $$
|
||||
declare
|
||||
vbends geometry[];
|
||||
vinflections geometry[];
|
||||
begin
|
||||
vinflections = wm_debug_get('cinflections', 'fig5');
|
||||
perform assert_equals('LINESTRING(0 39,19 52,27 77)', st_astext(vinflections[1]));
|
||||
perform assert_equals('LINESTRING(19 52,27 77,26 104,41 115,49 115,65 103,65 75,53 45)', st_astext(vinflections[2]));
|
||||
perform assert_equals('LINESTRING(65 75,53 45,63 15,91 0)', st_astext(vinflections[3]));
|
||||
|
||||
-- inflections-1, the example in fix_gentle_inflections docstring
|
||||
select array((select way from wm_debug where name='inflection-1' and stage='bbends')) into vbends;
|
||||
select array((select way from wm_debug where name='inflection-1' and stage='cinflections')) into vinflections;
|
||||
perform assert_equals(vbends[1], vinflections[1]); -- unchanged
|
||||
perform assert_equals('LINESTRING(114 20,133 20,145 15,145 0,136 8,123 10,114 10)', st_astext(vinflections[2]));
|
||||
perform assert_equals('LINESTRING(123 10,114 10,111 2)', st_astext(vinflections[3]));
|
||||
end $$ language plpgsql;
|
||||
|
||||
do $$
|
||||
declare
|
||||
fig6 constant text default 'LINESTRING(84 47,91 59,114 64,120 45,125 39,141 39,147 32)';
|
||||
selfcrossing1 constant text default 'LINESTRING(-27 180,-20 166,-13 176,-18 184)';
|
||||
vcrossings geometry[];
|
||||
mutated boolean;
|
||||
begin
|
||||
select * from wm_self_crossing(wm_debug_get('cinflections', 'fig6')) into vcrossings, mutated;
|
||||
perform assert_equals(true, mutated);
|
||||
perform assert_equals(
|
||||
fig6,
|
||||
(select st_astext(
|
||||
st_linemerge(st_union(way))
|
||||
) from (select unnest(vcrossings) way) a)
|
||||
);
|
||||
|
||||
select * from wm_self_crossing(wm_debug_get('cinflections', 'fig6-rev')) into vcrossings, mutated;
|
||||
perform assert_equals(true, mutated);
|
||||
perform assert_equals(
|
||||
fig6,
|
||||
(select st_astext(
|
||||
st_translate(st_reverse(st_linemerge(st_union(way))), -60, 0)
|
||||
) from (select unnest(vcrossings) way) a)
|
||||
);
|
||||
|
||||
select * from wm_self_crossing(wm_debug_get('cinflections', 'fig6-combi')) into vcrossings, mutated;
|
||||
perform assert_equals(true, mutated);
|
||||
perform assert_equals(
|
||||
'MULTILINESTRING((84 137,91 149,114 154,120 135,125 129,141 129,147 122),(164 137,171 149,194 154,200 135,205 129,221 129,227 122))',
|
||||
(select st_astext(
|
||||
st_linemerge(st_union(way))
|
||||
) from (select unnest(vcrossings) way) a)
|
||||
);
|
||||
|
||||
|
||||
select * from wm_self_crossing(wm_debug_get('cinflections', 'selfcrossing-1')) into vcrossings, mutated;
|
||||
perform assert_equals(true, mutated);
|
||||
perform assert_equals(
|
||||
selfcrossing1,
|
||||
(select st_astext(
|
||||
st_linemerge(st_union(way))
|
||||
) from (select unnest(vcrossings) way) a)
|
||||
);
|
||||
|
||||
select * from wm_self_crossing(wm_debug_get('cinflections', 'selfcrossing-1-rev')) into vcrossings, mutated;
|
||||
perform assert_equals(true, mutated);
|
||||
perform assert_equals(
|
||||
selfcrossing1,
|
||||
(select st_astext(
|
||||
st_translate(st_reverse(st_linemerge(st_union(way))), 0, -60)
|
||||
) from (select unnest(vcrossings) way) a)
|
||||
);
|
||||
|
||||
end $$ language plpgsql;
|
||||
|
||||