Merge pull request #95 from camptocamp/transparent

ADD possibility to manage transparency at the layer level

Author: yjacolin

borders.map

@@ -7,6 +7,9 @@ LAYER
    TYPE LINE
    NAME layername(admin_fr,_layer_suffix)
    DATA _admin_data
+   COMPOSITE
+     OPACITY _admin_opacity
+   END # COMPOSITE
    CLASS
       STYLE
          COLOR _admin_clr
@@ -26,6 +29,9 @@ LAYER
    PROJECTION
      _border_epsg
    END
+   COMPOSITE
+     OPACITY _border_opacity
+   END # COMPOSITE
    DATA _border_data
 #if _display_border_2 == 1
    CLASS

buildings.map

@@ -18,6 +18,9 @@ LAYER
     PROCESSING "CLOSE_CONNECTION=DEFER"
     MAXSCALEDENOM _maxscale
     MINSCALEDENOM _minscale
+    COMPOSITE
+        OPACITY _building_opacity
+    END # COMPOSITE
     CLASS
       STYLE
          COLOR _building_clr

generate_style.py

@@ -77,6 +77,7 @@
       0:'"data/simplified_land_polygons"',
       9:'"data/land_polygons"'
    },
+   'land_opacity': 100,
    'land_epsg': {
       0:'"init=epsg:3857"',
    },
@@ -90,6 +91,7 @@
    },
    'display_waterarea_lbl' : {0:0, 6:1},
    'display_waterarea_outline': {0:0, 14:1},
+   'waterarea_opacity': 100,
    'waterarea_clr': '"#B3C6D4"',
    'waterarea_ol_clr': '"#B3C6D4"',
    'waterarea_ol_width': 0,
@@ -109,6 +111,7 @@
       9:'"geometry from (select geometry, osm_id, type, OSM_NAME_COLUMN as name from OSM_SCHEMA.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_SCHEMA.OSM_PREFIX_waterways) as foo using unique osm_id using srid=OSM_SRID"'
    },
+   'waterways_opacity': 100,
 
    'canal_width': {
       0:0,
@@ -188,7 +191,7 @@
       \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\
       \'pitch\',\'pier\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"'
    },
-
+   'landusage_opacity': 100,
    'display_industrial': 1,
    'industrial_clr': '"#d1d1d1"',
    'industrial_ol_clr': '"#d1d1d1"',
@@ -266,6 +269,7 @@
    'forest_lbl_ol_width': 2,
 
    'display_transport_areas' : {0:0,11:1},
+   'transport_opacity': 100,
    'transport_clr': '200 200 200',
    'display_transport_lbl' : {0:0, 12:1},
    'transport_font': "sc",
@@ -284,6 +288,7 @@
       11:'"geometry from (select osm_id,geometry,OSM_NAME_COLUMN as name,ref,type from OSM_SCHEMA.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_SCHEMA.OSM_PREFIX_roads order by z_order asc, st_length(geometry) asc) as foo using unique osm_id using srid=OSM_SRID"',
    },
+   'roads_opacity': 100,
 
    'tunnel_opacity': 40,
 
@@ -659,6 +664,7 @@
       0:0,
       8:1
    },
+   'railway_opacity': 100,
    'railway_clr': '"#777777"',
    'railway_width': {
       0:0.5,
@@ -680,6 +686,7 @@
    'border_epsg': {
       0: '"init=epsg:4326"'
    },
+   'border_opacity': 100,
 
    'display_border_2': {
       0:1
@@ -789,6 +796,7 @@
       0: 0,
       15:1
    },
+   'building_opacity': 100,
    'building_clr': '"#bbbbbb"',
    'building_ol_clr': '"#333333"',
    'building_ol_width': {
@@ -812,6 +820,7 @@
       0:0,
       10:1
    },
+   'aeroways_opacity': 100,
    'runway_clr': "180 180 180",
    'runway_width': {
       0:1,
@@ -850,6 +859,7 @@
       11: '"geometry from (select * from OSM_SCHEMA.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_SCHEMA.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"',
    },
+   'places_opacity': 100,
    'display_capitals': 0,
    'display_capital_symbol': {
       0:1,

highways.map

@@ -14,6 +14,9 @@ LAYER
     MAXSCALEDENOM _maxscale
     TYPE LINE
     NAME layername(railways,_layer_suffix)
+    COMPOSITE
+     OPACITY _railway_opacity
+    END # COMPOSITE
     DATA _railways_data
     CLASSITEM "tunnel"
     CLASS
@@ -48,6 +51,9 @@ LAYER
     MINSCALEDENOM _minscale
     MAXSCALEDENOM _maxscale
     NAME layername(roads,_layer_suffix)
+    COMPOSITE
+     OPACITY _roads_opacity
+    END # COMPOSITE
     PROJECTION
         "init=epsg:OSM_SRID"
     END
@@ -56,6 +62,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+    COMPOSITE
+     OPACITY 20
+    END # COMPOSITE
     DATA _roads_data
     LABELITEM "name"
     CLASSITEM "type"
@@ -930,6 +939,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+    COMPOSITE
+     OPACITY _aeroways_opacity
+    END # COMPOSITE
     DATA "geometry from (select geometry, osm_id, type from OSM_SCHEMA.OSM_PREFIX_aeroways) as foo using unique osm_id using srid=OSM_SRID"
     CLASSITEM "type"
     CLASS

land.map

@@ -10,6 +10,9 @@ LAYER
    END
    MINSCALEDENOM _minscale
    MAXSCALEDENOM _maxscale
+   COMPOSITE
+     OPACITY _land_opacity
+   END # COMPOSITE
    DATA _land_data
    CLASS
        STYLE

landusage.map

@@ -12,6 +12,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+    COMPOSITE
+      OPACITY _landusage_opacity
+    END # COMPOSITE
     DATA _landusage_data
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -257,6 +260,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+   COMPOSITE
+     OPACITY _transport_opacity
+   END # COMPOSITE
    DATA "geometry from OSM_SCHEMA.OSM_PREFIX_transport_areas using unique osm_id using srid=OSM_SRID"
    PROCESSING "CLOSE_CONNECTION=DEFER"
    MAXSCALEDENOM _maxscale
@@ -300,6 +306,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+    COMPOSITE
+      OPACITY _waterarea_opacity
+    END # COMPOSITE
     DATA _waterarea_data
     MAXSCALEDENOM _maxscale
     MINSCALEDENOM _minscale  
@@ -359,6 +368,9 @@ LAYER
 #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
 #endif
+    COMPOSITE
+      OPACITY _waterways_opacity
+    END # COMPOSITE
     DATA _waterways_data
     CLASSITEM "type"
     MAXSCALEDENOM _maxscale
@@ -456,6 +468,9 @@ LAYER
   #if OSM_FORCE_POSTGIS_EXTENT == 1
     EXTENT OSM_EXTENT
   #endif
+    COMPOSITE
+      OPACITY _landusage_opacity
+    END # COMPOSITE
     DATA _landusage_data
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"

places.map

@@ -14,6 +14,9 @@ LAYER
  NAME layername(places,_layer_suffix)
  MINSCALEDENOM _minscale
  MAXSCALEDENOM _maxscale
+ COMPOSITE
+   OPACITY _places_opacity
+ END # COMPOSITE
  DATA _places_data
  LABELITEM 'name'
  CLASSITEM 'type'