diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 46ca90a9e..0132fcf83 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -343,13 +343,7 @@ area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], area|z14-[landuse=cemetery], area|z14-[amenity=university], -area|z15-[landuse=garages], -area|z15-[landuse=industrial], -area|z15-[landuse=construction], area|z15-[landuse=churchyard], -area|z15-[landuse=landfill], -area|z15-[landuse=railway], -area|z15-[landuse=quarry], area|z15-[leisure=pitch], area|z15-[leisure=stadium], area|z15-[leisure=track][area?], @@ -368,13 +362,17 @@ area|z15-[amenity=university], /* 7.1 Industrial */ -area|z15-[landuse=industrial], -area|z15-[landuse=construction], -area|z15-[landuse=landfill], -area|z15-[landuse=railway], -area|z15-[landuse=quarry], -area|z15-[landuse=garages], -{fill-color: @industrial;} +area|z13-[landuse=industrial], +area|z13-[man_made=works], +area|z13-[landuse=construction], +area|z13-[landuse=landfill], +area|z13-[amenity=waste_transfer_station], +area|z13-[landuse=railway], +area|z13-[landuse=quarry], +area|z13-[power=plant], +area|z13-[power=substation], +area|z13-[power=generator], +{fill-opacity: 1; fill-color: @industrial;} /* 7.2 Hospital */ @@ -456,6 +454,7 @@ area|z13-[emergency=mountain_rescue], area|z13-[leisure=resort], area|z13-[highway=services], area|z13-[highway=rest_area], +area|z13-[landuse=garages], area|z15-[leisure=dog_park], area|z15-[amenity=police], diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 94a56deea..0365196be 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -64,6 +64,7 @@ emergency-mountain_rescue highway-services highway-rest_area highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-) +landuse-garages leisure-dog_park leisure-resort # area z15- (also has icon z16-, caption(optional) z16-) leisure-water_park @@ -150,12 +151,26 @@ landuse-forest-deciduous # area z10- (also has icon z landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-) === 60 +amenity-waste_transfer_station landuse-churchyard # area z15- landuse-construction # area z15- (also has caption z15-) landuse-industrial # area z15- (also has caption z15-) landuse-industrial-mine # area z15- (also has icon z15-, caption(optional) z15-) landuse-quarry # area z15- (also has icon z15-, caption(optional) z15-) landuse-railway # area z15- (also has caption z15-) +man_made-works +power-plant +power-plant-coal +power-plant-gas +power-plant-hydro +power-plant-solar +power-plant-wind +power-substation +power-generator +power-generator-gas +power-generator-hydro +power-generator-solar +power-generator-wind === 50 amenity-college # area z15- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index d20a8d50b..c5a5a04d1 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -151,12 +151,26 @@ landuse-forest-deciduous # area z10- (also has icon z landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) === 60 +amenity-waste_transfer_station landuse-churchyard # area z15- landuse-construction # area z15- (also has caption z15-) landuse-industrial # area z15- (also has caption z15-) landuse-industrial-mine # area z15- (also has icon z15-, caption(optional) z15-) landuse-quarry # area z15- (also has icon z15-, caption(optional) z15-) landuse-railway # area z15- (also has caption z15-) +man_made-works +power-plant +power-plant-coal +power-plant-gas +power-plant-hydro +power-plant-solar +power-plant-wind +power-substation +power-generator +power-generator-gas +power-generator-hydro +power-generator-solar +power-generator-wind === 50 amenity-college # area z15- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 7fffb81bf..7cce6bdb9 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -416,7 +416,6 @@ piste:type-sled # line z12- (also has pathte === 120 building:part # area z16- -landuse-garages # area z15- === 110 barrier-retaining_wall # line z16- diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index 57c4c5489..d1f675b35 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -292,27 +292,23 @@ area|z14-[area:highway=living_street], area|z14-[amenity=grave_yard], area|z14-[landuse=cemetery], area|z14-[amenity=university], -area|z15-[landuse=garages], -area|z15-[landuse=construction], -area|z15-[landuse=churchyard], -area|z15-[landuse=landfill], -area|z15-[landuse=railway], -area|z15-[landuse=quarry], area|z15-[leisure=stadium], area|z15-[amenity=parking], -area|z16-[public_transport=platform], -area|z16-[railway=platform], {fill-opacity: 1;} /* 7.1 Industrial */ area|z15-[landuse=industrial], +area|z15-[man_made=works], area|z15-[landuse=construction], area|z15-[landuse=landfill], +area|z15-[amenity=waste_transfer_station], area|z15-[landuse=railway], area|z15-[landuse=quarry], -area|z15-[landuse=garages], -{fill-color: @industrial;fill-opacity: 1;} +area|z15-[power=plant], +area|z15-[power=substation], +area|z15-[power=generator], +{fill-opacity: 1; fill-color: @industrial;} /* 7.2 Hospital */ diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index e8d77cc8f..2097bd478 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -86,6 +86,7 @@ landuse-forest-deciduous # area z10- (also has icon z landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z12-) === 50 +amenity-waste_transfer_station landuse-churchyard # area z15- landuse-construction # area z15- landuse-industrial # area z15- @@ -93,6 +94,19 @@ landuse-industrial-mine # area z15- landuse-landfill # area z15- (also has caption z15-) landuse-quarry # area z15- (also has caption z15-) landuse-railway # area z15- (also has caption z15-) +man_made-works +power-plant +power-plant-coal +power-plant-gas +power-plant-hydro +power-plant-solar +power-plant-wind +power-substation +power-generator +power-generator-gas +power-generator-hydro +power-generator-solar +power-generator-wind === 40 aeroway-aerodrome # area z10- (also has icon z14-, caption(optional) z14-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 72eb922c9..72af66213 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -331,7 +331,6 @@ railway-subway-bridge::bridgeblack # line::bridgeblack z16- (al === 100 building:part # area z16- -landuse-garages # area z15- === 90 barrier-retaining_wall # line z17-