From 81c24b75b3d796b8d3bcf5217825a67e65a502a3 Mon Sep 17 00:00:00 2001 From: brossardm Date: Thu, 18 Apr 2019 09:30:51 +0200 Subject: [PATCH 1/8] Remove hamlet, change town/village label --- cagc.mk | 7 +++++++ generate_style.py | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 cagc.mk diff --git a/cagc.mk b/cagc.mk new file mode 100644 index 0000000..2e59ab9 --- /dev/null +++ b/cagc.mk @@ -0,0 +1,7 @@ +OSM_EXTENT=404276 6546698 645590 6691451 +OSM_SRID=2154 +OSM_UNITS=meters +OSM_DB_CONNECTION=host=localhost dbname=osm user=www-data password=www-data port=5432 +STYLE=google + +include Makefile diff --git a/generate_style.py b/generate_style.py index 1206b1b..5dd821e 100755 --- a/generate_style.py +++ b/generate_style.py @@ -970,9 +970,9 @@ }, 'village_lbl_size': { 0:0, - 10:8, - 13:9, - 15:10 + 10:6, + 13:7, + 15:8 }, 'village_size': { 0:0, @@ -991,7 +991,7 @@ 'display_hamlets': { 0:0, - 13:1 + 13:0 }, 'hamlet_font': "sc", 'hamlet_lbl_clr': { @@ -1012,7 +1012,7 @@ 'display_localities': { 0:0, - 13:1 + 13:0 }, 'locality_font': "sc", 'locality_lbl_clr': { @@ -1172,7 +1172,7 @@ 'tertiary_ol_clr': '193 181 157', 'other_ol_clr': '193 181 157', 'pedestrian_ol_clr': '193 181 157', - 'display_buildings':1 + 'display_buildings':{ 0:0, 15:1} }, 'michelin':{ 'motorway_clr': '228 24 24', From 209a5ecf85cbed4ac122052afc67559bcca1bef2 Mon Sep 17 00:00:00 2001 From: brossardm Date: Mon, 21 Oct 2019 16:46:53 +0200 Subject: [PATCH 2/8] Use SVG symbol for pitch object in low resolution --- generate_style.py | 18 +- landusage.map | 49 +++++- osmbase.map | 10 +- symbols.txt | 16 ++ symbols/sports-soccer.svg | 348 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 426 insertions(+), 15 deletions(-) create mode 100644 symbols.txt create mode 100644 symbols/sports-soccer.svg diff --git a/generate_style.py b/generate_style.py index 5dd821e..769ea3e 100755 --- a/generate_style.py +++ b/generate_style.py @@ -184,7 +184,23 @@ 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"' + \'pitch\') order by area desc) as foo using unique osm_id using\ + srid=OSM_SRID"', + 17:'"geometry from (select geometry ,osm_id, type, name as name, CASE WHEN d12 < d23 THEN d12 ELSE d23 END as length,\ + area,360-(a12+a23+90)/2 as angle FROM (SELECT geometry, osm_id,\ + type, name, area,\ + ST_Distance(st_pointn(ST_Boundary(geometry),1),st_pointn(ST_Boundary(geometry),2))-20\ + as d12,ST_Distance(st_pointn(ST_Boundary(geometry),3),st_pointn(ST_Boundary(geometry),2))-20\ + as d23,\ + degrees(st_azimuth(st_pointn(ST_Boundary(geometry),1),st_pointn(ST_Boundary(geometry),2)))\ + as a12,\ + degrees(st_azimuth(st_pointn(ST_Boundary(geometry),2),st_pointn(ST_Boundary(geometry),3)))\ + as a23 FROM osm_new_landusages) as angle 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=2154"' }, 'industrial_clr': '"#d1d1d1"', diff --git a/landusage.map b/landusage.map index 420cad5..9540fed 100644 --- a/landusage.map +++ b/landusage.map @@ -1,11 +1,11 @@ #if _display_landusage == 1 LAYER + NAME layername(landuse,_layer_suffix) TYPE POLYGON STATUS ON PROJECTION "init=epsg:OSM_SRID" END - NAME layername(landuse,_layer_suffix) GROUP "default" CONNECTIONTYPE POSTGIS CONNECTION "OSM_DB_CONNECTION" @@ -17,6 +17,7 @@ LAYER PROCESSING "CLOSE_CONNECTION=DEFER" MAXSCALEDENOM _maxscale MINSCALEDENOM _minscale + SIZEUNITS meters CLASSITEM "type" LABELITEM "name" CLASS @@ -158,7 +159,7 @@ LAYER END #endif END - + CLASS EXPRESSION 'hospital' STYLE @@ -206,7 +207,7 @@ LAYER #endif END CLASS - EXPRESSION {sports_center,stadium,pitch} + EXPRESSION {sports_center,stadium} STYLE COLOR _sports_clr END @@ -218,7 +219,42 @@ LAYER SIZE _sports_lbl_size COLOR _sports_lbl_clr OUTLINECOLOR _sports_lbl_ol_clr - ENCODING "utf-8" + ENCODING "utf-8" + OUTLINEWIDTH _sports_lbl_ol_width + PRIORITY 1 + WRAP ' ' + MAXLENGTH 6 + ALIGN CENTER + MINFEATURESIZE AUTO + END +#endif + END + CLASS + NAME "pitch" + EXPRESSION "pitch" + STYLE + COLOR _sports_clr + END +#if _maxscale < 7000 + STYLE + GEOMTRANSFORM centroid + SYMBOL "soccer" + ANGLE [angle] + SIZE [length] + WIDTH 3 + MAXSCALEDENOM 7000 + MINSCALEDENOM 0 + END +#endif +#if _display_sports_lbl==1 + LABEL + TYPE TRUETYPE + PARTIALS FALSE + FONT _sports_font + SIZE _sports_lbl_size + COLOR _sports_lbl_clr + OUTLINECOLOR _sports_lbl_ol_clr + ENCODING "utf-8" OUTLINEWIDTH _sports_lbl_ol_width PRIORITY 1 WRAP ' ' @@ -228,6 +264,7 @@ LAYER END #endif END + END #if _display_transport_areas == 1 @@ -289,7 +326,7 @@ LAYER #endif DATA _waterarea_data MAXSCALEDENOM _maxscale - MINSCALEDENOM _minscale + MINSCALEDENOM _minscale PROCESSING "CLOSE_CONNECTION=DEFER" LABELITEM "name" CLASSITEM "type" @@ -358,7 +395,7 @@ LAYER CLASS EXPRESSION "river" STYLE - COLOR _river_clr + COLOR _river_clr WIDTH _river_width END #if _display_river_lbl == 1 diff --git a/osmbase.map b/osmbase.map index eae0d3d..483bf53 100644 --- a/osmbase.map +++ b/osmbase.map @@ -21,7 +21,7 @@ IMAGETYPE png MAXSIZE 4000 SIZE 800 800 EXTENT OSM_EXTENT -UNITS OSM_UNITS +UNITS OSM_UNITS IMAGECOLOR _ocean_clr0 WEB METADATA @@ -37,6 +37,7 @@ DEBUG _debug CONFIG "MS_ERRORFILE" "stderr" #endif +SYMBOLSET symbols.txt CONFIG "PROJ_LIB" _proj_lib PROJECTION "init=epsg:OSM_SRID" @@ -205,11 +206,4 @@ END #include "borders.map" #include "places.map" -SYMBOL - name "citycircle" - type ellipse - points 1 1 end - filled true -END - END diff --git a/symbols.txt b/symbols.txt new file mode 100644 index 0000000..2a9d212 --- /dev/null +++ b/symbols.txt @@ -0,0 +1,16 @@ +SYMBOLSET + + SYMBOL + name "citycircle" + type ellipse + points 1 1 end + filled true + END + + SYMBOL + name "soccer" + TYPE SVG + IMAGE symbols/sports-soccer.svg + END + +END diff --git a/symbols/sports-soccer.svg b/symbols/sports-soccer.svg new file mode 100644 index 0000000..d0c8ee2 --- /dev/null +++ b/symbols/sports-soccer.svg @@ -0,0 +1,348 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From a0fe57c1cd62aaccfb2047817695137af3f80463 Mon Sep 17 00:00:00 2001 From: brossardm Date: Tue, 22 Oct 2019 09:16:08 +0200 Subject: [PATCH 3/8] Revert using sport svg file --- cagc.mk | 4 ++- generate_style.py | 67 +++++++++++++++++++++++++++++++++-------------- landusage.map | 12 --------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/cagc.mk b/cagc.mk index 2e59ab9..61af22c 100644 --- a/cagc.mk +++ b/cagc.mk @@ -2,6 +2,8 @@ OSM_EXTENT=404276 6546698 645590 6691451 OSM_SRID=2154 OSM_UNITS=meters OSM_DB_CONNECTION=host=localhost dbname=osm user=www-data password=www-data port=5432 -STYLE=google +STYLE=cagc + +#define _sports_clr17="#55aa00" include Makefile diff --git a/generate_style.py b/generate_style.py index 769ea3e..6049263 100755 --- a/generate_style.py +++ b/generate_style.py @@ -185,23 +185,8 @@ \'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"', - 17:'"geometry from (select geometry ,osm_id, type, name as name, CASE WHEN d12 < d23 THEN d12 ELSE d23 END as length,\ - area,360-(a12+a23+90)/2 as angle FROM (SELECT geometry, osm_id,\ - type, name, area,\ - ST_Distance(st_pointn(ST_Boundary(geometry),1),st_pointn(ST_Boundary(geometry),2))-20\ - as d12,ST_Distance(st_pointn(ST_Boundary(geometry),3),st_pointn(ST_Boundary(geometry),2))-20\ - as d23,\ - degrees(st_azimuth(st_pointn(ST_Boundary(geometry),1),st_pointn(ST_Boundary(geometry),2)))\ - as a12,\ - degrees(st_azimuth(st_pointn(ST_Boundary(geometry),2),st_pointn(ST_Boundary(geometry),3)))\ - as a23 FROM osm_new_landusages) as angle 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=2154"' - }, + srid=OSM_SRID"' + }, 'industrial_clr': '"#d1d1d1"', 'industrial_ol_clr': '"#d1d1d1"', @@ -248,7 +233,7 @@ 'education_lbl_ol_clr': "255 255 255", 'education_lbl_ol_width': 2, - 'sports_clr': '"#DED1AB"', + 'sports_clr': '"#C2D1B2"', 'display_sports_lbl' : {0:0, 12:1}, 'sports_font': "sc", 'sports_lbl_size': 8, @@ -1148,6 +1133,50 @@ 14:2 } }, + 'cagc':{ + '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", + #'forest_clr': "143 205 135", + 'forest_clr': "192 227 187", + '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':{ 0:0, 15:1} + }, 'google':{ 'motorway_clr': "253 146 58", 'trunk_clr': "255 195 69", @@ -1486,7 +1515,7 @@ # these are the preconfigured styles that can be called when creating the final mapfile, # e.g. with `make STYLE=google`. This will create an osm-google.map mapfile style_aliases = { - + "cagc":"default,outlined,cagc", # 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", diff --git a/landusage.map b/landusage.map index 9540fed..40e1b7a 100644 --- a/landusage.map +++ b/landusage.map @@ -17,7 +17,6 @@ LAYER PROCESSING "CLOSE_CONNECTION=DEFER" MAXSCALEDENOM _maxscale MINSCALEDENOM _minscale - SIZEUNITS meters CLASSITEM "type" LABELITEM "name" CLASS @@ -235,17 +234,6 @@ LAYER STYLE COLOR _sports_clr END -#if _maxscale < 7000 - STYLE - GEOMTRANSFORM centroid - SYMBOL "soccer" - ANGLE [angle] - SIZE [length] - WIDTH 3 - MAXSCALEDENOM 7000 - MINSCALEDENOM 0 - END -#endif #if _display_sports_lbl==1 LABEL TYPE TRUETYPE From 4484c0980ead4b353548d20b489f27a7013196ae Mon Sep 17 00:00:00 2001 From: Magalie Brossard Date: Fri, 13 Nov 2020 09:07:33 +0100 Subject: [PATCH 4/8] =?UTF-8?q?[CAPC]=20Test=20modif=20fond=20de=20plan=20?= =?UTF-8?q?-=20Rivi=C3=A8res,=20for=C3=AAts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate_style.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generate_style.py b/generate_style.py index 6049263..6abeaef 100755 --- a/generate_style.py +++ b/generate_style.py @@ -1154,8 +1154,8 @@ }, 'pedestrian_clr': '250 250 245', #'forest_clr': "203 216 195", - #'forest_clr': "143 205 135", - 'forest_clr': "192 227 187", + 'forest_clr': "143 205 135", + #'forest_clr': "192 227 187", 'industrial_clr': "209 208 205", 'education_clr': "222 210 172", 'hospital_clr': "229 198 195", @@ -1164,7 +1164,8 @@ 'park_clr': '181 210 156', 'ocean_clr': '153 179 204', 'waterarea_clr': '153 179 204', - 'river_clr': '153 179 204', + #'river_clr': '153 179 204', + 'river_clr': '170 216 249', 'stream_clr': '153 179 204', 'canal_clr': '153 179 204', From 046ea1e8e573a063d083852f0e26f4f2a6215475 Mon Sep 17 00:00:00 2001 From: Magalie Brossard Date: Fri, 13 Nov 2020 10:09:14 +0100 Subject: [PATCH 5/8] =?UTF-8?q?[CAPC]=20Test=20modif=20fond=20de=20plan=20?= =?UTF-8?q?Google=20-=20Rivi=C3=A8res?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate_style.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generate_style.py b/generate_style.py index 6abeaef..a5e5f2e 100755 --- a/generate_style.py +++ b/generate_style.py @@ -1207,7 +1207,8 @@ 'park_clr': '181 210 156', 'ocean_clr': '153 179 204', 'waterarea_clr': '153 179 204', - 'river_clr': '153 179 204', + #'river_clr': '153 179 204', + 'river_clr': '170 216 249', 'stream_clr': '153 179 204', 'canal_clr': '153 179 204', From fe6dfa124788e989a61becde479c25ff85ad2fd7 Mon Sep 17 00:00:00 2001 From: Magalie Brossard Date: Fri, 13 Nov 2020 11:14:03 +0100 Subject: [PATCH 6/8] =?UTF-8?q?[CAPC]=20Test=20modif=20fond=20de=20plan=20?= =?UTF-8?q?-=20Rivi=C3=A8res?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate_style.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/generate_style.py b/generate_style.py index a5e5f2e..16bc00c 100755 --- a/generate_style.py +++ b/generate_style.py @@ -1162,12 +1162,16 @@ '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', + #'ocean_clr': '153 179 204', + 'ocean_clr': '170 216 249', + #'waterarea_clr': '153 179 204', + 'waterarea_clr': '170 216 249', #'river_clr': '153 179 204', 'river_clr': '170 216 249', - 'stream_clr': '153 179 204', - 'canal_clr': '153 179 204', + #'stream_clr': '153 179 204', + 'stream_clr': '170 216 249', + #'canal_clr': '153 179 204', + 'canal_clr': '170 216 249', 'motorway_ol_clr': '186 110 39', 'trunk_ol_clr': '221 159 17', @@ -1207,8 +1211,7 @@ 'park_clr': '181 210 156', 'ocean_clr': '153 179 204', 'waterarea_clr': '153 179 204', - #'river_clr': '153 179 204', - 'river_clr': '170 216 249', + 'river_clr': '153 179 204', 'stream_clr': '153 179 204', 'canal_clr': '153 179 204', From fba86bd68523929eb1227f8855cbf526616beeae Mon Sep 17 00:00:00 2001 From: Magalie Brossard Date: Fri, 13 Nov 2020 11:51:44 +0100 Subject: [PATCH 7/8] [CAPC] Test modif fond de plan - Pistes cyclables --- generate_style.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generate_style.py b/generate_style.py index 16bc00c..909987c 100755 --- a/generate_style.py +++ b/generate_style.py @@ -613,7 +613,8 @@ }, 'cycleway_pattern': '2 4', 'cycleway_ol_width': 1, - 'cycleway_ol_clr': "0 0 0", + #'cycleway_ol_clr': "0 0 0", + 'cycleway_ol_clr': "200 200 200", 'display_footways': { 0:0, 15:1 From ffd25d3c1d7c05f57c6fe4952bdf6698efeff589 Mon Sep 17 00:00:00 2001 From: Magalie Brossard Date: Fri, 13 Nov 2020 16:00:16 +0100 Subject: [PATCH 8/8] =?UTF-8?q?[Fond=20de=20plan]=20Cr=C3=A9ation=20d'un?= =?UTF-8?q?=20fond=20de=20plan=20OSM=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate_style.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/generate_style.py b/generate_style.py index 909987c..2cb8d14 100755 --- a/generate_style.py +++ b/generate_style.py @@ -1135,6 +1135,48 @@ } }, 'cagc':{ + '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': "192 227 187", + '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':{ 0:0, 15:1} + }, + 'cagc_2':{ 'motorway_clr': "253 146 58", 'trunk_clr': "255 195 69", 'primary_clr': {