From 96d886c48fdfb35dbb30b00788f77d41eb1e4269 Mon Sep 17 00:00:00 2001 From: Jachym Cepicky Date: Mon, 4 Nov 2019 12:58:52 +0000 Subject: [PATCH 01/16] adding black&white map style --- generate_style.py | 143 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 3 deletions(-) diff --git a/generate_style.py b/generate_style.py index 0d9918fa..bb39cd5d 100755 --- a/generate_style.py +++ b/generate_style.py @@ -391,6 +391,7 @@ 9:0.75, 10:1, 11:1.5, + 12:2, 13:2.5, 14:3, @@ -1170,7 +1171,7 @@ 'tertiary_ol_clr': '193 181 157', 'other_ol_clr': '193 181 157', 'pedestrian_ol_clr': '193 181 157', - 'display_buildings':0 + 'display_buildings':1 }, 'michelin':{ 'motorway_clr': '228 24 24', @@ -1324,7 +1325,141 @@ 14:'"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway||(case when bridge=\'yes\' then 1 else 0 end)||(case when tunnel=\'yes\' then 1 else 0 end) as type from OSM_PREFIX_line where highway is not null order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', }, - } + }, + 'bw':{ + 'park_clr': "0 0 0", + 'residential_clr': "0 0 0", + 'town_ol_clr': "0 0 0", + 'other_clr': "0 0 0", + 'motorway_ol_clr': "0 0 0", + 'city_ol_clr': "0 0 0", + 'suburb_ol_clr': "0 0 0", + 'forest_clr': "0 0 0", + 'tertiary_clr': "0 0 0", + 'river_clr': "0 0 0", + 'building_clr': "0 0 0", + 'secondary_ol_clr': "0 0 0", + 'pedestrian_ol_clr': "0 0 0", + 'cemetery_clr': "0 0 0", + 'hamlet_ol_clr': "0 0 0", + 'land_clr': "0 0 0", + 'capital_fg_clr': "0 0 0", + 'town_clr': "0 0 0", + 'border_2_inner_clr': "0 0 0", + 'pedestrian_clr': "0 0 0", + 'taxiway_clr': "0 0 0", + 'cycleway_ol_clr': "0 0 0", + 'footway_ol_clr': "0 0 0", + 'canal_clr': "0 0 0", + 'stream_clr': "0 0 0", + 'village_clr': "0 0 0", + 'track_clr': "0 0 0", + 'hospital_clr': "0 0 0", + 'motorway_clr': "0 0 0", + 'trunk_clr': "0 0 0", + 'ocean_clr': "0 0 0", + 'building_ol_clr': "0 0 0", + 'runway_center_clr': "0 0 0", + 'border_2_clr': "0 0 0", + 'village_ol_clr': "0 0 0", + 'railway_ol_clr': "0 0 0", + 'primary_clr': "0 0 0", + 'industrial_clr': "0 0 0", + 'primary_bridge_clr': "0 0 0", + 'track_ol_clr': "0 0 0", + 'other_ol_clr': "0 0 0", + 'other_bridge_clr': "0 0 0", + 'railway_clr': "0 0 0", + 'education_clr': "0 0 0", + 'hamlet_clr': "0 0 0", + 'footway_clr': "0 0 0", + 'waterarea_clr': "0 0 0", + 'locality_ol_clr': "0 0 0", + 'secondary_bridge_clr': "0 0 0", + 'motorway_bridge_clr': "0 0 0", + 'locality_clr': "0 0 0", + 'runway_clr': "0 0 0", + 'waterarea_ol_clr': "0 0 0", + 'capital_ol_clr': "0 0 0", + 'cycleway_clr': "0 0 0", + 'capital_clr': "0 0 0", + 'primary_ol_clr': "0 0 0", + 'tertiary_ol_clr': "0 0 0", + 'residential_ol_clr': "0 0 0", + 'trunk_bridge_clr': "0 0 0", + 'city_clr': "0 0 0", + 'secondary_clr': "0 0 0", + 'suburb_clr': "0 0 0", + 'industrial_ol_clr': "0 0 0", + 'sports_clr': "0 0 0", + 'tertiary_bridge_clr': "0 0 0", + 'trunk_ol_clr': "0 0 0", + 'pedestrian_bridge_clr': "0 0 0", + 'transport_clr': "0 0 0", + + 'waterarea_lbl_clr': '"#000000"', + 'waterarea_clr': '"#000000"', + 'waterarea_ol_clr': '"#000000"', + 'ocean_clr': '"#000000"', + 'canal_clr': '"#000000"', + 'stream_clr': '"#000000"', + 'river_clr': '"#000000"', + 'river_clr': '"#000000"', + 'canal_lbl_clr': '"#000000"', + 'stream_lbl_clr': '"#000000"', + 'river_lbl_clr': '"#000000"', + + + 'motorway_bridge_clr':"255 255 255", + 'trunk_bridge_clr':"255 255 255", + 'primary_bridge_clr':"255 255 255", + 'secondary_bridge_clr':"255 255 255", + 'tertiary_bridge_clr':"255 255 255", + 'other_bridge_clr':"255 255 255", + 'pedestrian_bridge_clr':"255 255 255", + 'motorway_centerline_clr': '255 255 255', + + 'motorway_clr': '"#000000"', + 'trunk_clr': '"#000000"', + 'primary_clr': { + 0:'"#FFFFFF"', + 9:'"#000000"' + }, + 'secondary_clr': { + 0:'"#FFFFFF"', + 10:'"#000000"' + }, + 'tertiary_clr': { + 0:'"#FFFFFF"', + 12:'"#ffffff"' + }, + 'other_clr': { + 0:'"#FFFFFF"', + 13:'"#ffffff"' + }, + 'pedestrian_clr': '"#ffffff"', + 'forest_clr': '"#ffffff"', + 'industrial_clr': '"#ffffff"', + 'education_clr': '"#ffffff"', + 'hospital_clr': '"#ffffff"', + 'residential_clr': '"#ffffff"', + 'land_clr': '"#ffffff"', + 'park_clr': '"#ffffff"', + 'ocean_clr': '"#ffffff"', + 'waterarea_clr': '"#ffffff"', + 'river_clr': '"#ffffff"', + 'stream_clr': '"#ffffff"', + 'canal_clr': '"#ffffff"', + + 'motorway_ol_clr': '"#FFFFFF"', + 'trunk_ol_clr': '"#ffffff"', + 'primary_ol_clr': '"#FFFFFF"', + 'secondary_ol_clr': '"#FFFFFF"', + 'tertiary_ol_clr': '"#FFFFFF"', + 'other_ol_clr': '"#000000"', + 'pedestrian_ol_clr': '255 255 255', + 'footway_clr': '"#000000"' + }, } import sys @@ -1345,7 +1480,9 @@ # same style as above, but using data coming from an osm2pgsql schema rather than imposm "googleosm2pgsql":"default,outlined,google,osm2pgsql", "bing":"default,outlined,bing", - "michelin":"default,outlined,centerlined,michelin" + "michelin":"default,outlined,centerlined,michelin", + + "bw":"default,outlined,centerlined,bw" } From 7130cda6ca54bab34840dbbeaf2f1eafb4b294d7 Mon Sep 17 00:00:00 2001 From: Jachym Cepicky Date: Fri, 8 Nov 2019 23:00:09 +0100 Subject: [PATCH 02/16] add support for include mapfiles --- Makefile | 54 +- generate_style.py | 2802 +++++++++++++++++++++++---------------------- include-base.map | 11 + osmbase.map | 61 + 4 files changed, 1514 insertions(+), 1414 deletions(-) mode change 100755 => 100644 generate_style.py create mode 100644 include-base.map diff --git a/Makefile b/Makefile index 3e9468bc..68a60efe 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,8 @@ DEBUG?=1 LAYERDEBUG?=1 PROJ_LIB?=`pwd` STYLE?=default +BASE?= +OVERLAY?= #can also use google or bing template=osmbase.map @@ -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 diff --git a/generate_style.py b/generate_style.py old mode 100755 new mode 100644 index bb39cd5d..cee9a7ee --- a/generate_style.py +++ b/generate_style.py @@ -1,1332 +1,1334 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + +import os layer_suffixes = { - 0:0, - 1:1, - 2:2, - 3:3, - 4:4, - 5:5, - 6:6, - 7:7, - 8:8, - 9:9, - 10:10, - 11:11, - 12:12, - 13:13, - 14:14, - 15:15, - 16:16, - 17:17, - 18:18 + 0: 0, + 1: 1, + 2: 2, + 3: 3, + 4: 4, + 5: 5, + 6: 6, + 7: 7, + 8: 8, + 9: 9, + 10: 10, + 11: 11, + 12: 12, + 13: 13, + 14: 14, + 15: 15, + 16: 16, + 17: 17, + 18: 18 } maxscales = { - 0:99999999999, - 1:332808204, - 2:166404102, - 3:83202051, - 4:41601025, - 5:20800512, - 6:10400256, - 7:5200128, - 8:2600064, - 9:1300032, - 10:650016, - 11:325008, - 12:162504, - 13:81252, - 14:40626, - 15:20313, - 16:10156, - 17:5078, - 18:2539 + 0: 99999999999, + 1: 332808204, + 2: 166404102, + 3: 83202051, + 4: 41601025, + 5: 20800512, + 6: 10400256, + 7: 5200128, + 8: 2600064, + 9: 1300032, + 10: 650016, + 11: 325008, + 12: 162504, + 13: 81252, + 14: 40626, + 15: 20313, + 16: 10156, + 17: 5078, + 18: 2539 } minscales = { - 0:332808204, - 1:166404102, - 2:83202051, - 3:41601025, - 4:20800512, - 5:10400256, - 6:5200128, - 7:2600064, - 8:1300032, - 9:650016, - 10:325008, - 11:162504, - 12:81252, - 13:40626, - 14:20313, - 15:10156, - 16:5078, - 17:2539, - 18:0 + 0: 332808204, + 1: 166404102, + 2: 83202051, + 3: 41601025, + 4: 20800512, + 5: 10400256, + 6: 5200128, + 7: 2600064, + 8: 1300032, + 9: 650016, + 10: 325008, + 11: 162504, + 12: 81252, + 13: 40626, + 14: 20313, + 15: 10156, + 16: 5078, + 17: 2539, + 18: 0 } -vars= { - 'layer_suffix':layer_suffixes, - 'maxscale':maxscales, - 'minscale':minscales, - - 'land_clr': '"#E8E6E1"', - 'land_data': { - 0:'"data/simplified_land_polygons"', - 9:'"data/land_polygons"' - }, - 'land_epsg': { - 0:'"init=epsg:3857"', - }, - - - ##### water ##### - 'waterarea_data': { - 0: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas_gen0) as foo using unique osm_id using srid=OSM_SRID"', - 9: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas_gen1) as foo using unique osm_id using srid=OSM_SRID"', - 12: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas) as foo using unique osm_id using srid=OSM_SRID"' - }, - 'display_waterarea_lbl' : {0:0, 6:1}, - 'waterarea_clr': '"#B3C6D4"', - 'waterarea_ol_clr': '"#B3C6D4"', - 'waterarea_ol_width': 0, - 'waterarea_font': "sc", - 'waterarea_lbl_size': 8, - 'waterarea_lbl_clr': '"#6B94B0"', - 'waterarea_lbl_ol_clr': "255 255 255", - 'waterarea_lbl_ol_width': 2, - 'ocean_clr': '"#B3C6D4"', - - 'display_waterways': { - 0:0, - 6:1 - }, - 'waterways_data': { - 0:'"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways_gen0 where type=\'river\') as foo using unique osm_id using srid=OSM_SRID"', - 9:'"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways_gen1 where type=\'river\') as foo using unique osm_id using srid=OSM_SRID"', - 12:'"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways) as foo using unique osm_id using srid=OSM_SRID"' - }, - - 'canal_width': { - 0:0, - 10:0.5, - 12:1, - 14:2, - 15:4, - 16:8, - 17:16, - 18:30 - }, - 'display_canal_lbl' : {0:0, 10:1}, - 'canal_clr': '"#B3C6D4"', - 'canal_font': "sc", - 'canal_lbl_size': 8, - 'canal_lbl_clr': '"#6B94B0"', - 'canal_lbl_ol_clr': "255 255 255", - 'canal_lbl_ol_width': 2, - - 'stream_width': { - 0:0, - 10:0.5, - 12:1, - 14:2 - }, - 'display_stream_lbl' : {0:0, 12:1}, - 'stream_clr': '"#B3C6D4"', - 'stream_font': "sc", - 'stream_lbl_size': 8, - 'stream_lbl_clr': '"#6B94B0"', - 'stream_lbl_ol_clr': "255 255 255", - 'stream_lbl_ol_width': 2, - - 'river_width': { - 0:0, - 6:0.15, - 7:0.25, - 8:0.5, - 9:1, - 11:2, - 13:3, - 15:4, - 16:5, - 17:6, - 18:7 - }, - 'display_river_lbl' : {0:0, 6:1}, - 'river_clr': '"#B3C6D4"', - 'river_font': "sc", - 'river_lbl_size': {0:8,15:9,17:10}, - 'river_lbl_clr': '"#6B94B0"', - 'river_lbl_ol_clr': "255 255 255", - 'river_lbl_ol_width': 2, - - - ##### landusage ###### - 'display_landusage': { - 0:0, - 4:1 - }, - - 'landusage_data': { - 0:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen00)\ +vars = { + 'layer_suffix': layer_suffixes, + 'maxscale': maxscales, + 'minscale': minscales, + + 'land_clr': '"#E8E6E1"', + 'land_data': { + 0: '"data/simplified_land_polygons"', + 9: '"data/land_polygons"' + }, + 'land_epsg': { + 0: '"init=epsg:3857"', + }, + + + ##### water ##### + 'waterarea_data': { + 0: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas_gen0) as foo using unique osm_id using srid=OSM_SRID"', + 9: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas_gen1) as foo using unique osm_id using srid=OSM_SRID"', + 12: '"geometry from (select geometry,osm_id ,OSM_NAME_COLUMN as name,type from OSM_PREFIX_waterareas) as foo using unique osm_id using srid=OSM_SRID"' + }, + 'display_waterarea_lbl': {0: 0, 6: 1}, + 'waterarea_clr': '"#B3C6D4"', + 'waterarea_ol_clr': '"#B3C6D4"', + 'waterarea_ol_width': 0, + 'waterarea_font': "sc", + 'waterarea_lbl_size': 8, + 'waterarea_lbl_clr': '"#6B94B0"', + 'waterarea_lbl_ol_clr': "255 255 255", + 'waterarea_lbl_ol_width': 2, + 'ocean_clr': '"#B3C6D4"', + + 'display_waterways': { + 0: 0, + 6: 1 + }, + 'waterways_data': { + 0: '"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways_gen0 where type=\'river\') as foo using unique osm_id using srid=OSM_SRID"', + 9: '"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways_gen1 where type=\'river\') as foo using unique osm_id using srid=OSM_SRID"', + 12: '"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_waterways) as foo using unique osm_id using srid=OSM_SRID"' + }, + + 'canal_width': { + 0: 0, + 10: 0.5, + 12: 1, + 14: 2, + 15: 4, + 16: 8, + 17: 16, + 18: 30 + }, + 'display_canal_lbl': {0: 0, 10: 1}, + 'canal_clr': '"#B3C6D4"', + 'canal_font': "sc", + 'canal_lbl_size': 8, + 'canal_lbl_clr': '"#6B94B0"', + 'canal_lbl_ol_clr': "255 255 255", + 'canal_lbl_ol_width': 2, + + 'stream_width': { + 0: 0, + 10: 0.5, + 12: 1, + 14: 2 + }, + 'display_stream_lbl': {0: 0, 12: 1}, + 'stream_clr': '"#B3C6D4"', + 'stream_font': "sc", + 'stream_lbl_size': 8, + 'stream_lbl_clr': '"#6B94B0"', + 'stream_lbl_ol_clr': "255 255 255", + 'stream_lbl_ol_width': 2, + + 'river_width': { + 0: 0, + 6: 0.15, + 7: 0.25, + 8: 0.5, + 9: 1, + 11: 2, + 13: 3, + 15: 4, + 16: 5, + 17: 6, + 18: 7 + }, + 'display_river_lbl': {0: 0, 6: 1}, + 'river_clr': '"#B3C6D4"', + 'river_font': "sc", + 'river_lbl_size': {0: 8, 15: 9, 17: 10}, + 'river_lbl_clr': '"#6B94B0"', + 'river_lbl_ol_clr': "255 255 255", + 'river_lbl_ol_width': 2, + + + ##### landusage ###### + 'display_landusage': { + 0: 0, + 4: 1 + }, + + 'landusage_data': { + 0: '"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen00)\ as foo using unique osm_id using srid=OSM_SRID"', - 6:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen0)\ + 6: '"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen0)\ as foo using unique osm_id using srid=OSM_SRID"', - 9:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen1 \ + 9: '"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen1 \ where type in (\'forest\',\'wood\',\'industrial\',\'commercial\',\'residential\')) as foo using unique osm_id using srid=OSM_SRID"', - 10:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen1 \ + 10: '"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages_gen1 \ where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\ \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\ \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\ \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"', - 12:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages \ + 12: '"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_PREFIX_landusages \ where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\ \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\ \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\ \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"' - }, - - 'industrial_clr': '"#d1d1d1"', - 'industrial_ol_clr': '"#d1d1d1"', - 'industrial_ol_width': 0, - 'display_industrial_lbl' : {0:0, 11:1}, - 'industrial_font': "sc", - 'industrial_lbl_size': 8, - 'industrial_lbl_clr': '0 0 0', - 'industrial_lbl_ol_clr': "255 255 255", - 'industrial_lbl_ol_width': 2, - - 'display_residential': 1, - 'residential_clr': '"#E3DED4"', - 'residential_ol_clr': '"#E3DED4"', - 'residential_ol_width': 0, - 'display_residential_lbl' : {0:0, 12:1}, - 'residential_font': "sc", - 'residential_lbl_size': 8, - 'residential_lbl_clr': '0 0 0', - 'residential_lbl_ol_clr': "255 255 255", - 'residential_lbl_ol_width': 2, - - 'park_clr': '"#DCDCB4"', - 'display_park_lbl' : {0:0, 11:1}, - 'park_font': "sc", - 'park_lbl_size': 8, - 'park_lbl_clr': '0 0 0', - 'park_lbl_ol_clr': "255 255 255", - 'park_lbl_ol_width': 2, - - 'hospital_clr': '"#E6C8C3"', - 'display_hospital_lbl' : {0:0, 12:1}, - 'hospital_font': "sc", - 'hospital_lbl_size': 8, - 'hospital_lbl_clr': '0 0 0', - 'hospital_lbl_ol_clr': "255 255 255", - 'hospital_lbl_ol_width': 2, - - 'education_clr': '"#DED1AB"', - 'display_education_lbl' : {0:0, 12:1}, - 'education_font': "sc", - 'education_lbl_size': 8, - 'education_lbl_clr': '0 0 0', - 'education_lbl_ol_clr': "255 255 255", - 'education_lbl_ol_width': 2, - - 'sports_clr': '"#DED1AB"', - 'display_sports_lbl' : {0:0, 12:1}, - 'sports_font': "sc", - 'sports_lbl_size': 8, - 'sports_lbl_clr': '0 0 0', - 'sports_lbl_ol_clr': "255 255 255", - 'sports_lbl_ol_width': 2, - - 'cemetery_clr': '"#d1d1d1"', - 'display_cemetery_lbl' : {0:0, 12:1}, - 'cemetery_font': "sc", - 'cemetery_lbl_size': 8, - 'cemetery_lbl_clr': '0 0 0', - 'cemetery_lbl_ol_clr': "255 255 255", - 'cemetery_lbl_ol_width': 2, - - 'forest_clr': '"#C2D1B2"', - 'display_forest_lbl' : {0:0, 12:1}, - 'forest_font': "sc", - 'forest_lbl_size': 8, - 'forest_lbl_clr': '0 0 0', - 'forest_lbl_ol_clr': "255 255 255", - 'forest_lbl_ol_width': 2, - - 'display_transport_areas' : {0:0,11:1}, - 'transport_clr': '200 200 200', - 'display_transport_lbl' : {0:0, 12:1}, - 'transport_font': "sc", - 'transport_lbl_size': 8, - 'transport_lbl_clr': '0 0 0', - 'transport_lbl_ol_clr': "255 255 255", - 'transport_lbl_ol_width': 2, - - ###### highways ####### - - 'roads_data': { - 0:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen0 where type in (\'trunk\',\'motorway\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', - 8:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 where type in (\'trunk\',\'motorway\',\'primary\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', - 9:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 where type in (\'secondary\',\'trunk\',\'motorway\',\'primary\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', - 10:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 ) as foo using unique osm_id using srid=OSM_SRID"', - 11:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', - 14:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type||bridge||tunnel as type from OSM_PREFIX_roads order by z_order asc, st_length(geometry) asc) as foo using unique osm_id using srid=OSM_SRID"', - }, - - 'tunnel_opacity': 40, - - 'display_bridges': { #also activates tunnels - 0:0, - 14:1 - }, - 'motorway_bridge_clr':"136 136 136", - 'motorway_bridge_width':{0:0.5,14:1}, - 'trunk_bridge_clr':"136 136 136", - 'trunk_bridge_width':{0:0.5,14:1}, - 'primary_bridge_clr':"136 136 136", - 'primary_bridge_width':{0:0.5,14:1}, - 'secondary_bridge_clr':"136 136 136", - 'secondary_bridge_width':{0:0.5,14:1}, - 'tertiary_bridge_clr':"136 136 136", - 'tertiary_bridge_width':{0:0.5,14:1}, - 'other_bridge_clr':"136 136 136", - 'other_bridge_width':{0:0.5,14:1}, - 'pedestrian_bridge_clr':"136 136 136", - 'pedestrian_bridge_width':{0:0.5,14:1}, - - 'display_highways': { - 0:0, - 5:1 - }, - - 'display_motorways': { - 0:0, - 5:1 - }, - 'display_motorway_links': { - 0:0, - 9:1 - }, - 'display_motorway_outline': 0, - 'motorway_clr': '255 255 255', - 'motorway_width': { - 0:0.5, - 8:1, - 9:2, - 11:3, - 12:4, - 14:5, - 15:6, - 16:8, - 17:9, - 18:10 - }, - 'label_motorways': { - 0:0, - 10:1 - }, - 'motorway_font': "scb", - 'motorway_lbl_size': { - 0:8, - 14:9 - }, - 'motorway_lbl_clr': '"#555555"', - 'motorway_ol_width': { - 0:0.5, - 10:1 - }, - 'motorway_ol_clr': "100 100 100", - - 'display_trunks': { - 0:0, - 5:1 - }, - 'display_trunk_links': { - 0:0, - 9:1 - }, - 'display_trunk_outline': 0, - 'trunk_clr': '255 255 255', - 'trunk_width': { - 0:0.5, - 8:1, - 9:2, - 11:3, - 12:4, - 14:5, - 15:6, - 16:8, - 17:9, - 18:10 - }, - 'label_trunks': { - 0:0, - 10:1 - }, - 'trunk_font': "scb", - 'trunk_lbl_size': { - 0:8, - 14:9 - }, - 'trunk_lbl_clr': '"#555555"', - 'trunk_ol_width': { - 0:0.5, - 10:1 - }, - 'trunk_ol_clr': "100 100 100", - - 'display_primaries': { - 0:0, - 8:1 - }, - 'display_primary_outline': 0, - 'primary_clr': { - 0:'"#aaaaaa"', - 9:'"#ffffff"' - }, - 'primary_width': { - 0:0.5, - 9:0.75, - 10:1, - 11:1.5, - - 12:2, - 13:2.5, - 14:3, - 15:4, - 16:7, - 17:8, - 18:9 - }, - 'label_primaries': { - 0:0, - 13:1 - }, - 'primary_font': "sc", - 'primary_lbl_size': { - 0:0, - 13:8, - 15:9 - }, - 'primary_lbl_clr': { - 0:'"#333333"' - }, - 'primary_lbl_ol_clr': { - 0:'255 255 255' - }, - 'primary_lbl_ol_width': 2, - 'primary_ol_width': 1, - 'primary_ol_clr': "0 0 0", - - 'display_secondaries': { - 0:0, - 9:1 - }, - 'display_secondary_outline': 0, - 'secondary_clr': { - 0:'"#aaaaaa"', - 10:'"#ffffff"' - }, - 'secondary_width': { - 0:0, - 9:0.5, - 10:0.75, - 11:1, - 12:1.5, - 13:2, - 14:2.5, - 15:3.5, - 16:6, - 17:7, - 18:8 - }, - 'label_secondaries': { - 0:0, - 13:1 - }, - 'secondary_font': "sc", - 'secondary_lbl_size': { - 0:0, - 13:8, - 15:9 - }, - 'secondary_lbl_clr': '"#333333"', - 'secondary_lbl_ol_clr': '255 255 255', - 'secondary_lbl_ol_width': 2, - 'secondary_ol_width': 1, - 'secondary_ol_clr': "0 0 0", - - 'display_tertiaries': { - 0:0, - 10:1 - }, - 'display_tertiary_outline': 0, - 'tertiary_clr': { - 0:'"#aaaaaa"', - 13:'"#ffffff"' - }, - 'tertiary_width': { - 0:0, - 10:0.5, - 11:0.75, - 12:1, - 13:1.5, - 14:2, - 15:2.5, - 16:5, - 17:6, - 18:7 - }, - 'label_tertiaries': { - 0:0, - 15:1 - }, - 'tertiary_font': "sc", - 'tertiary_lbl_size': { - 0:0, - 15:8, - }, - 'tertiary_lbl_clr': '"#333333"', - 'tertiary_lbl_ol_clr': '255 255 255', - 'tertiary_lbl_ol_width': 2, - 'tertiary_ol_width': 1, - 'tertiary_ol_clr': "0 0 0", - - 'display_other_roads': { - 0:0, - 11:1 - }, - 'display_other_outline': 0, - 'other_clr': { - 0:'"#aaaaaa"', - 15:'"#ffffff"' - }, - 'other_width': { - 0:0, - 11:0.5, - 12:0.75, - 13:1, - 14:1.5, - 15:2, - 16:4, - 17:5, - 18:6, - }, - 'label_other_roads': { - 0:0, - 15:1 - }, - 'other_font': "sc", - 'other_lbl_size': { - 0:0, - 15:8, - }, - 'other_lbl_clr': '"#333333"', - 'other_lbl_ol_clr': '255 255 255', - 'other_lbl_ol_width': 2, - 'other_ol_width': 1, - 'other_ol_clr': "0 0 0", - - 'display_pedestrian': { - 0:0, - 12:1 - }, - 'display_pedestrian_outline': 0, - 'pedestrian_clr': '"#f2f2ed"', - 'pedestrian_width': { - 0:0, - 11:0.5, - 12:0.75, - 13:1, - 14:1.5, - 15:2, - 16:2.5, - 17:3, - 18:3.5, - }, - 'label_pedestrian': { - 0:0, - 15:1 - }, - 'display_pedestrian_lbl' : {0:0, 12:1}, - 'pedestrian_font': "sc", - 'pedestrian_lbl_size': { - 0:0, - 15:8, - }, - 'pedestrian_lbl_clr': '"#333333"', - 'pedestrian_lbl_ol_clr': '255 255 255', - 'pedestrian_lbl_ol_width': 2, - 'pedestrian_ol_width': 1, - 'pedestrian_ol_clr': "0 0 0", - - 'display_tracks': { - 0:0, - 12:1 - }, - 'display_track_outline': 0, - 'track_clr': { - 0:'"#aaaaaa"', - 15:'"#ffffff"', - }, - 'track_width': { - 0:0, - 11:0.5, - 12:0.75, - 15:1, - }, - 'track_pattern': { - 0: '2 2', - 15: '2 3' - }, - 'label_track': { - 0:0, - 15:1 - }, - 'track_font': "sc", - 'track_lbl_size': { - 0:0, - 15:8, - }, - 'track_lbl_clr': '"#333333"', - 'track_lbl_ol_clr': '255 255 255', - 'track_lbl_ol_width': 2, - 'track_ol_width': 1, - 'track_ol_clr': "0 0 0", - # cycleways - 'display_cycleways': { - 0:0, - 15:1 - }, - 'display_cycleway_outline': 0, - 'cycleway_clr': { - 0:'"#aaaaaa"', - 15:'"#ffffff"', - }, - 'cycleway_width': { - 0:0, - 15:2, - }, - 'cycleway_pattern': '2 4', - 'cycleway_ol_width': 1, - 'cycleway_ol_clr': "0 0 0", - 'display_footways': { - 0:0, - 15:1 - }, - 'display_footway_outline': 0, - 'footway_clr': { - 0:'"#aaaaaa"', - 15:'"#ffffff"', - }, - 'footway_width': { - 0:0, - 15:1, - }, - 'footway_pattern': '2 3', - 'footway_ol_width': 1, - 'footway_ol_clr': "0 0 0", - - ###### railways ######## - 'display_railways': { - 0:0, - 8:1 - }, - 'railway_clr': '"#777777"', - 'railway_width': { - 0:0.5, - 10:1 - }, - 'railway_ol_clr': '"#777777"', - 'railway_ol_width': 0, - 'railway_pattern': '2 2', - 'railway_tunnel_opacity': 40, - 'railways_data': { - 0:'"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways_gen0 where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"', - 6:'"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways_gen1 where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"', - 12:'"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"' - }, - - - ##### borders ###### - 'border_data': '"data/boundaries.shp"', - 'border_epsg': { - 0: '"init=epsg:4326"' - }, - - 'display_border_2': { - 0:1 - }, - 'display_border_2_outer': { - 0:0, - 6:1 - }, - 'border_2_clr': { - 0:'"#CDCBC6"' - }, - 'border_2_width': { - 0:'5' - }, - 'border_2_inner_clr': { - 0:'"#CDCBC6"', - 4:'"#8d8b8d"' - }, - 'border_2_inner_width': { - 0:'0.5', - 7:'1' - }, - 'border_2_inner_pattern': { - 0:'' - }, - # 'display_border_4': { - # 0:0, - # 6:1 - # }, - # 'display_border_4_outer': { - # 0:0, - # 7:1 - # }, - # 'border_4_clr': { - # 0:'"#CDCBC6"' - # }, - # 'border_4_width': { - # 0:'5', - # 8:'6' - # }, - # 'border_4_inner_clr': { - # 0:'"#8d8b8d"' - # }, - # 'border_4_inner_width': { - # 0:'0.5', - # 7:'1' - # }, - # 'border_4_inner_pattern': { - # 0:'', - # 7:'PATTERN 2 2 END' - # }, - # 'display_border_6': { - # 0:0, - # 7:1 - # }, - # 'display_border_6_outer': { - # 0:0, - # 9:1 - # }, - # 'border_6_clr': { - # 0:'"#CDCBC6"' - # }, - # 'border_6_width': { - # 0:'5', - # 13:'7' - # }, - # 'border_6_inner_clr': { - # 0:'"#8d8b8d"' - # }, - # 'border_6_inner_width': { - # 0:'0.5', - # 9:1 - # }, - # 'border_6_inner_pattern': { - # 0:'', - # 9:'PATTERN 2 2 END' - # }, - # 'display_border_8': { - # 0:0, - # 11:1 - # }, - # 'display_border_8_outer': { - # 0:0, - # 13:1 - # }, - # 'border_8_clr': { - # 0:'"#CDCBC6"' - # }, - # 'border_8_width': { - # 0:'5' - # }, - # 'border_8_inner_clr': { - # 0:'"#8d8b8d"' - # }, - # 'border_8_inner_width': { - # 0:'0.5', - # 14:'1' - # }, - # 'border_8_inner_pattern': { - # 0:'', - # 13:'PATTERN 2 2 END' - # }, - - - ###### buildings ###### - 'display_buildings': { - 0: 0, - 15:1 - }, - 'building_clr': '"#bbbbbb"', - 'building_ol_clr': '"#333333"', - 'building_ol_width': { - 0:0, - 16:0.1, - 17:0.5 - }, - 'building_font': "sc", - 'building_lbl_clr': "0 0 0", - 'building_lbl_size': 8, - 'building_lbl_ol_clr': "255 255 255", - 'building_lbl_ol_width': 2, - 'label_buildings': { - 0: 0, - 15: 1 - }, - - - ####### aeroways ####### - 'display_aeroways': { - 0:0, - 10:1 - }, - 'runway_clr': "180 180 180", - 'runway_width': { - 0:1, - 11:2, - 12:3, - 13:5, - 14:7, - 15:11, - 16:15, - 17:19, - 18:23 - }, - 'runway_center_clr': '80 80 80', - 'runway_center_width': { - 0:0, - 15:1 - }, - 'runway_center_pattern' : '2 2', - 'taxiway_width': { - 0:0, - 10:0.2, - 13:1, - 14:1.5, - 15:2, - 16:3, - 17:4, - 18:5 - }, - 'taxiway_clr': "180 180 180", - - ###### places ###### - 'places_data': { - 0: '"geometry from (select * from OSM_PREFIX_places where type in (\'country\',\'continent\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', - 3: '"geometry from (select * from OSM_PREFIX_places where type in (\'country\',\'continent\',\'city\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', - 8: '"geometry from (select * from OSM_PREFIX_places where type in (\'city\',\'town\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', - 11: '"geometry from (select * from OSM_PREFIX_places where type in (\'city\',\'town\',\'village\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', - 13: '"geometry from (select * from OSM_PREFIX_places where OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', - }, - 'display_capitals': 0, - 'display_capital_symbol': { - 0:1, - 10:0 - }, - 'capital_lbl_size': { - 0:0, - 3:8, - 8:9, - 10:10, - 13:11, - 15:12 - - }, - 'capital_size': 6, - 'capital_fg_size': 2, - 'capital_ol_clr': "0 0 0", - 'capital_fg_clr': "0 0 0", - 'capital_clr': "255 0 0", - 'capital_font': "sc", - 'capital_lbl_clr': "0 0 0", - 'capital_lbl_ol_clr': "255 255 255", - 'capital_lbl_ol_width':2, - - 'display_continents': { - 0:1, - 3:0 - }, - 'continent_lbl_size': 8, - 'continent_lbl_clr': "100 100 100", - 'continent_lbl_ol_width': "1", - 'continent_lbl_ol_clr': "-1 -1 -1", - 'continent_font': "scb", - - 'display_countries': { - 0:0, - 2:1, - 8:0 - }, - 'country_lbl_size': 8, - 'country_lbl_clr': "100 100 100", - 'country_lbl_ol_width': 2, - 'country_lbl_ol_clr': "-1 -1 -1", - 'country_font': "scb", - - 'display_cities': { - 0:0, - 3:1, - 16:0 - }, - 'display_city_symbol': { - 0:1, - 10:0 - }, - 'city_lbl_size': { - 0:0, - 3:8, - 8:9, - 10:10, - 11:11, - 13:12, - 15:13 - }, - 'city_size': { - 0:5, - 8:6 - }, - 'city_ol_clr': "0 0 0", - 'city_clr': { - 0:"200 200 200", - 8:"255 255 255" - }, - 'city_font': "sc", - 'city_lbl_clr': { - 0:"68 68 68", - 8:'0 0 0' - }, - 'city_lbl_ol_clr': "255 255 255", - 'city_lbl_ol_width': { - 0:2, - 10:3 - }, - - 'display_towns': { - 0:0, - 8:1 - }, - 'display_town_symbol': { - 0:1, - 12:0 - }, - 'town_font': "sc", - 'town_lbl_clr': { - 0:'"#666666"', - 11:'0 0 0' - }, - 'town_lbl_ol_clr': "255 255 255", - 'town_lbl_ol_width':2, - 'town_lbl_size': { - 0:0, - 8:8, - 10:9, - 12:10, - 15:11 - }, - 'town_size': { - 0:0, - 8:3, - 10:5 - }, - 'town_ol_clr': "0 0 0", - 'town_clr': "200 200 200", - - 'display_suburbs': { - 0:0, - 13:1 - }, - 'suburb_font': "sc", - 'suburb_lbl_clr': { - 0:'"#444444"', - 15:'0 0 0' - }, - 'suburb_lbl_ol_clr': "255 255 255", - 'suburb_lbl_ol_width': 2, - 'display_suburb_symbol': 0, - 'suburb_lbl_size': { - 0:0, - 13:8, - 15:9, - }, - 'suburb_size': 5, - 'suburb_ol_clr': "0 0 0", - 'suburb_clr': "200 200 200", - - 'display_villages': { - 0:0, - 11:1 - }, - 'display_village_symbol': { - 0:1, - 14:0 - }, - 'village_lbl_size': { - 0:0, - 10:8, - 13:9, - 15:10 - }, - 'village_size': { - 0:0, - 11:3, - 13:4 - }, - 'village_ol_clr': "0 0 0", - 'village_clr': "200 200 200", - 'village_font': "sc", - 'village_lbl_clr': { - 0:'"#444444"', - 13:'0 0 0' - }, - 'village_lbl_ol_clr': "255 255 255", - 'village_lbl_ol_width': 2, - - 'display_hamlets': { - 0:0, - 13:1 - }, - 'hamlet_font': "sc", - 'hamlet_lbl_clr': { - 0:'"#444444"', - 15:'0 0 0' - }, - 'hamlet_lbl_ol_clr': "255 255 255", - 'hamlet_lbl_ol_width': 2, - 'display_hamlet_symbol': 0, - 'hamlet_lbl_size': { - 0:0, - 13:8, - 15:9, - }, - 'hamlet_size': 5, - 'hamlet_ol_clr': "0 0 0", - 'hamlet_clr': "200 200 200", - - 'display_localities': { - 0:0, - 13:1 - }, - 'locality_font': "sc", - 'locality_lbl_clr': { - 0:'"#444444"', - 15:'0 0 0' - }, - 'locality_lbl_ol_clr': "255 255 255", - 'locality_lbl_ol_width': 2, - 'display_locality_symbol': 0, - 'locality_lbl_size': { - 0:0, - 13:8, - 15:9, - }, - 'locality_size': 5, - 'locality_ol_clr': "0 0 0", - 'locality_clr': "200 200 200", + }, + + 'industrial_clr': '"#d1d1d1"', + 'industrial_ol_clr': '"#d1d1d1"', + 'industrial_ol_width': 0, + 'display_industrial_lbl': {0: 0, 11: 1}, + 'industrial_font': "sc", + 'industrial_lbl_size': 8, + 'industrial_lbl_clr': '0 0 0', + 'industrial_lbl_ol_clr': "255 255 255", + 'industrial_lbl_ol_width': 2, + + 'display_residential': 1, + 'residential_clr': '"#E3DED4"', + 'residential_ol_clr': '"#E3DED4"', + 'residential_ol_width': 0, + 'display_residential_lbl': {0: 0, 12: 1}, + 'residential_font': "sc", + 'residential_lbl_size': 8, + 'residential_lbl_clr': '0 0 0', + 'residential_lbl_ol_clr': "255 255 255", + 'residential_lbl_ol_width': 2, + + 'park_clr': '"#DCDCB4"', + 'display_park_lbl': {0: 0, 11: 1}, + 'park_font': "sc", + 'park_lbl_size': 8, + 'park_lbl_clr': '0 0 0', + 'park_lbl_ol_clr': "255 255 255", + 'park_lbl_ol_width': 2, + + 'hospital_clr': '"#E6C8C3"', + 'display_hospital_lbl': {0: 0, 12: 1}, + 'hospital_font': "sc", + 'hospital_lbl_size': 8, + 'hospital_lbl_clr': '0 0 0', + 'hospital_lbl_ol_clr': "255 255 255", + 'hospital_lbl_ol_width': 2, + + 'education_clr': '"#DED1AB"', + 'display_education_lbl': {0: 0, 12: 1}, + 'education_font': "sc", + 'education_lbl_size': 8, + 'education_lbl_clr': '0 0 0', + 'education_lbl_ol_clr': "255 255 255", + 'education_lbl_ol_width': 2, + + 'sports_clr': '"#DED1AB"', + 'display_sports_lbl': {0: 0, 12: 1}, + 'sports_font': "sc", + 'sports_lbl_size': 8, + 'sports_lbl_clr': '0 0 0', + 'sports_lbl_ol_clr': "255 255 255", + 'sports_lbl_ol_width': 2, + + 'cemetery_clr': '"#d1d1d1"', + 'display_cemetery_lbl': {0: 0, 12: 1}, + 'cemetery_font': "sc", + 'cemetery_lbl_size': 8, + 'cemetery_lbl_clr': '0 0 0', + 'cemetery_lbl_ol_clr': "255 255 255", + 'cemetery_lbl_ol_width': 2, + + 'forest_clr': '"#C2D1B2"', + 'display_forest_lbl': {0: 0, 12: 1}, + 'forest_font': "sc", + 'forest_lbl_size': 8, + 'forest_lbl_clr': '0 0 0', + 'forest_lbl_ol_clr': "255 255 255", + 'forest_lbl_ol_width': 2, + + 'display_transport_areas': {0: 0, 11: 1}, + 'transport_clr': '200 200 200', + 'display_transport_lbl': {0: 0, 12: 1}, + 'transport_font': "sc", + 'transport_lbl_size': 8, + 'transport_lbl_clr': '0 0 0', + 'transport_lbl_ol_clr': "255 255 255", + 'transport_lbl_ol_width': 2, + + ###### highways ####### + + 'roads_data': { + 0: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen0 where type in (\'trunk\',\'motorway\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', + 8: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 where type in (\'trunk\',\'motorway\',\'primary\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', + 9: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 where type in (\'secondary\',\'trunk\',\'motorway\',\'primary\') order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', + 10: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads_gen1 ) as foo using unique osm_id using srid=OSM_SRID"', + 11: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_PREFIX_roads order by z_order asc) as foo using unique osm_id using srid=OSM_SRID"', + 14: '"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type||bridge||tunnel as type from OSM_PREFIX_roads order by z_order asc, st_length(geometry) asc) as foo using unique osm_id using srid=OSM_SRID"', + }, + + 'tunnel_opacity': 40, + + 'display_bridges': { # also activates tunnels + 0: 0, + 14: 1 + }, + 'motorway_bridge_clr': "136 136 136", + 'motorway_bridge_width': {0: 0.5, 14: 1}, + 'trunk_bridge_clr': "136 136 136", + 'trunk_bridge_width': {0: 0.5, 14: 1}, + 'primary_bridge_clr': "136 136 136", + 'primary_bridge_width': {0: 0.5, 14: 1}, + 'secondary_bridge_clr': "136 136 136", + 'secondary_bridge_width': {0: 0.5, 14: 1}, + 'tertiary_bridge_clr': "136 136 136", + 'tertiary_bridge_width': {0: 0.5, 14: 1}, + 'other_bridge_clr': "136 136 136", + 'other_bridge_width': {0: 0.5, 14: 1}, + 'pedestrian_bridge_clr': "136 136 136", + 'pedestrian_bridge_width': {0: 0.5, 14: 1}, + + 'display_highways': { + 0: 0, + 5: 1 + }, + + 'display_motorways': { + 0: 0, + 5: 1 + }, + 'display_motorway_links': { + 0: 0, + 9: 1 + }, + 'display_motorway_outline': 0, + 'motorway_clr': '255 255 255', + 'motorway_width': { + 0: 0.5, + 8: 1, + 9: 2, + 11: 3, + 12: 4, + 14: 5, + 15: 6, + 16: 8, + 17: 9, + 18: 10 + }, + 'label_motorways': { + 0: 0, + 10: 1 + }, + 'motorway_font': "scb", + 'motorway_lbl_size': { + 0: 8, + 14: 9 + }, + 'motorway_lbl_clr': '"#555555"', + 'motorway_ol_width': { + 0: 0.5, + 10: 1 + }, + 'motorway_ol_clr': "100 100 100", + + 'display_trunks': { + 0: 0, + 5: 1 + }, + 'display_trunk_links': { + 0: 0, + 9: 1 + }, + 'display_trunk_outline': 0, + 'trunk_clr': '255 255 255', + 'trunk_width': { + 0: 0.5, + 8: 1, + 9: 2, + 11: 3, + 12: 4, + 14: 5, + 15: 6, + 16: 8, + 17: 9, + 18: 10 + }, + 'label_trunks': { + 0: 0, + 10: 1 + }, + 'trunk_font': "scb", + 'trunk_lbl_size': { + 0: 8, + 14: 9 + }, + 'trunk_lbl_clr': '"#555555"', + 'trunk_ol_width': { + 0: 0.5, + 10: 1 + }, + 'trunk_ol_clr': "100 100 100", + + 'display_primaries': { + 0: 0, + 8: 1 + }, + 'display_primary_outline': 0, + 'primary_clr': { + 0: '"#aaaaaa"', + 9: '"#ffffff"' + }, + 'primary_width': { + 0: 0.5, + 9: 0.75, + 10: 1, + 11: 1.5, + + 12: 2, + 13: 2.5, + 14: 3, + 15: 4, + 16: 7, + 17: 8, + 18: 9 + }, + 'label_primaries': { + 0: 0, + 13: 1 + }, + 'primary_font': "sc", + 'primary_lbl_size': { + 0: 0, + 13: 8, + 15: 9 + }, + 'primary_lbl_clr': { + 0: '"#333333"' + }, + 'primary_lbl_ol_clr': { + 0: '255 255 255' + }, + 'primary_lbl_ol_width': 2, + 'primary_ol_width': 1, + 'primary_ol_clr': "0 0 0", + + 'display_secondaries': { + 0: 0, + 9: 1 + }, + 'display_secondary_outline': 0, + 'secondary_clr': { + 0: '"#aaaaaa"', + 10: '"#ffffff"' + }, + 'secondary_width': { + 0: 0, + 9: 0.5, + 10: 0.75, + 11: 1, + 12: 1.5, + 13: 2, + 14: 2.5, + 15: 3.5, + 16: 6, + 17: 7, + 18: 8 + }, + 'label_secondaries': { + 0: 0, + 13: 1 + }, + 'secondary_font': "sc", + 'secondary_lbl_size': { + 0: 0, + 13: 8, + 15: 9 + }, + 'secondary_lbl_clr': '"#333333"', + 'secondary_lbl_ol_clr': '255 255 255', + 'secondary_lbl_ol_width': 2, + 'secondary_ol_width': 1, + 'secondary_ol_clr': "0 0 0", + + 'display_tertiaries': { + 0: 0, + 10: 1 + }, + 'display_tertiary_outline': 0, + 'tertiary_clr': { + 0: '"#aaaaaa"', + 13: '"#ffffff"' + }, + 'tertiary_width': { + 0: 0, + 10: 0.5, + 11: 0.75, + 12: 1, + 13: 1.5, + 14: 2, + 15: 2.5, + 16: 5, + 17: 6, + 18: 7 + }, + 'label_tertiaries': { + 0: 0, + 15: 1 + }, + 'tertiary_font': "sc", + 'tertiary_lbl_size': { + 0: 0, + 15: 8, + }, + 'tertiary_lbl_clr': '"#333333"', + 'tertiary_lbl_ol_clr': '255 255 255', + 'tertiary_lbl_ol_width': 2, + 'tertiary_ol_width': 1, + 'tertiary_ol_clr': "0 0 0", + + 'display_other_roads': { + 0: 0, + 11: 1 + }, + 'display_other_outline': 0, + 'other_clr': { + 0: '"#aaaaaa"', + 15: '"#ffffff"' + }, + 'other_width': { + 0: 0, + 11: 0.5, + 12: 0.75, + 13: 1, + 14: 1.5, + 15: 2, + 16: 4, + 17: 5, + 18: 6, + }, + 'label_other_roads': { + 0: 0, + 15: 1 + }, + 'other_font': "sc", + 'other_lbl_size': { + 0: 0, + 15: 8, + }, + 'other_lbl_clr': '"#333333"', + 'other_lbl_ol_clr': '255 255 255', + 'other_lbl_ol_width': 2, + 'other_ol_width': 1, + 'other_ol_clr': "0 0 0", + + 'display_pedestrian': { + 0: 0, + 12: 1 + }, + 'display_pedestrian_outline': 0, + 'pedestrian_clr': '"#f2f2ed"', + 'pedestrian_width': { + 0: 0, + 11: 0.5, + 12: 0.75, + 13: 1, + 14: 1.5, + 15: 2, + 16: 2.5, + 17: 3, + 18: 3.5, + }, + 'label_pedestrian': { + 0: 0, + 15: 1 + }, + 'display_pedestrian_lbl': {0: 0, 12: 1}, + 'pedestrian_font': "sc", + 'pedestrian_lbl_size': { + 0: 0, + 15: 8, + }, + 'pedestrian_lbl_clr': '"#333333"', + 'pedestrian_lbl_ol_clr': '255 255 255', + 'pedestrian_lbl_ol_width': 2, + 'pedestrian_ol_width': 1, + 'pedestrian_ol_clr': "0 0 0", + + 'display_tracks': { + 0: 0, + 12: 1 + }, + 'display_track_outline': 0, + 'track_clr': { + 0: '"#aaaaaa"', + 15: '"#ffffff"', + }, + 'track_width': { + 0: 0, + 11: 0.5, + 12: 0.75, + 15: 1, + }, + 'track_pattern': { + 0: '2 2', + 15: '2 3' + }, + 'label_track': { + 0: 0, + 15: 1 + }, + 'track_font': "sc", + 'track_lbl_size': { + 0: 0, + 15: 8, + }, + 'track_lbl_clr': '"#333333"', + 'track_lbl_ol_clr': '255 255 255', + 'track_lbl_ol_width': 2, + 'track_ol_width': 1, + 'track_ol_clr': "0 0 0", + # cycleways + 'display_cycleways': { + 0: 0, + 15: 1 + }, + 'display_cycleway_outline': 0, + 'cycleway_clr': { + 0: '"#aaaaaa"', + 15: '"#ffffff"', + }, + 'cycleway_width': { + 0: 0, + 15: 2, + }, + 'cycleway_pattern': '2 4', + 'cycleway_ol_width': 1, + 'cycleway_ol_clr': "0 0 0", + 'display_footways': { + 0: 0, + 15: 1 + }, + 'display_footway_outline': 0, + 'footway_clr': { + 0: '"#aaaaaa"', + 15: '"#ffffff"', + }, + 'footway_width': { + 0: 0, + 15: 1, + }, + 'footway_pattern': '2 3', + 'footway_ol_width': 1, + 'footway_ol_clr': "0 0 0", + + ###### railways ######## + 'display_railways': { + 0: 0, + 8: 1 + }, + 'railway_clr': '"#777777"', + 'railway_width': { + 0: 0.5, + 10: 1 + }, + 'railway_ol_clr': '"#777777"', + 'railway_ol_width': 0, + 'railway_pattern': '2 2', + 'railway_tunnel_opacity': 40, + 'railways_data': { + 0: '"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways_gen0 where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"', + 6: '"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways_gen1 where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"', + 12: '"geometry from (select geometry, osm_id, tunnel from OSM_PREFIX_railways where type=\'rail\') as foo using unique osm_id using srid=OSM_SRID"' + }, + + + ##### borders ###### + 'border_data': '"data/boundaries.shp"', + 'border_epsg': { + 0: '"init=epsg:4326"' + }, + + 'display_border_2': { + 0: 1 + }, + 'display_border_2_outer': { + 0: 0, + 6: 1 + }, + 'border_2_clr': { + 0: '"#CDCBC6"' + }, + 'border_2_width': { + 0: '5' + }, + 'border_2_inner_clr': { + 0: '"#CDCBC6"', + 4: '"#8d8b8d"' + }, + 'border_2_inner_width': { + 0: '0.5', + 7: '1' + }, + 'border_2_inner_pattern': { + 0: '' + }, + # 'display_border_4': { + # 0:0, + # 6:1 + # }, + # 'display_border_4_outer': { + # 0:0, + # 7:1 + # }, + # 'border_4_clr': { + # 0:'"#CDCBC6"' + # }, + # 'border_4_width': { + # 0:'5', + # 8:'6' + # }, + # 'border_4_inner_clr': { + # 0:'"#8d8b8d"' + # }, + # 'border_4_inner_width': { + # 0:'0.5', + # 7:'1' + # }, + # 'border_4_inner_pattern': { + # 0:'', + # 7:'PATTERN 2 2 END' + # }, + # 'display_border_6': { + # 0:0, + # 7:1 + # }, + # 'display_border_6_outer': { + # 0:0, + # 9:1 + # }, + # 'border_6_clr': { + # 0:'"#CDCBC6"' + # }, + # 'border_6_width': { + # 0:'5', + # 13:'7' + # }, + # 'border_6_inner_clr': { + # 0:'"#8d8b8d"' + # }, + # 'border_6_inner_width': { + # 0:'0.5', + # 9:1 + # }, + # 'border_6_inner_pattern': { + # 0:'', + # 9:'PATTERN 2 2 END' + # }, + # 'display_border_8': { + # 0:0, + # 11:1 + # }, + # 'display_border_8_outer': { + # 0:0, + # 13:1 + # }, + # 'border_8_clr': { + # 0:'"#CDCBC6"' + # }, + # 'border_8_width': { + # 0:'5' + # }, + # 'border_8_inner_clr': { + # 0:'"#8d8b8d"' + # }, + # 'border_8_inner_width': { + # 0:'0.5', + # 14:'1' + # }, + # 'border_8_inner_pattern': { + # 0:'', + # 13:'PATTERN 2 2 END' + # }, + + + ###### buildings ###### + 'display_buildings': { + 0: 0, + 15: 1 + }, + 'building_clr': '"#bbbbbb"', + 'building_ol_clr': '"#333333"', + 'building_ol_width': { + 0: 0, + 16: 0.1, + 17: 0.5 + }, + 'building_font': "sc", + 'building_lbl_clr': "0 0 0", + 'building_lbl_size': 8, + 'building_lbl_ol_clr': "255 255 255", + 'building_lbl_ol_width': 2, + 'label_buildings': { + 0: 0, + 15: 1 + }, + + + ####### aeroways ####### + 'display_aeroways': { + 0: 0, + 10: 1 + }, + 'runway_clr': "180 180 180", + 'runway_width': { + 0: 1, + 11: 2, + 12: 3, + 13: 5, + 14: 7, + 15: 11, + 16: 15, + 17: 19, + 18: 23 + }, + 'runway_center_clr': '80 80 80', + 'runway_center_width': { + 0: 0, + 15: 1 + }, + 'runway_center_pattern': '2 2', + 'taxiway_width': { + 0: 0, + 10: 0.2, + 13: 1, + 14: 1.5, + 15: 2, + 16: 3, + 17: 4, + 18: 5 + }, + 'taxiway_clr': "180 180 180", + + ###### places ###### + 'places_data': { + 0: '"geometry from (select * from OSM_PREFIX_places where type in (\'country\',\'continent\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', + 3: '"geometry from (select * from OSM_PREFIX_places where type in (\'country\',\'continent\',\'city\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', + 8: '"geometry from (select * from OSM_PREFIX_places where type in (\'city\',\'town\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', + 11: '"geometry from (select * from OSM_PREFIX_places where type in (\'city\',\'town\',\'village\') and OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', + 13: '"geometry from (select * from OSM_PREFIX_places where OSM_NAME_COLUMN is not NULL order by population asc nulls first) as foo using unique osm_id using srid=OSM_SRID"', + }, + 'display_capitals': 0, + 'display_capital_symbol': { + 0: 1, + 10: 0 + }, + 'capital_lbl_size': { + 0: 0, + 3: 8, + 8: 9, + 10: 10, + 13: 11, + 15: 12 + + }, + 'capital_size': 6, + 'capital_fg_size': 2, + 'capital_ol_clr': "0 0 0", + 'capital_fg_clr': "0 0 0", + 'capital_clr': "255 0 0", + 'capital_font': "sc", + 'capital_lbl_clr': "0 0 0", + 'capital_lbl_ol_clr': "255 255 255", + 'capital_lbl_ol_width': 2, + + 'display_continents': { + 0: 1, + 3: 0 + }, + 'continent_lbl_size': 8, + 'continent_lbl_clr': "100 100 100", + 'continent_lbl_ol_width': "1", + 'continent_lbl_ol_clr': "-1 -1 -1", + 'continent_font': "scb", + + 'display_countries': { + 0: 0, + 2: 1, + 8: 0 + }, + 'country_lbl_size': 8, + 'country_lbl_clr': "100 100 100", + 'country_lbl_ol_width': 2, + 'country_lbl_ol_clr': "-1 -1 -1", + 'country_font': "scb", + + 'display_cities': { + 0: 0, + 3: 1, + 16: 0 + }, + 'display_city_symbol': { + 0: 1, + 10: 0 + }, + 'city_lbl_size': { + 0: 0, + 3: 8, + 8: 9, + 10: 10, + 11: 11, + 13: 12, + 15: 13 + }, + 'city_size': { + 0: 5, + 8: 6 + }, + 'city_ol_clr': "0 0 0", + 'city_clr': { + 0: "200 200 200", + 8: "255 255 255" + }, + 'city_font': "sc", + 'city_lbl_clr': { + 0: "68 68 68", + 8: '0 0 0' + }, + 'city_lbl_ol_clr': "255 255 255", + 'city_lbl_ol_width': { + 0: 2, + 10: 3 + }, + + 'display_towns': { + 0: 0, + 8: 1 + }, + 'display_town_symbol': { + 0: 1, + 12: 0 + }, + 'town_font': "sc", + 'town_lbl_clr': { + 0: '"#666666"', + 11: '0 0 0' + }, + 'town_lbl_ol_clr': "255 255 255", + 'town_lbl_ol_width': 2, + 'town_lbl_size': { + 0: 0, + 8: 8, + 10: 9, + 12: 10, + 15: 11 + }, + 'town_size': { + 0: 0, + 8: 3, + 10: 5 + }, + 'town_ol_clr': "0 0 0", + 'town_clr': "200 200 200", + + 'display_suburbs': { + 0: 0, + 13: 1 + }, + 'suburb_font': "sc", + 'suburb_lbl_clr': { + 0: '"#444444"', + 15: '0 0 0' + }, + 'suburb_lbl_ol_clr': "255 255 255", + 'suburb_lbl_ol_width': 2, + 'display_suburb_symbol': 0, + 'suburb_lbl_size': { + 0: 0, + 13: 8, + 15: 9, + }, + 'suburb_size': 5, + 'suburb_ol_clr': "0 0 0", + 'suburb_clr': "200 200 200", + + 'display_villages': { + 0: 0, + 11: 1 + }, + 'display_village_symbol': { + 0: 1, + 14: 0 + }, + 'village_lbl_size': { + 0: 0, + 10: 8, + 13: 9, + 15: 10 + }, + 'village_size': { + 0: 0, + 11: 3, + 13: 4 + }, + 'village_ol_clr': "0 0 0", + 'village_clr': "200 200 200", + 'village_font': "sc", + 'village_lbl_clr': { + 0: '"#444444"', + 13: '0 0 0' + }, + 'village_lbl_ol_clr': "255 255 255", + 'village_lbl_ol_width': 2, + + 'display_hamlets': { + 0: 0, + 13: 1 + }, + 'hamlet_font': "sc", + 'hamlet_lbl_clr': { + 0: '"#444444"', + 15: '0 0 0' + }, + 'hamlet_lbl_ol_clr': "255 255 255", + 'hamlet_lbl_ol_width': 2, + 'display_hamlet_symbol': 0, + 'hamlet_lbl_size': { + 0: 0, + 13: 8, + 15: 9, + }, + 'hamlet_size': 5, + 'hamlet_ol_clr': "0 0 0", + 'hamlet_clr': "200 200 200", + + 'display_localities': { + 0: 0, + 13: 1 + }, + 'locality_font': "sc", + 'locality_lbl_clr': { + 0: '"#444444"', + 15: '0 0 0' + }, + 'locality_lbl_ol_clr': "255 255 255", + 'locality_lbl_ol_width': 2, + 'display_locality_symbol': 0, + 'locality_lbl_size': { + 0: 0, + 13: 8, + 15: 9, + }, + 'locality_size': 5, + 'locality_ol_clr': "0 0 0", + 'locality_clr': "200 200 200", } styles = { - 'default': {}, - 'outlined':{ - 'display_motorway_outline': { - 0:0, - 7:1 - }, - 'motorway_ol_width': { - 0:0.5, - 10:1 - }, - 'motorway_ol_clr': '0 0 0', - 'display_trunk_outline': { - 0:0, - 7:1, - }, - 'trunk_ol_width': { - 0:0.5, - 10:1 - }, - 'trunk_ol_clr': '0 0 0', - 'display_primary_outline': { - 0:0, - 9:1 - }, - 'primary_ol_width': { - 0:0.5, - 11:1 - }, - 'primary_ol_clr': '0 0 0', - 'display_secondary_outline': { - 0:0, - 10:1 - }, - 'secondary_ol_width': { - 0:0.5, - 13:1 - }, - 'secondary_ol_clr': '0 0 0', - 'display_tertiary_outline': { - 0:0, - 12:1 - }, - 'tertiary_ol_width': { - 0:0.5, - 15:1 - }, - 'tertiary_ol_clr': '0 0 0', - 'display_other_outline': { - 0:0, - 14:1 - }, - 'other_width': { - 0:0, - 11:0.5, - 14:2.5, - 15:4, - 16:6, - }, - 'other_ol_width': { - 0:0.5, - 17:1 - }, - 'other_ol_clr': '0 0 0', - 'display_pedestrian_outline': { - 0:0, - 13:1 - }, - 'pedestrian_ol_width': { - 0:0.5, - 17:1 - }, - 'pedestrian_ol_clr': '0 0 0', - }, - 'centerlined': { - 'display_motorway_centerline' : { - 0:0, - 10:1 - }, - 'motorway_centerline_clr': { - 0: '255 253 139' - }, - 'motorway_centerline_width': { - 0:1, - 12:1.5, - 14:2 - }, - 'display_trunk_centerline' : { - 0:0, - 10:1 - }, - 'trunk_centerline_clr': { - 0: '255 255 255' - }, - 'trunk_centerline_width': { - 0:1, - 12:1.5, - 14:2 - } - }, - 'google':{ - 'motorway_clr': "253 146 58", - 'trunk_clr': "255 195 69", - 'primary_clr': { - 0:'193 181 157', - 9:"255 253 139" - }, - 'secondary_clr': { - 0:'193 181 157', - 10:"255 253 139" - }, - 'tertiary_clr': { - 0:'193 181 157', - 12:"255 253 139" - }, - 'other_clr': { - 0:'193 181 157', - 14:"255 255 255" - }, - 'pedestrian_clr': '250 250 245', - 'forest_clr': "203 216 195", - 'industrial_clr': "209 208 205", - 'education_clr': "222 210 172", - 'hospital_clr': "229 198 195", - 'residential_clr': "242 239 233", - 'land_clr': "242 239 233", - 'park_clr': '181 210 156', - 'ocean_clr': '153 179 204', - 'waterarea_clr': '153 179 204', - 'river_clr': '153 179 204', - 'stream_clr': '153 179 204', - 'canal_clr': '153 179 204', - - 'motorway_ol_clr': '186 110 39', - 'trunk_ol_clr': '221 159 17', - 'primary_ol_clr': '193 181 157', - 'secondary_ol_clr': '193 181 157', - 'tertiary_ol_clr': '193 181 157', - 'other_ol_clr': '193 181 157', - 'pedestrian_ol_clr': '193 181 157', - 'display_buildings':1 - }, - 'michelin':{ - 'motorway_clr': '228 24 24', - 'trunk_clr': '228 24 24', - 'primary_clr': { - 0:'"#aaaaaa"', - 9:'228 24 24' - }, - 'secondary_clr': { - 0:'"#aaaaaa"', - 10:'252 241 20' - }, - 'tertiary_clr': { - 0:'"#aaaaaa"', - 12:'252 241 20' - }, - 'other_clr': { - 0:'"#aaaaaa"', - 13:'"#ffffff"' - }, - 'display_primary_outline': { - 0:0, - 11:1 - }, - 'display_secondary_outline': { - 0:0, - 12:1 - }, - 'display_tertiary_outline': { - 0:0, - 13:1 - }, - 'display_other_outline': { - 0:0, - 14:1 - }, - - 'motorway_ol_width': 0.5, - 'trunk_ol_width': 0.5, - 'primary_ol_width': 0.2, - 'secondary_ol_width': 0.2, - 'tertiary_ol_width': 0.2, - 'other_ol_width': 0.2, - - 'pedestrian_clr': '"#fafaf5"', - 'forest_clr': '188 220 180', - 'industrial_clr': '"#ebe5d9"', - 'education_clr': '"#ded1ab"', - 'hospital_clr': '"#e6c8c3"', - 'residential_clr': '255 234 206', - 'land_clr': '"#ffffff"', - 'park_clr': '"#dcdcb4"', - 'ocean_clr': '172 220 244', - 'waterarea_clr': '172 220 244', - 'river_clr': '172 220 244', - 'stream_clr': '172 220 244', - 'canal_clr': '172 220 244', - - 'motorway_ol_clr': '0 0 0', - 'trunk_ol_clr': '0 0 0', - 'primary_ol_clr': '0 0 0', - 'secondary_ol_clr': '0 0 0', - 'tertiary_ol_clr': '0 0 0', - 'other_ol_clr': '0 0 0', - 'pedestrian_ol_clr': '0 0 0', - 'footway_clr': '"#7f7f7f"' - }, - 'bing':{ - 'motorway_clr': '"#BAC3A8"', - 'trunk_clr': '"#F2935D"', - 'primary_clr': { - 0:'"#aaaaaa"', - 9:'"#FEF483"' - }, - 'secondary_clr': { - 0:'"#aaaaaa"', - 10:'"#FCFCCC"' - }, - 'tertiary_clr': { - 0:'"#aaaaaa"', - 12:'"#ffffff"' - }, - 'other_clr': { - 0:'"#aaaaaa"', - 13:'"#ffffff"' - }, - 'pedestrian_clr': '"#fafaf5"', - 'forest_clr': '"#dcdcb4"', - 'industrial_clr': '"#ebe5d9"', - 'education_clr': '"#ded1ab"', - 'hospital_clr': '"#e6c8c3"', - 'residential_clr': '"#f6f1e6"', - 'land_clr': '"#f6f1e6"', - 'park_clr': '"#dcdcb4"', - 'ocean_clr': '"#b3c6d4"', - 'waterarea_clr': '"#b3c6d4"', - 'river_clr': '"#b3c6d4"', - 'stream_clr': '"#b3c6d4"', - 'canal_clr': '"#b3c6d4"', - - 'motorway_ol_clr': '"#39780f"', - 'trunk_ol_clr': '"#bf6219"', - 'primary_ol_clr': '"#d17f40"', - 'secondary_ol_clr': '"#bbb8b4"', - 'tertiary_ol_clr': '"#b7ac9a"', - 'other_ol_clr': '"#b7ac9a"', - 'pedestrian_ol_clr': '193 181 157', - 'footway_clr': '"#7f7f7f"' - }, - 'osm2pgsql': { - 'waterarea_data': { - 0: '"way from (select way,osm_id , OSM_NAME_COLUMN as name, waterway as type from OSM_PREFIX_polygon where \\\"natural\\\"=\'water\' or landuse=\'basin\' or landuse=\'reservoir\' or waterway=\'riverbank\') as foo using unique osm_id using srid=OSM_SRID"' - }, - 'waterways_data': { - 0: '"way from (select way,waterway as type,osm_id, OSM_NAME_COLUMN as name from OSM_PREFIX_line where waterway IN (\'river\', \'stream\', \'canal\')) as foo using unique osm_id using srid=OSM_SRID"' - }, - 'places_data': { - 0: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'country\',\'continent\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', - 3: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'country\',\'continent\',\'city\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', - 8: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'city\',\'town\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', - 11: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'city\',\'town\',\'village\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', - 13: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place is not NULL and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', - }, - 'railways_data': { - 0:'"way from (select way, osm_id, tunnel, railway as type from OSM_PREFIX_line where railway=\'rail\') as foo using unique osm_id using srid=OSM_SRID"' - }, - 'landusage_data': { - 0:'"way from (select way, osm_id, name, type from (select way, st_area(way) as area, osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ + 'default': {}, + 'outlined': { + 'display_motorway_outline': { + 0: 0, + 7: 1 + }, + 'motorway_ol_width': { + 0: 0.5, + 10: 1 + }, + 'motorway_ol_clr': '0 0 0', + 'display_trunk_outline': { + 0: 0, + 7: 1, + }, + 'trunk_ol_width': { + 0: 0.5, + 10: 1 + }, + 'trunk_ol_clr': '0 0 0', + 'display_primary_outline': { + 0: 0, + 9: 1 + }, + 'primary_ol_width': { + 0: 0.5, + 11: 1 + }, + 'primary_ol_clr': '0 0 0', + 'display_secondary_outline': { + 0: 0, + 10: 1 + }, + 'secondary_ol_width': { + 0: 0.5, + 13: 1 + }, + 'secondary_ol_clr': '0 0 0', + 'display_tertiary_outline': { + 0: 0, + 12: 1 + }, + 'tertiary_ol_width': { + 0: 0.5, + 15: 1 + }, + 'tertiary_ol_clr': '0 0 0', + 'display_other_outline': { + 0: 0, + 14: 1 + }, + 'other_width': { + 0: 0, + 11: 0.5, + 14: 2.5, + 15: 4, + 16: 6, + }, + 'other_ol_width': { + 0: 0.5, + 17: 1 + }, + 'other_ol_clr': '0 0 0', + 'display_pedestrian_outline': { + 0: 0, + 13: 1 + }, + 'pedestrian_ol_width': { + 0: 0.5, + 17: 1 + }, + 'pedestrian_ol_clr': '0 0 0', + }, + 'centerlined': { + 'display_motorway_centerline': { + 0: 0, + 10: 1 + }, + 'motorway_centerline_clr': { + 0: '255 253 139' + }, + 'motorway_centerline_width': { + 0: 1, + 12: 1.5, + 14: 2 + }, + 'display_trunk_centerline': { + 0: 0, + 10: 1 + }, + 'trunk_centerline_clr': { + 0: '255 255 255' + }, + 'trunk_centerline_width': { + 0: 1, + 12: 1.5, + 14: 2 + } + }, + 'google': { + 'motorway_clr': "253 146 58", + 'trunk_clr': "255 195 69", + 'primary_clr': { + 0: '193 181 157', + 9: "255 253 139" + }, + 'secondary_clr': { + 0: '193 181 157', + 10: "255 253 139" + }, + 'tertiary_clr': { + 0: '193 181 157', + 12: "255 253 139" + }, + 'other_clr': { + 0: '193 181 157', + 14: "255 255 255" + }, + 'pedestrian_clr': '250 250 245', + 'forest_clr': "203 216 195", + 'industrial_clr': "209 208 205", + 'education_clr': "222 210 172", + 'hospital_clr': "229 198 195", + 'residential_clr': "242 239 233", + 'land_clr': "242 239 233", + 'park_clr': '181 210 156', + 'ocean_clr': '153 179 204', + 'waterarea_clr': '153 179 204', + 'river_clr': '153 179 204', + 'stream_clr': '153 179 204', + 'canal_clr': '153 179 204', + + 'motorway_ol_clr': '186 110 39', + 'trunk_ol_clr': '221 159 17', + 'primary_ol_clr': '193 181 157', + 'secondary_ol_clr': '193 181 157', + 'tertiary_ol_clr': '193 181 157', + 'other_ol_clr': '193 181 157', + 'pedestrian_ol_clr': '193 181 157', + 'display_buildings': 1 + }, + 'michelin': { + 'motorway_clr': '228 24 24', + 'trunk_clr': '228 24 24', + 'primary_clr': { + 0: '"#aaaaaa"', + 9: '228 24 24' + }, + 'secondary_clr': { + 0: '"#aaaaaa"', + 10: '252 241 20' + }, + 'tertiary_clr': { + 0: '"#aaaaaa"', + 12: '252 241 20' + }, + 'other_clr': { + 0: '"#aaaaaa"', + 13: '"#ffffff"' + }, + 'display_primary_outline': { + 0: 0, + 11: 1 + }, + 'display_secondary_outline': { + 0: 0, + 12: 1 + }, + 'display_tertiary_outline': { + 0: 0, + 13: 1 + }, + 'display_other_outline': { + 0: 0, + 14: 1 + }, + + 'motorway_ol_width': 0.5, + 'trunk_ol_width': 0.5, + 'primary_ol_width': 0.2, + 'secondary_ol_width': 0.2, + 'tertiary_ol_width': 0.2, + 'other_ol_width': 0.2, + + 'pedestrian_clr': '"#fafaf5"', + 'forest_clr': '188 220 180', + 'industrial_clr': '"#ebe5d9"', + 'education_clr': '"#ded1ab"', + 'hospital_clr': '"#e6c8c3"', + 'residential_clr': '255 234 206', + 'land_clr': '"#ffffff"', + 'park_clr': '"#dcdcb4"', + 'ocean_clr': '172 220 244', + 'waterarea_clr': '172 220 244', + 'river_clr': '172 220 244', + 'stream_clr': '172 220 244', + 'canal_clr': '172 220 244', + + 'motorway_ol_clr': '0 0 0', + 'trunk_ol_clr': '0 0 0', + 'primary_ol_clr': '0 0 0', + 'secondary_ol_clr': '0 0 0', + 'tertiary_ol_clr': '0 0 0', + 'other_ol_clr': '0 0 0', + 'pedestrian_ol_clr': '0 0 0', + 'footway_clr': '"#7f7f7f"' + }, + 'bing': { + 'motorway_clr': '"#BAC3A8"', + 'trunk_clr': '"#F2935D"', + 'primary_clr': { + 0: '"#aaaaaa"', + 9: '"#FEF483"' + }, + 'secondary_clr': { + 0: '"#aaaaaa"', + 10: '"#FCFCCC"' + }, + 'tertiary_clr': { + 0: '"#aaaaaa"', + 12: '"#ffffff"' + }, + 'other_clr': { + 0: '"#aaaaaa"', + 13: '"#ffffff"' + }, + 'pedestrian_clr': '"#fafaf5"', + 'forest_clr': '"#dcdcb4"', + 'industrial_clr': '"#ebe5d9"', + 'education_clr': '"#ded1ab"', + 'hospital_clr': '"#e6c8c3"', + 'residential_clr': '"#f6f1e6"', + 'land_clr': '"#f6f1e6"', + 'park_clr': '"#dcdcb4"', + 'ocean_clr': '"#b3c6d4"', + 'waterarea_clr': '"#b3c6d4"', + 'river_clr': '"#b3c6d4"', + 'stream_clr': '"#b3c6d4"', + 'canal_clr': '"#b3c6d4"', + + 'motorway_ol_clr': '"#39780f"', + 'trunk_ol_clr': '"#bf6219"', + 'primary_ol_clr': '"#d17f40"', + 'secondary_ol_clr': '"#bbb8b4"', + 'tertiary_ol_clr': '"#b7ac9a"', + 'other_ol_clr': '"#b7ac9a"', + 'pedestrian_ol_clr': '193 181 157', + 'footway_clr': '"#7f7f7f"' + }, + 'osm2pgsql': { + 'waterarea_data': { + 0: '"way from (select way,osm_id , OSM_NAME_COLUMN as name, waterway as type from OSM_PREFIX_polygon where \\\"natural\\\"=\'water\' or landuse=\'basin\' or landuse=\'reservoir\' or waterway=\'riverbank\') as foo using unique osm_id using srid=OSM_SRID"' + }, + 'waterways_data': { + 0: '"way from (select way,waterway as type,osm_id, OSM_NAME_COLUMN as name from OSM_PREFIX_line where waterway IN (\'river\', \'stream\', \'canal\')) as foo using unique osm_id using srid=OSM_SRID"' + }, + 'places_data': { + 0: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'country\',\'continent\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', + 3: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'country\',\'continent\',\'city\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', + 8: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'city\',\'town\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', + 11: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place in (\'city\',\'town\',\'village\') and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', + 13: '"way from (select osm_id, way, OSM_NAME_COLUMN as name, place as type from OSM_PREFIX_point where place is not NULL and OSM_NAME_COLUMN is not NULL ) as foo using unique osm_id using srid=OSM_SRID"', + }, + 'railways_data': { + 0: '"way from (select way, osm_id, tunnel, railway as type from OSM_PREFIX_line where railway=\'rail\') as foo using unique osm_id using srid=OSM_SRID"' + }, + 'landusage_data': { + 0: '"way from (select way, osm_id, name, type from (select way, st_area(way) as area, osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ where type in (\'forest\',\'wood\',\'residential\')\ order by area desc) as foo using unique osm_id using srid=OSM_SRID"', - 6:'"way from (select way, osm_id, name, type from (select way , st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ + 6: '"way from (select way, osm_id, name, type from (select way , st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ where type in (\'forest\',\'wood\',\'industrial\',\'commercial\',\'residential\')\ order by area desc) as foo using unique osm_id using srid=OSM_SRID"', - 9:'"way from (select way, osm_id, name, type from (select way, st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ + 9: '"way from (select way, osm_id, name, type from (select way, st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\ \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\ \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\ \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"', - 12:'"way from (select way, osm_id, name, type from (select way , st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ + 12: '"way from (select way, osm_id, name, type from (select way , st_area(way) as area ,osm_id, (case when landuse is not null then landuse else (case when \\\"natural\\\" is not null then \\\"natural\\\" else (case when leisure is not null then leisure else amenity end) end) end) as type, OSM_NAME_COLUMN as name from OSM_PREFIX_polygon) as osm2 \ where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\ \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\ \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\ \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"' - }, - 'roads_data': { - 0: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - 8: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - 9: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\',\'secondary\',\'motorway_link\',\'trunk_link\',\'primary_link\')order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - 10:'"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\',\'secondary\',\'tertiary\',\'motorway_link\',\'trunk_link\',\'primary_link\',\'secondary_link\',\'tertiary_link\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - 11:'"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway is not null order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - 14:'"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway||(case when bridge=\'yes\' then 1 else 0 end)||(case when tunnel=\'yes\' then 1 else 0 end) as type from OSM_PREFIX_line where highway is not null order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', - }, - - }, - 'bw':{ + }, + 'roads_data': { + 0: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + 8: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + 9: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\',\'secondary\',\'motorway_link\',\'trunk_link\',\'primary_link\')order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + 10: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway in (\'motorway\',\'trunk\',\'primary\',\'secondary\',\'tertiary\',\'motorway_link\',\'trunk_link\',\'primary_link\',\'secondary_link\',\'tertiary_link\') order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + 11: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway as type, 0 as tunnel, 0 as bridge from OSM_PREFIX_line where highway is not null order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + 14: '"way from (select osm_id,way,OSM_NAME_COLUMN as name,ref,highway||(case when bridge=\'yes\' then 1 else 0 end)||(case when tunnel=\'yes\' then 1 else 0 end) as type from OSM_PREFIX_line where highway is not null order by z_order asc, st_length(way) asc) as foo using unique osm_id using srid=OSM_SRID"', + }, + + }, + 'bw': { 'park_clr': "0 0 0", 'residential_clr': "0 0 0", 'town_ol_clr': "0 0 0", @@ -1397,72 +1399,71 @@ 'pedestrian_bridge_clr': "0 0 0", 'transport_clr': "0 0 0", - 'waterarea_lbl_clr': '"#000000"', - 'waterarea_clr': '"#000000"', - 'waterarea_ol_clr': '"#000000"', - 'ocean_clr': '"#000000"', - 'canal_clr': '"#000000"', - 'stream_clr': '"#000000"', - 'river_clr': '"#000000"', - 'river_clr': '"#000000"', - 'canal_lbl_clr': '"#000000"', - 'stream_lbl_clr': '"#000000"', - 'river_lbl_clr': '"#000000"', - - - 'motorway_bridge_clr':"255 255 255", - 'trunk_bridge_clr':"255 255 255", - 'primary_bridge_clr':"255 255 255", - 'secondary_bridge_clr':"255 255 255", - 'tertiary_bridge_clr':"255 255 255", - 'other_bridge_clr':"255 255 255", - 'pedestrian_bridge_clr':"255 255 255", - 'motorway_centerline_clr': '255 255 255', - - 'motorway_clr': '"#000000"', - 'trunk_clr': '"#000000"', - 'primary_clr': { - 0:'"#FFFFFF"', - 9:'"#000000"' - }, - 'secondary_clr': { - 0:'"#FFFFFF"', - 10:'"#000000"' - }, - 'tertiary_clr': { - 0:'"#FFFFFF"', - 12:'"#ffffff"' - }, - 'other_clr': { - 0:'"#FFFFFF"', - 13:'"#ffffff"' - }, - 'pedestrian_clr': '"#ffffff"', - 'forest_clr': '"#ffffff"', - 'industrial_clr': '"#ffffff"', - 'education_clr': '"#ffffff"', - 'hospital_clr': '"#ffffff"', - 'residential_clr': '"#ffffff"', - 'land_clr': '"#ffffff"', - 'park_clr': '"#ffffff"', - 'ocean_clr': '"#ffffff"', - 'waterarea_clr': '"#ffffff"', - 'river_clr': '"#ffffff"', - 'stream_clr': '"#ffffff"', - 'canal_clr': '"#ffffff"', - - 'motorway_ol_clr': '"#FFFFFF"', - 'trunk_ol_clr': '"#ffffff"', - 'primary_ol_clr': '"#FFFFFF"', - 'secondary_ol_clr': '"#FFFFFF"', - 'tertiary_ol_clr': '"#FFFFFF"', - 'other_ol_clr': '"#000000"', - 'pedestrian_ol_clr': '255 255 255', - 'footway_clr': '"#000000"' - }, + 'waterarea_lbl_clr': '"#000000"', + 'waterarea_clr': '"#000000"', + 'waterarea_ol_clr': '"#000000"', + 'ocean_clr': '"#000000"', + 'canal_clr': '"#000000"', + 'stream_clr': '"#000000"', + 'river_clr': '"#000000"', + 'river_clr': '"#000000"', + 'canal_lbl_clr': '"#000000"', + 'stream_lbl_clr': '"#000000"', + 'river_lbl_clr': '"#000000"', + + + 'motorway_bridge_clr': "255 255 255", + 'trunk_bridge_clr': "255 255 255", + 'primary_bridge_clr': "255 255 255", + 'secondary_bridge_clr': "255 255 255", + 'tertiary_bridge_clr': "255 255 255", + 'other_bridge_clr': "255 255 255", + 'pedestrian_bridge_clr': "255 255 255", + 'motorway_centerline_clr': '255 255 255', + + 'motorway_clr': '"#000000"', + 'trunk_clr': '"#000000"', + 'primary_clr': { + 0: '"#FFFFFF"', + 9: '"#000000"' + }, + 'secondary_clr': { + 0: '"#FFFFFF"', + 10: '"#000000"' + }, + 'tertiary_clr': { + 0: '"#FFFFFF"', + 12: '"#ffffff"' + }, + 'other_clr': { + 0: '"#FFFFFF"', + 13: '"#ffffff"' + }, + 'pedestrian_clr': '"#ffffff"', + 'forest_clr': '"#ffffff"', + 'industrial_clr': '"#ffffff"', + 'education_clr': '"#ffffff"', + 'hospital_clr': '"#ffffff"', + 'residential_clr': '"#ffffff"', + 'land_clr': '"#ffffff"', + 'park_clr': '"#ffffff"', + 'ocean_clr': '"#ffffff"', + 'waterarea_clr': '"#ffffff"', + 'river_clr': '"#ffffff"', + 'stream_clr': '"#ffffff"', + 'canal_clr': '"#ffffff"', + + 'motorway_ol_clr': '"#FFFFFF"', + 'trunk_ol_clr': '"#ffffff"', + 'primary_ol_clr': '"#FFFFFF"', + 'secondary_ol_clr': '"#FFFFFF"', + 'tertiary_ol_clr': '"#FFFFFF"', + 'other_ol_clr': '"#000000"', + 'pedestrian_ol_clr': '255 255 255', + 'footway_clr': '"#000000"' + }, } -import sys from optparse import OptionParser @@ -1470,19 +1471,19 @@ # e.g. with `make STYLE=google`. This will create an osm-google.map mapfile style_aliases = { - # map with no road casing and few colors, suited for using as a basemap when overlaying - # other layers without risk of confusion between layers. - "default":"default", + # map with no road casing and few colors, suited for using as a basemap when overlaying + # other layers without risk of confusion between layers. + "default": "default", - # a style resembling the google-maps theme - "google":"default,outlined,google", + # a style resembling the google-maps theme + "google": "default,outlined,google", - # same style as above, but using data coming from an osm2pgsql schema rather than imposm - "googleosm2pgsql":"default,outlined,google,osm2pgsql", - "bing":"default,outlined,bing", - "michelin":"default,outlined,centerlined,michelin", + # same style as above, but using data coming from an osm2pgsql schema rather than imposm + "googleosm2pgsql": "default,outlined,google,osm2pgsql", + "bing": "default,outlined,bing", + "michelin": "default,outlined,centerlined,michelin", - "bw":"default,outlined,centerlined,bw" + "bw": "default,outlined,centerlined,bw" } @@ -1494,40 +1495,53 @@ parser.add_option("-s", "--style", action="store", dest="style", default="default", help="comma separated list of styles to apply (order is important)") +parser.add_option("-b", "--include-base", + action="store", dest="include_base", + help="""include custom Mapfile snippet as background map + (between lines and landuse)""") +parser.add_option("-o", "--include-overlay", + action="store", dest="include_overlay", + help="""include custom Mapfile snippet as overlay map + (on top of anything else for all the scales)""") (options, args) = parser.parse_args() -items = vars.items() +items = list(vars.items()) for namedstyle in style_aliases[options.style].split(','): - items = items + styles[namedstyle].items() + items = items + list(styles[namedstyle].items()) style = dict(items) if options.full: - print "###### level 0 ######" - for k,v in style.iteritems(): - if type(v) is dict: - print "#define _%s0 %s"%(k,v[0]) - else: - print "#define _%s0 %s"%(k,v) - - - for i in range(1,19): - print - print "###### level %d ######"%(i) - for k,v in style.iteritems(): - if type(v) is dict: - if not v.has_key(i): - print "#define _%s%d _%s%d"%(k,i,k,i-1) + print("###### level 0 ######") + for k, v in style.items(): + if type(v) is dict: + print("#define _%s0 %s" % (k, v[0])) + else: + print("#define _%s0 %s" % (k, v)) + + for i in range(1, 19): + print + print("###### level %d ######" % (i)) + for k, v in style.items(): + if type(v) is dict: + if i not in v: + print("#define _%s%d _%s%d" % (k, i, k, i-1)) + else: + print("#define _%s%d %s" % (k, i, v[i])) else: - print "#define _%s%d %s"%(k,i,v[i]) - else: - print "#define _%s%d %s"%(k,i,v) - + print("#define _%s%d %s" % (k, i, v)) if options.level != -1: - level = options.level - for k,v in style.iteritems(): - print "#undef _%s"%(k) + level = options.level + for k, v in style.items(): + print("#undef _%s" % (k)) + + for k, v in style.items(): + print("#define _%s _%s%s" % (k, k, level)) + +if options.include_base and os.path.isfile(options.include_base): + print('#define _include_base \'{}\''.format(options.include_base)) + +if options.include_overlay and os.path.isfile(options.include_overlay): + print('#define _include_overlay \'{}\''.format(options.include_overlay)) - for k,v in style.iteritems(): - print "#define _%s _%s%s"%(k,k,level) diff --git a/include-base.map b/include-base.map new file mode 100644 index 00000000..b91f3923 --- /dev/null +++ b/include-base.map @@ -0,0 +1,11 @@ +LAYER + STATUS ON + GROUP "default" + DEBUG _layerdebug + NAME layername(include,_layer_suffix) + MINSCALEDENOM _minscale + MAXSCALEDENOM _maxscale + + INCLUDE _include_base +END + diff --git a/osmbase.map b/osmbase.map index eae0d3d1..a9f69337 100644 --- a/osmbase.map +++ b/osmbase.map @@ -56,6 +56,9 @@ END #include LEVELPASTER(THEME,0) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -64,6 +67,9 @@ END #include LEVELPASTER(THEME,1) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -72,6 +78,9 @@ END #include LEVELPASTER(THEME,2) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -80,6 +89,9 @@ END #include LEVELPASTER(THEME,3) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -88,6 +100,9 @@ END #include LEVELPASTER(THEME,4) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -96,6 +111,9 @@ END #include LEVELPASTER(THEME,5) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -104,6 +122,9 @@ END #include LEVELPASTER(THEME,6) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -112,6 +133,9 @@ END #include LEVELPASTER(THEME,7) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -120,6 +144,9 @@ END #include LEVELPASTER(THEME,8) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -128,6 +155,9 @@ END #include LEVELPASTER(THEME,9) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -136,6 +166,9 @@ END #include LEVELPASTER(THEME,10) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -144,6 +177,9 @@ END #include LEVELPASTER(THEME,11) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -152,6 +188,9 @@ END #include LEVELPASTER(THEME,12) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -160,6 +199,9 @@ END #include LEVELPASTER(THEME,13) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -168,6 +210,9 @@ END #include LEVELPASTER(THEME,14) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -176,6 +221,9 @@ END #include LEVELPASTER(THEME,15) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -184,6 +232,9 @@ END #include LEVELPASTER(THEME,16) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -192,6 +243,9 @@ END #include LEVELPASTER(THEME,17) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" @@ -200,11 +254,18 @@ END #include LEVELPASTER(THEME,18) #include "land.map" #include "landusage.map" +#ifdef _include_base +#include "include-base.map" +#endif #include "highways.map" #include "buildings.map" #include "borders.map" #include "places.map" +#if defined(_include_overlay) +INCLUDE _include_overlay +#endif + SYMBOL name "citycircle" type ellipse From 177c011cb526627265d30579746d77d93ce96075 Mon Sep 17 00:00:00 2001 From: madlenkk Date: Fri, 15 Nov 2019 10:09:02 +0100 Subject: [PATCH 03/16] instroducing topo style --- generate_style.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/generate_style.py b/generate_style.py index cee9a7ee..f90c9054 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1462,6 +1462,48 @@ 'pedestrian_ol_clr': '255 255 255', 'footway_clr': '"#000000"' }, + 'topo': { + 'motorway_clr': "253 146 58", + 'trunk_clr': "255 195 69", + 'primary_clr': { + 0: '193 181 157', + 9: "255 253 139" + }, + 'secondary_clr': { + 0: '193 181 157', + 10: "255 253 139" + }, + 'tertiary_clr': { + 0: '193 181 157', + 12: "255 253 139" + }, + 'other_clr': { + 0: '193 181 157', + 14: "255 255 255" + }, + 'pedestrian_clr': '250 250 245', + 'forest_clr': "203 216 195", + 'industrial_clr': "209 208 205", + 'education_clr': "222 210 172", + 'hospital_clr': "229 198 195", + 'residential_clr': "242 239 233", + 'land_clr': "242 239 233", + 'park_clr': '181 210 156', + 'ocean_clr': '153 179 204', + 'waterarea_clr': '153 179 204', + 'river_clr': '153 179 204', + 'stream_clr': '153 179 204', + 'canal_clr': '153 179 204', + + 'motorway_ol_clr': '186 110 39', + 'trunk_ol_clr': '221 159 17', + 'primary_ol_clr': '193 181 157', + 'secondary_ol_clr': '193 181 157', + 'tertiary_ol_clr': '193 181 157', + 'other_ol_clr': '193 181 157', + 'pedestrian_ol_clr': '193 181 157', + 'display_buildings': 1 + }, } from optparse import OptionParser @@ -1484,6 +1526,9 @@ "michelin": "default,outlined,centerlined,michelin", "bw": "default,outlined,centerlined,bw" + + # a style resembling the opentopomap + "topo": "default,outlined,topo", } From e8b6bd22756c6f759c1cd87910e2060983e84497 Mon Sep 17 00:00:00 2001 From: madlenkk Date: Tue, 7 Jan 2020 12:42:18 +0100 Subject: [PATCH 04/16] topo style first version --- generate_style.py | 78 +++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/generate_style.py b/generate_style.py index f90c9054..478b9022 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1463,45 +1463,57 @@ 'footway_clr': '"#000000"' }, 'topo': { - 'motorway_clr': "253 146 58", - 'trunk_clr': "255 195 69", + 'motorway_clr': '"#F29629"', + 'trunk_clr': '"#F29629"', 'primary_clr': { - 0: '193 181 157', - 9: "255 253 139" + 0: '"#F7E761"', + 9: '"#F29629"' }, 'secondary_clr': { - 0: '193 181 157', - 10: "255 253 139" + 0: '"#FFFFFF"', + 10: '"#F7E761"' }, 'tertiary_clr': { - 0: '193 181 157', - 12: "255 253 139" + 0: '"#FFFFFF"', + 12: '"#F7E761"' }, 'other_clr': { - 0: '193 181 157', - 14: "255 255 255" + 0: '"#FFFFFF"', + 14: '"#FFFFFF"' }, - 'pedestrian_clr': '250 250 245', - 'forest_clr': "203 216 195", - 'industrial_clr': "209 208 205", - 'education_clr': "222 210 172", - 'hospital_clr': "229 198 195", - 'residential_clr': "242 239 233", - 'land_clr': "242 239 233", - 'park_clr': '181 210 156', - 'ocean_clr': '153 179 204', - 'waterarea_clr': '153 179 204', - 'river_clr': '153 179 204', - 'stream_clr': '153 179 204', - 'canal_clr': '153 179 204', - - 'motorway_ol_clr': '186 110 39', - 'trunk_ol_clr': '221 159 17', - 'primary_ol_clr': '193 181 157', - 'secondary_ol_clr': '193 181 157', - 'tertiary_ol_clr': '193 181 157', - 'other_ol_clr': '193 181 157', - 'pedestrian_ol_clr': '193 181 157', + 'pedestrian_clr': '"#FFFFFF"', + 'forest_clr': '"#D3EC9D"', + 'industrial_clr': '"#EAEAEA"', + 'education_clr': '"#EAEAEA"', + 'hospital_clr': '"#EAEAEA"', + 'residential_clr': '"#F7F7F7"', + 'land_clr': '"#FDFDFD"', + 'park_clr': '"#DCEBD3"', + + 'ocean_clr': '"#A3DDE8"', + 'waterarea_clr': '"#A3DDE8"', + 'waterarea_ol_clr': '0 0 255', + 'river_clr': '"#A3DDE8"', + 'stream_clr': '0 0 255', + 'canal_clr': '"#A3DDE8"', + + 'footway_clr': '0 0 0', + 'sports_clr': '"#DAEED1"', + 'sports_ol_clr': '"#8CA881"', #nefunguje + + 'building_clr': { + 0: '20 20 20', + 17: '155 155 155' + }, + 'building_ol_clr': '"#333333"', + + # 'motorway_ol_clr': '186 110 39', + # 'trunk_ol_clr': '221 159 17', + # 'primary_ol_clr': '193 181 157', + # 'secondary_ol_clr': '193 181 157', + # 'tertiary_ol_clr': '193 181 157', + # 'other_ol_clr': '193 181 157', + # 'pedestrian_ol_clr': '193 181 157', 'display_buildings': 1 }, } @@ -1525,10 +1537,10 @@ "bing": "default,outlined,bing", "michelin": "default,outlined,centerlined,michelin", - "bw": "default,outlined,centerlined,bw" + "bw": "default,outlined,centerlined,bw", # a style resembling the opentopomap - "topo": "default,outlined,topo", + "topo": "default,outlined,topo" } From 6efde60bad41fd42ad6248261f153d4db669bd1e Mon Sep 17 00:00:00 2001 From: madlenkk Date: Tue, 7 Jan 2020 21:51:31 +0100 Subject: [PATCH 05/16] modify stream width --- generate_style.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/generate_style.py b/generate_style.py index 478b9022..7ab94531 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1497,6 +1497,12 @@ 'stream_clr': '0 0 255', 'canal_clr': '"#A3DDE8"', + 'stream_width': { + 0: 0, + 10: 0.5, + 14: 1 + }, + 'footway_clr': '0 0 0', 'sports_clr': '"#DAEED1"', 'sports_ol_clr': '"#8CA881"', #nefunguje From 6b5370f0bbea5e70f5c95a7c85acce6f7c83a797 Mon Sep 17 00:00:00 2001 From: Jachym Cepicky Date: Mon, 30 Mar 2020 21:22:33 +0200 Subject: [PATCH 06/16] opacity as variable --- buildings.map | 2 +- generate_style.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/buildings.map b/buildings.map index 3d946e7d..7fcd4ab1 100644 --- a/buildings.map +++ b/buildings.map @@ -21,7 +21,7 @@ LAYER CLASS STYLE COLOR _building_clr - OPACITY 50 + OPACITY _building_opacity END STYLE OUTLINECOLOR _building_ol_clr diff --git a/generate_style.py b/generate_style.py index 7ab94531..779215af 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1036,6 +1036,7 @@ styles = { 'default': {}, 'outlined': { + 'building_opacity': '50', 'display_motorway_outline': { 0: 0, 7: 1 @@ -1329,6 +1330,7 @@ }, 'bw': { + 'building_opacity': '100', 'park_clr': "0 0 0", 'residential_clr': "0 0 0", 'town_ol_clr': "0 0 0", From 989506c6d817b82f6c86ae5c2994f146034d2e67 Mon Sep 17 00:00:00 2001 From: madlenkk Date: Mon, 30 Mar 2020 20:25:50 +0200 Subject: [PATCH 07/16] modify bw style --- generate_style.py | 228 +++++++++++++++++++++++++++++++++------------- 1 file changed, 165 insertions(+), 63 deletions(-) diff --git a/generate_style.py b/generate_style.py index 779215af..a41bc332 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1330,7 +1330,108 @@ }, 'bw': { - 'building_opacity': '100', + 'trunk_ol_clr': '"#000000"', + 'trunk_clr': '"#FFFFFF"', + 'trunk_centerline_clr': '"#FFFFFF"', + 'trunk_bridge_clr': '"#000000"', + 'motorway_lbl_clr': '"#000000"', + 'motorway_ol_clr': '"#000000"', + 'motorway_clr': '"#FFFFFF"', + 'motorway_centerline_clr': '"#FFFFFF"', + 'motorway_bridge_clr': '"#000000"', + 'primary_ol_clr': '"#000000"', + 'primary_clr': '"#FFFFFF"', + 'primary_bridge_clr': '"#000000"', + 'secondary_ol_clr': '"#000000"', + 'secondary_clr': '"#FFFFFF"', + 'secondary_bridge_clr': '"#000000"', + 'tertiary_ol_clr': '"#000000"', + 'tertiary_clr': '"#FFFFFF"', + 'tertiary_bridge_clr': '"#000000"', + 'other_ol_clr': '"#000000"', + 'other_clr': '"#FFFFFF"', + 'other_bridge_clr': '"#000000"', + 'pedestrian_ol_clr': '"#000000"', + 'pedestrian_clr': '"#FFFFFF"', + 'pedestrian_bridge_clr': '"#000000"', + 'footway_ol_clr': '"#FFFFFF"', + 'footway_clr': '"#000000"', + # 'footway_bridge_clr': '"#000000"', + 'track_ol_clr': '"#FFFFFF"', + 'track_clr': '"#000000"', + 'cycleway_ol_clr': '"#FFFFFF"', + 'cycleway_clr': '"#000000"', + # 'cycleway_bridge_clr': '"#000000"', + # 'railway_ol_clr': '"#000000"', + 'railway_clr': '"#000000"', + 'taxiway_clr': '"#000000"', + 'runway_ol_clr': '"#FFFFFF"', + 'runway_clr': '"#000000"', + 'runway_center_clr': '"#FFFFFF"', + + 'waterarea_clr': '"#000000"', + 'waterarea_ol_clr': '"#000000"', + 'waterarea_lbl_clr': '"#000000"', + 'river_clr': '"#000000"', + 'river_lbl_clr': '"#000000"', + 'canal_clr': '"#000000"', + 'canal_lbl_clr': '"#000000"', + 'stream_clr': '"#000000"', + 'stream_lbl_clr': '"#000000"', + 'ocean_clr': '"#FFFFFF"', + 'ocean_lbl_clr': '"#000000"', + + 'park_olclr': '"#000000"', + 'park_clr': '"#FFFFFF"', + 'land_ol_clr': '"#000000"', + 'land_clr': '"#FFFFFF"', + 'forest_ol_clr': '"#000000"', + 'forest_clr': '"#FFFFFF"', + + 'village_ol_clr': '"#000000"', + 'village_clr': '"#FFFFFF"', + 'town_ol_clr': '"#000000"', + 'town_clr': '"#FFFFFF"', + 'suburb_ol_clr': '"#000000"', + 'suburb_clr': '"#FFFFFF"', + 'city_ol_clr': '"#000000"', + 'city_clr': '"#FFFFFF"', + + 'building_ol_clr': '"#FFFFFF"', + 'building_clr': '"#000000"', + 'building_opacity': 100, + 'display_buildings': 1, + + 'hospital_ol_clr': '"#000000"', + 'hospital_clr': '"#FFFFFF"', + + 'residential_ol_clr': '"#000000"', + 'residential_clr': '"#FFFFFF"', + 'cemetery_ol_clr': '"#000000"', + 'cemetery_clr': '"#FFFFFF"', + 'sports_ol_clr': '"#000000"', + 'sports_clr': '"#FFFFFF"', + 'education_ol_clr': '"#000000"', + 'education_clr': '"#FFFFFF"', + 'industrial_ol_clr': '"#000000"', + 'industrial_clr': '"#FFFFFF"', + 'transport_ol_clr': '"#000000"', + 'transport_clr': '"#FFFFFF"', + + 'border_2_inner_clr': '"#000000"', + 'border_2_clr': '"#000000"' + + # 'locality_ol_clr': '"#000000"', + # 'locality_clr': '"#FFFFFF"', + # 'hamlet_ol_clr': '"#000000"', + # 'hamlet_clr': '"#FFFFFF"', + # 'capital_fg_clr': '"#000000"', + # 'capital_ol_clr': '"#000000"', + # 'capital_clr': '"#FFFFFF"' + + }, + + 'bw_2019':{ 'park_clr': "0 0 0", 'residential_clr': "0 0 0", 'town_ol_clr': "0 0 0", @@ -1401,69 +1502,70 @@ 'pedestrian_bridge_clr': "0 0 0", 'transport_clr': "0 0 0", - 'waterarea_lbl_clr': '"#000000"', - 'waterarea_clr': '"#000000"', - 'waterarea_ol_clr': '"#000000"', - 'ocean_clr': '"#000000"', - 'canal_clr': '"#000000"', - 'stream_clr': '"#000000"', - 'river_clr': '"#000000"', - 'river_clr': '"#000000"', - 'canal_lbl_clr': '"#000000"', - 'stream_lbl_clr': '"#000000"', - 'river_lbl_clr': '"#000000"', - - - 'motorway_bridge_clr': "255 255 255", - 'trunk_bridge_clr': "255 255 255", - 'primary_bridge_clr': "255 255 255", - 'secondary_bridge_clr': "255 255 255", - 'tertiary_bridge_clr': "255 255 255", - 'other_bridge_clr': "255 255 255", - 'pedestrian_bridge_clr': "255 255 255", - 'motorway_centerline_clr': '255 255 255', + 'waterarea_lbl_clr': '"#000000"', + 'waterarea_clr': '"#000000"', + 'waterarea_ol_clr': '"#000000"', + 'ocean_clr': '"#000000"', + 'canal_clr': '"#000000"', + 'stream_clr': '"#000000"', + 'river_clr': '"#000000"', + 'river_clr': '"#000000"', + 'canal_lbl_clr': '"#000000"', + 'stream_lbl_clr': '"#000000"', + 'river_lbl_clr': '"#000000"', + + + 'motorway_bridge_clr':"255 255 255", + 'trunk_bridge_clr':"255 255 255", + 'primary_bridge_clr':"255 255 255", + 'secondary_bridge_clr':"255 255 255", + 'tertiary_bridge_clr':"255 255 255", + 'other_bridge_clr':"255 255 255", + 'pedestrian_bridge_clr':"255 255 255", + 'motorway_centerline_clr': '255 255 255', + + 'motorway_clr': '"#000000"', + 'trunk_clr': '"#000000"', + 'primary_clr': { + 0:'"#FFFFFF"', + 9:'"#000000"' + }, + 'secondary_clr': { + 0:'"#FFFFFF"', + 10:'"#000000"' + }, + 'tertiary_clr': { + 0:'"#FFFFFF"', + 12:'"#ffffff"' + }, + 'other_clr': { + 0:'"#FFFFFF"', + 13:'"#ffffff"' + }, + 'pedestrian_clr': '"#ffffff"', + 'forest_clr': '"#ffffff"', + 'industrial_clr': '"#ffffff"', + 'education_clr': '"#ffffff"', + 'hospital_clr': '"#ffffff"', + 'residential_clr': '"#ffffff"', + 'land_clr': '"#ffffff"', + 'park_clr': '"#ffffff"', + 'ocean_clr': '"#ffffff"', + 'waterarea_clr': '"#ffffff"', + 'river_clr': '"#ffffff"', + 'stream_clr': '"#ffffff"', + 'canal_clr': '"#ffffff"', + + 'motorway_ol_clr': '"#FFFFFF"', + 'trunk_ol_clr': '"#ffffff"', + 'primary_ol_clr': '"#FFFFFF"', + 'secondary_ol_clr': '"#FFFFFF"', + 'tertiary_ol_clr': '"#FFFFFF"', + 'other_ol_clr': '"#000000"', + 'pedestrian_ol_clr': '255 255 255', + 'footway_clr': '"#000000"' + }, - 'motorway_clr': '"#000000"', - 'trunk_clr': '"#000000"', - 'primary_clr': { - 0: '"#FFFFFF"', - 9: '"#000000"' - }, - 'secondary_clr': { - 0: '"#FFFFFF"', - 10: '"#000000"' - }, - 'tertiary_clr': { - 0: '"#FFFFFF"', - 12: '"#ffffff"' - }, - 'other_clr': { - 0: '"#FFFFFF"', - 13: '"#ffffff"' - }, - 'pedestrian_clr': '"#ffffff"', - 'forest_clr': '"#ffffff"', - 'industrial_clr': '"#ffffff"', - 'education_clr': '"#ffffff"', - 'hospital_clr': '"#ffffff"', - 'residential_clr': '"#ffffff"', - 'land_clr': '"#ffffff"', - 'park_clr': '"#ffffff"', - 'ocean_clr': '"#ffffff"', - 'waterarea_clr': '"#ffffff"', - 'river_clr': '"#ffffff"', - 'stream_clr': '"#ffffff"', - 'canal_clr': '"#ffffff"', - - 'motorway_ol_clr': '"#FFFFFF"', - 'trunk_ol_clr': '"#ffffff"', - 'primary_ol_clr': '"#FFFFFF"', - 'secondary_ol_clr': '"#FFFFFF"', - 'tertiary_ol_clr': '"#FFFFFF"', - 'other_ol_clr': '"#000000"', - 'pedestrian_ol_clr': '255 255 255', - 'footway_clr': '"#000000"' - }, 'topo': { 'motorway_clr': '"#F29629"', 'trunk_clr': '"#F29629"', From 53f83d41945c09d9870f64d38e673d2801d2b389 Mon Sep 17 00:00:00 2001 From: madlenkk Date: Mon, 20 Apr 2020 16:49:43 +0200 Subject: [PATCH 08/16] bw style - litle changes --- generate_style.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/generate_style.py b/generate_style.py index a41bc332..047fecfe 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1551,10 +1551,6 @@ 'land_clr': '"#ffffff"', 'park_clr': '"#ffffff"', 'ocean_clr': '"#ffffff"', - 'waterarea_clr': '"#ffffff"', - 'river_clr': '"#ffffff"', - 'stream_clr': '"#ffffff"', - 'canal_clr': '"#ffffff"', 'motorway_ol_clr': '"#FFFFFF"', 'trunk_ol_clr': '"#ffffff"', From b9184cea753c0137d9e8aea5823503b243928fa3 Mon Sep 17 00:00:00 2001 From: tkacovas Date: Mon, 20 Jul 2020 14:53:50 +0200 Subject: [PATCH 09/16] waterways under water bodies --- landusage.map | 105 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/landusage.map b/landusage.map index 98d5256a..3288b1b4 100644 --- a/landusage.map +++ b/landusage.map @@ -274,58 +274,7 @@ END #endif -LAYER - TYPE POLYGON - STATUS ON - PROJECTION - "init=epsg:OSM_SRID" - END - NAME layername(waterarea,_layer_suffix) - GROUP "default" - CONNECTIONTYPE POSTGIS - CONNECTION "OSM_DB_CONNECTION" -#if OSM_FORCE_POSTGIS_EXTENT == 1 - EXTENT OSM_EXTENT -#endif - DATA _waterarea_data - MAXSCALEDENOM _maxscale - MINSCALEDENOM _minscale - PROCESSING "CLOSE_CONNECTION=DEFER" - LABELITEM "name" - CLASSITEM "type" - CLASS - EXPRESSION "riverbank" - STYLE - COLOR _waterarea_clr - OUTLINECOLOR _waterarea_ol_clr - OUTLINEWIDTH _waterarea_ol_width - END - END - CLASS - STYLE - COLOR _waterarea_clr - OUTLINECOLOR _waterarea_ol_clr - OUTLINEWIDTH _waterarea_ol_width - END -#if _display_waterarea_lbl == 1 - LABEL - TYPE TRUETYPE - PARTIALS FALSE - FONT _waterarea_font - MINDISTANCE 200 - SIZE _waterarea_lbl_size - COLOR _waterarea_lbl_clr - ENCODING "utf-8" - OUTLINECOLOR _waterarea_lbl_ol_clr - OUTLINEWIDTH _waterarea_lbl_ol_width - WRAP ' ' - MAXLENGTH 5 - ALIGN CENTER - MINFEATURESIZE AUTO - END -#endif - END -END + #if _display_waterways == 1 LAYER @@ -420,5 +369,57 @@ LAYER #endif END END +LAYER + TYPE POLYGON + STATUS ON + PROJECTION + "init=epsg:OSM_SRID" + END + NAME layername(waterarea,_layer_suffix) + GROUP "default" + CONNECTIONTYPE POSTGIS + CONNECTION "OSM_DB_CONNECTION" +#if OSM_FORCE_POSTGIS_EXTENT == 1 + EXTENT OSM_EXTENT +#endif + DATA _waterarea_data + MAXSCALEDENOM _maxscale + MINSCALEDENOM _minscale + PROCESSING "CLOSE_CONNECTION=DEFER" + LABELITEM "name" + CLASSITEM "type" + CLASS + EXPRESSION "riverbank" + STYLE + COLOR _waterarea_clr + OUTLINECOLOR _waterarea_ol_clr + OUTLINEWIDTH _waterarea_ol_width + END + END + CLASS + STYLE + COLOR _waterarea_clr + OUTLINECOLOR _waterarea_ol_clr + OUTLINEWIDTH _waterarea_ol_width + END +#if _display_waterarea_lbl == 1 + LABEL + TYPE TRUETYPE + PARTIALS FALSE + FONT _waterarea_font + MINDISTANCE 200 + SIZE _waterarea_lbl_size + COLOR _waterarea_lbl_clr + ENCODING "utf-8" + OUTLINECOLOR _waterarea_lbl_ol_clr + OUTLINEWIDTH _waterarea_lbl_ol_width + WRAP ' ' + MAXLENGTH 5 + ALIGN CENTER + MINFEATURESIZE AUTO + END +#endif + END +END #endif #endif From 0346224e27d9e26e221d332e139bddfa37d848c9 Mon Sep 17 00:00:00 2001 From: tkacovas Date: Tue, 4 Aug 2020 19:21:57 +0200 Subject: [PATCH 10/16] Modified to generate correct osm-bw.map --- generate_style.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generate_style.py b/generate_style.py index 047fecfe..92216c8f 100644 --- a/generate_style.py +++ b/generate_style.py @@ -1708,3 +1708,8 @@ if options.include_overlay and os.path.isfile(options.include_overlay): print('#define _include_overlay \'{}\''.format(options.include_overlay)) +#_style_bw configuration +if options.style == "bw": + print("#define _style_bw 1") +else: + print("#define _style_bw 0") From 05e230bd8cfae58a26a6dad028d4fa0ec4aa8e03 Mon Sep 17 00:00:00 2001 From: tkacovas Date: Tue, 4 Aug 2020 19:22:58 +0200 Subject: [PATCH 11/16] Changed symbols for forest and water areas --- landusage.map | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/landusage.map b/landusage.map index 3288b1b4..8f9ec4e7 100644 --- a/landusage.map +++ b/landusage.map @@ -23,6 +23,9 @@ LAYER EXPRESSION {forest,wood} STYLE COLOR _forest_clr +#if _style_bw == 1 + SYMBOL "tree" +#endif END #if _display_forest_lbl==1 LABEL @@ -401,6 +404,9 @@ LAYER COLOR _waterarea_clr OUTLINECOLOR _waterarea_ol_clr OUTLINEWIDTH _waterarea_ol_width +#if _style_bw == 1 + SYMBOL "water_area" +#endif END #if _display_waterarea_lbl == 1 LABEL From ef1fecc256451d3dae489267982ef987ecf9447e Mon Sep 17 00:00:00 2001 From: tkacovas Date: Tue, 4 Aug 2020 19:23:48 +0200 Subject: [PATCH 12/16] New pattern symbol for forest areas --- stromecky_v3.png | Bin 0 -> 5873 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 stromecky_v3.png diff --git a/stromecky_v3.png b/stromecky_v3.png new file mode 100644 index 0000000000000000000000000000000000000000..ce29685e272910f57b277cbdc4e2331df57748c8 GIT binary patch literal 5873 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 literal 0 HcmV?d00001 From 716a296a589783cd5890c4a2c1b474bebcfc1952 Mon Sep 17 00:00:00 2001 From: tkacovas Date: Tue, 4 Aug 2020 19:26:27 +0200 Subject: [PATCH 13/16] Created symbolset for modified landusage.map --- symbolset.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 symbolset.txt diff --git a/symbolset.txt b/symbolset.txt new file mode 100644 index 00000000..f551fd31 --- /dev/null +++ b/symbolset.txt @@ -0,0 +1,13 @@ +SYMBOLSET + SYMBOL + NAME "tree" + TYPE PIXMAP + IMAGE "stromecky_v3.png" + END + + SYMBOL + NAME "water_area" + TYPE PIXMAP + IMAGE "vlnka.png" + END +END From a12cb753c06bd5e149357ecae1dfc3191568c85a Mon Sep 17 00:00:00 2001 From: tkacovas Date: Tue, 4 Aug 2020 19:27:12 +0200 Subject: [PATCH 14/16] Created new symbol pattern for water areas --- vlnka.png | Bin 0 -> 4358 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 vlnka.png diff --git a/vlnka.png b/vlnka.png new file mode 100644 index 0000000000000000000000000000000000000000..97ccf22f95706dca47a499326bd2c9e8057ba4d3 GIT binary patch literal 4358 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 literal 0 HcmV?d00001 From 71b5e3cdcb9e03701e14b683e34158b2be7209d4 Mon Sep 17 00:00:00 2001 From: tkacovas Date: Mon, 17 Aug 2020 18:54:04 +0200 Subject: [PATCH 15/16] renaming and moving icons, modifying symbolset.txt --- stromecky_v3.png => icons/tree.png | Bin vlnka.png => icons/water.png | Bin symbolset.txt | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename stromecky_v3.png => icons/tree.png (100%) rename vlnka.png => icons/water.png (100%) diff --git a/stromecky_v3.png b/icons/tree.png similarity index 100% rename from stromecky_v3.png rename to icons/tree.png diff --git a/vlnka.png b/icons/water.png similarity index 100% rename from vlnka.png rename to icons/water.png diff --git a/symbolset.txt b/symbolset.txt index f551fd31..77f6df59 100644 --- a/symbolset.txt +++ b/symbolset.txt @@ -2,12 +2,12 @@ SYMBOLSET SYMBOL NAME "tree" TYPE PIXMAP - IMAGE "stromecky_v3.png" + IMAGE "tree.png" END SYMBOL NAME "water_area" TYPE PIXMAP - IMAGE "vlnka.png" + IMAGE "water.png" END END From bfedc736f61f78fec8e82a9b7c22aa06dc504f41 Mon Sep 17 00:00:00 2001 From: Jachym Cepicky Date: Fri, 11 Jun 2021 09:54:25 +0200 Subject: [PATCH 16/16] change water layer order --- landusage.map | 111 +++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/landusage.map b/landusage.map index 8f9ec4e7..409c8e60 100644 --- a/landusage.map +++ b/landusage.map @@ -280,6 +280,62 @@ END #if _display_waterways == 1 +LAYER + TYPE POLYGON + STATUS ON + PROJECTION + "init=epsg:OSM_SRID" + END + NAME layername(waterarea,_layer_suffix) + GROUP "default" + CONNECTIONTYPE POSTGIS + CONNECTION "OSM_DB_CONNECTION" +#if OSM_FORCE_POSTGIS_EXTENT == 1 + EXTENT OSM_EXTENT +#endif + DATA _waterarea_data + MAXSCALEDENOM _maxscale + MINSCALEDENOM _minscale + PROCESSING "CLOSE_CONNECTION=DEFER" + LABELITEM "name" + CLASSITEM "type" + CLASS + EXPRESSION "riverbank" + STYLE + COLOR _waterarea_clr + OUTLINECOLOR _waterarea_ol_clr + OUTLINEWIDTH _waterarea_ol_width + END + END + CLASS + STYLE + COLOR _waterarea_clr + OUTLINECOLOR _waterarea_ol_clr + OUTLINEWIDTH _waterarea_ol_width +#if _style_bw == 1 + SYMBOL "water_area" +#endif + END +#if _display_waterarea_lbl == 1 + LABEL + TYPE TRUETYPE + PARTIALS FALSE + FONT _waterarea_font + MINDISTANCE 200 + SIZE _waterarea_lbl_size + COLOR _waterarea_lbl_clr + ENCODING "utf-8" + OUTLINECOLOR _waterarea_lbl_ol_clr + OUTLINEWIDTH _waterarea_lbl_ol_width + WRAP ' ' + MAXLENGTH 5 + ALIGN CENTER + MINFEATURESIZE AUTO + END +#endif + END +END + LAYER TYPE LINE NAME layername(waterways,_layer_suffix) @@ -372,60 +428,5 @@ LAYER #endif END END -LAYER - TYPE POLYGON - STATUS ON - PROJECTION - "init=epsg:OSM_SRID" - END - NAME layername(waterarea,_layer_suffix) - GROUP "default" - CONNECTIONTYPE POSTGIS - CONNECTION "OSM_DB_CONNECTION" -#if OSM_FORCE_POSTGIS_EXTENT == 1 - EXTENT OSM_EXTENT -#endif - DATA _waterarea_data - MAXSCALEDENOM _maxscale - MINSCALEDENOM _minscale - PROCESSING "CLOSE_CONNECTION=DEFER" - LABELITEM "name" - CLASSITEM "type" - CLASS - EXPRESSION "riverbank" - STYLE - COLOR _waterarea_clr - OUTLINECOLOR _waterarea_ol_clr - OUTLINEWIDTH _waterarea_ol_width - END - END - CLASS - STYLE - COLOR _waterarea_clr - OUTLINECOLOR _waterarea_ol_clr - OUTLINEWIDTH _waterarea_ol_width -#if _style_bw == 1 - SYMBOL "water_area" -#endif - END -#if _display_waterarea_lbl == 1 - LABEL - TYPE TRUETYPE - PARTIALS FALSE - FONT _waterarea_font - MINDISTANCE 200 - SIZE _waterarea_lbl_size - COLOR _waterarea_lbl_clr - ENCODING "utf-8" - OUTLINECOLOR _waterarea_lbl_ol_clr - OUTLINEWIDTH _waterarea_lbl_ol_width - WRAP ' ' - MAXLENGTH 5 - ALIGN CENTER - MINFEATURESIZE AUTO - END -#endif - END -END #endif #endif