Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suro style #71

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Suro style #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
96d886c
adding black&white map style
jachym Nov 4, 2019
7130cda
add support for include mapfiles
jachym Nov 8, 2019
177c011
instroducing topo style
madlenkk Nov 15, 2019
e8b6bd2
topo style first version
madlenkk Jan 7, 2020
6efde60
modify stream width
madlenkk Jan 7, 2020
6b5370f
opacity as variable
jachym Mar 30, 2020
989506c
modify bw style
madlenkk Mar 30, 2020
53f83d4
bw style - litle changes
madlenkk Apr 20, 2020
b9184ce
waterways under water bodies
tkacovas Jul 20, 2020
0346224
Modified to generate correct osm-bw.map
tkacovas Aug 4, 2020
05e230b
Changed symbols for forest and water areas
tkacovas Aug 4, 2020
ef1fecc
New pattern symbol for forest areas
tkacovas Aug 4, 2020
716a296
Created symbolset for modified landusage.map
tkacovas Aug 4, 2020
a12cb75
Created new symbol pattern for water areas
tkacovas Aug 4, 2020
71b5e3c
renaming and moving icons, modifying symbolset.txt
tkacovas Aug 17, 2020
bfedc73
change water layer order
jachym Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 34 additions & 20 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ DEBUG?=1
LAYERDEBUG?=1
PROJ_LIB?=`pwd`
STYLE?=default
BASE?=
OVERLAY?=
#can also use google or bing

template=osmbase.map
Expand All @@ -41,67 +43,79 @@ includes=land.map landusage.map borders.map highways.map places.map \

mapfile=osm-$(STYLE).map

ifdef BASE
base=--include-base=$(BASE)
else
base=
endif

ifdef OVERLAY
overlay=--include-overlay=$(OVERLAY)
else
overlay=
endif

all:$(mapfile) boundaries.sql

generated/$(STYLE)style.msinc: generate_style.py
python generate_style.py -s $(STYLE) -g > $@
python generate_style.py -s $(STYLE) -g $(base) $(overlay) > $@

generated/$(STYLE)level0.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 0 > $@
python generate_style.py -s $(STYLE) -l 0 $(base) $(overlay) > $@

generated/$(STYLE)level1.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 1 > $@
python generate_style.py -s $(STYLE) -l 1 $(base) $(overlay) > $@

generated/$(STYLE)level2.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 2 > $@
python generate_style.py -s $(STYLE) -l 2 $(base) $(overlay) > $@

generated/$(STYLE)level3.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 3 > $@
python generate_style.py -s $(STYLE) -l 3 $(base) $(overlay) > $@

generated/$(STYLE)level4.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 4 > $@
python generate_style.py -s $(STYLE) -l 4 $(base) $(overlay) > $@

generated/$(STYLE)level5.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 5 > $@
python generate_style.py -s $(STYLE) -l 5 $(base) $(overlay) > $@

generated/$(STYLE)level6.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 6 > $@
python generate_style.py -s $(STYLE) -l 6 $(base) $(overlay) > $@

generated/$(STYLE)level7.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 7 > $@
python generate_style.py -s $(STYLE) -l 7 $(base) $(overlay) > $@

generated/$(STYLE)level8.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 8 > $@
python generate_style.py -s $(STYLE) -l 8 $(base) $(overlay) > $@

generated/$(STYLE)level9.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 9 > $@
python generate_style.py -s $(STYLE) -l 9 $(base) $(overlay) > $@

generated/$(STYLE)level10.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 10 > $@
python generate_style.py -s $(STYLE) -l 10 $(base) $(overlay) > $@

generated/$(STYLE)level11.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 11 > $@
python generate_style.py -s $(STYLE) -l 11 $(base) $(overlay) > $@

generated/$(STYLE)level12.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 12 > $@
python generate_style.py -s $(STYLE) -l 12 $(base) $(overlay) > $@

generated/$(STYLE)level13.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 13 > $@
python generate_style.py -s $(STYLE) -l 13 $(base) $(overlay) > $@

generated/$(STYLE)level14.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 14 > $@
python generate_style.py -s $(STYLE) -l 14 $(base) $(overlay) > $@

generated/$(STYLE)level15.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 15 > $@
python generate_style.py -s $(STYLE) -l 15 $(base) $(overlay) > $@

generated/$(STYLE)level16.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 16 > $@
python generate_style.py -s $(STYLE) -l 16 $(base) $(overlay) > $@

generated/$(STYLE)level17.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 17 > $@
python generate_style.py -s $(STYLE) -l 17 $(base) $(overlay) > $@

generated/$(STYLE)level18.msinc: generate_style.py
python generate_style.py -s $(STYLE) -l 18 > $@
python generate_style.py -s $(STYLE) -l 18 $(base) $(overlay) > $@

$(mapfile):$(template) $(includes)
$(CPP) -D_debug=$(DEBUG) -D_layerdebug=$(LAYERDEBUG) -DOSM_PREFIX=$(OSM_PREFIX) -DOSM_SRID=$(OSM_SRID) -DOSM_FORCE_POSTGIS_EXTENT=$(OSM_FORCE_POSTGIS_EXTENT) -P -o $(mapfile) $(template) -DTHEME=$(STYLE) -D_proj_lib=\"$(PROJ_LIB)\" -Igenerated
Expand Down
2 changes: 1 addition & 1 deletion buildings.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LAYER
CLASS
STYLE
COLOR _building_clr
OPACITY 50
OPACITY _building_opacity
END
STYLE
OUTLINECOLOR _building_ol_clr
Expand Down
Loading