Skip to content

Commit

Permalink
Merge pull request #3197 from nebulon42/project-whitespace
Browse files Browse the repository at this point in the history 
fix trailing whitespace in project.mml and .mss files
  • Loading branch information
@nebulon42
nebulon42 authored Apr 27, 2018
2 parents 562f29a + 33e6555 commit 86fbe0f
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 44 deletions.
36 changes: 18 additions & 18 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_bbq'][zoom >= 17] {
marker-file: url('symbols/bbq.svg');
marker-fill: @amenity-brown;
Expand Down Expand Up @@ -159,7 +159,7 @@
marker-clip: false;
}

// Ford tagging on points - ford on lines is defined later
// Ford tagging on points - ford on lines is defined later
[feature = 'highway_ford'][zoom >= 16] {
marker-file: url('symbols/ford.svg');
marker-fill: @transportation-icon;
Expand Down Expand Up @@ -347,7 +347,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_shower'][zoom >= 18] {
marker-file: url('symbols/shower.svg');
marker-fill: @amenity-brown;
Expand All @@ -374,7 +374,7 @@
[zoom >= 16][height > 40],
[zoom >= 17][height > 20],
[zoom >= 18] {
["tower:type" != 'lighting'] {
["tower:type" != 'lighting'] {
marker-file: url('symbols/towers/mast.svg');
marker-fill: @man-made-icon;
marker-placement: interior;
Expand All @@ -385,7 +385,7 @@
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
}
["tower:type" = 'communication'] {
marker-file: url('symbols/towers/mast_communications.svg');
}
Expand All @@ -404,10 +404,10 @@
marker-placement: interior;
marker-clip: false;
["tower:type" = 'defensive'] {
marker-file: url('symbols/towers/tower_defensive.svg');
marker-file: url('symbols/towers/tower_defensive.svg');
}
["tower:type" = 'observation'] {
marker-file: url('symbols/towers/tower_observation.svg');
marker-file: url('symbols/towers/tower_observation.svg');
}
["tower:type" = 'bell_tower'] {
marker-file: url('symbols/towers/bell_tower.svg');
Expand All @@ -417,7 +417,7 @@
["tower:construction" = 'lattice'] {
marker-file: url('symbols/towers/tower_lattice_lighting.svg');
}
}
}
["tower:construction" = 'lattice'] {
marker-file: url('symbols/towers/tower_lattice.svg');
}
Expand Down Expand Up @@ -534,7 +534,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_police'][zoom >= 16] {
marker-file: url('symbols/police.svg');
marker-fill: @public-service;
Expand Down Expand Up @@ -1096,7 +1096,7 @@
marker-placement: interior;
marker-clip: false;
}

[feature = 'leisure_firepit'][zoom >= 17] {
marker-file: url('symbols/firepit.svg');
marker-fill: @amenity-brown;
Expand All @@ -1118,7 +1118,7 @@
marker-clip: false;
}

// Slipway tagging on points - slipway on lines is defined later
// Slipway tagging on points - slipway on lines is defined later
[feature = 'leisure_slipway'][zoom >= 17] {
marker-file: url('symbols/transport_slipway.p.20.svg');
marker-fill: @transportation-icon;
Expand Down Expand Up @@ -1196,10 +1196,10 @@

[feature = 'military_bunker'][zoom >= 17] {
marker-file: url('symbols/bunker.svg');
marker-fill: @man-made-icon;
marker-fill: @man-made-icon;
marker-placement: interior;
marker-clip: false;
}
}

[feature = 'natural_spring'][zoom >= 14] {
marker-file: url('symbols/spring.svg');
Expand Down Expand Up @@ -1230,8 +1230,8 @@
marker-placement: interior;
marker-clip: false;
}
// waste_disposal tagging on ways - tagging on nodes is defined later

// waste_disposal tagging on ways - tagging on nodes is defined later
[feature = 'amenity_waste_disposal'][zoom >= 19] {
[access = null],
[access = 'permissive'],
Expand Down Expand Up @@ -1330,7 +1330,7 @@
marker-placement: interior;
}

// waste_disposal tagging on nodes - tagging on ways is defined earlier
// waste_disposal tagging on nodes - tagging on ways is defined earlier
[feature = 'amenity_waste_disposal'][zoom >= 19]::amenity {
[access = null],
[access = 'permissive'],
Expand Down Expand Up @@ -1646,7 +1646,7 @@
text-halo-fill: @standard-halo-fill;
text-placement: interior;
}

[feature = 'military_bunker'][zoom >= 17],
[feature = 'historic_wayside_shrine'][zoom >= 17] {
text-name: "[name]";
Expand Down Expand Up @@ -2033,7 +2033,7 @@
text-dy: 6;
}
}

[feature = 'amenity_shower'][zoom >= 18] {
text-name: "[name]";
text-size: @standard-font-size;
Expand Down
8 changes: 4 additions & 4 deletions landcover.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'amenity_parking_space'][zoom >= 18] {
line-width: 0.3;
line-color: mix(@parking-outline, @parking, 50%);
Expand Down Expand Up @@ -724,12 +724,12 @@
[landuse = 'military'][zoom >= 13] {
polygon-pattern-file: url('symbols/military_red_hatch.png');
polygon-pattern-alignment: global;
line-color: @military;
line-color: @military;
line-opacity: 0.24;
line-width: 1.0;
line-width: 1.0;
line-offset: -0.5;
[zoom >= 15] {
line-width: 2;
line-width: 2;
line-offset: -1.0;
}
}
Expand Down
1 change: 0 additions & 1 deletion placenames.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,4 +405,3 @@
}
}
}

40 changes: 20 additions & 20 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ Layer:
<<: *osm2pgsql
table: |-
(SELECT
way,
waterway,
way,
waterway,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
FROM planet_osm_line
Expand All @@ -199,7 +199,7 @@ Layer:
way,
waterway,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent
FROM planet_osm_line
WHERE waterway = 'river'
Expand Down Expand Up @@ -229,7 +229,7 @@ Layer:
name,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent
FROM planet_osm_polygon
WHERE
Expand Down Expand Up @@ -286,12 +286,12 @@ Layer:
<<: *osm2pgsql
table: |-
(SELECT
way,
waterway,
name,
way,
waterway,
name,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,
'no' AS bridge
FROM planet_osm_line
Expand Down Expand Up @@ -872,7 +872,7 @@ Layer:
ELSE NULL
END AS access,
construction,
CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') OR leisure IN ('slipway') THEN 'INT-minor'::text
CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') OR leisure IN ('slipway') THEN 'INT-minor'::text
ELSE 'INT-normal'::text END AS service,
'no' AS link,
COALESCE(layer,0) AS layernotnull,
Expand Down Expand Up @@ -979,8 +979,8 @@ Layer:
waterway,
name,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,
'yes' AS bridge
FROM planet_osm_line
Expand Down Expand Up @@ -1447,7 +1447,7 @@ Layer:
'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq') THEN amenity ELSE NULL END,
'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
'office_' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR tags->'office' IS NULL THEN NULL ELSE tags->'office' END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table',
Expand All @@ -1457,7 +1457,7 @@ Layer:
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END
Expand Down Expand Up @@ -1569,7 +1569,7 @@ Layer:
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway
WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END,
Expand Down Expand Up @@ -1841,7 +1841,7 @@ Layer:
FROM planet_osm_polygon
WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform')
OR railway IN ('platform')
OR (place IN ('square')
OR (place IN ('square')
AND (leisure IS NULL OR NOT leisure IN ('park', 'common', 'recreation_ground', 'garden')))
AND name IS NOT NULL
ORDER BY way_area DESC
Expand Down Expand Up @@ -2176,7 +2176,7 @@ Layer:
'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 'musical_instrument',
'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts',
'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games') THEN shop
WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
'office_' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR tags->'office' IS NULL THEN NULL ELSE tags->'office' END,
Expand Down Expand Up @@ -2340,7 +2340,7 @@ Layer:
lock,
name,
CASE WHEN tags->'intermittent' IN ('yes')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
THEN 'yes' ELSE 'no' END AS int_intermittent,
CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
FROM planet_osm_line
Expand Down Expand Up @@ -2412,7 +2412,7 @@ Layer:
COALESCE(
'highway_' || CASE WHEN highway IN ('mini_roundabout') THEN highway ELSE NULL END,
'railway_' || CASE WHEN railway IN ('level_crossing', 'crossing') THEN railway ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench',
'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench',
'waste_basket', 'waste_disposal') THEN amenity ELSE NULL END,
'historic_' || CASE WHEN historic IN ('wayside_cross', 'wayside_shrine') THEN historic ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('cross') THEN man_made ELSE NULL END,
Expand Down
2 changes: 1 addition & 1 deletion roads.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[construction = 'cycleway'],
[construction = 'bridleway'],
[construction = 'path'],
[construction = 'track'],
[construction = 'track'],
[construction = 'steps']{
[zoom < 14] {
line-width: 0;
Expand Down

0 comments on commit 86fbe0f

Please sign in to comment.