Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix style issues from editorconfig configuration #4966

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Fix style issues from editorconfig configuration #4966

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0d1a4bb
Remove trailing whitespace
hiddewie May 10, 2024
99ae278
More trailing whitespace in styles
hiddewie May 10, 2024
c515323
More trailing whitespace in project.mml
hiddewie May 10, 2024
75ad76e
Add CI check
hiddewie May 10, 2024
32486dc
more trailing spaces
hiddewie May 10, 2024
5e257af
Use `zbeekman/EditorConfig-Action` to validate editorconfig entirely
hiddewie May 11, 2024
4fb1c4f
no versioning...
hiddewie May 11, 2024
8e71f53
master branch
hiddewie May 11, 2024
22a82a5
cache and download editorconfig-checker
hiddewie May 11, 2024
cb7bd87
run
hiddewie May 11, 2024
77abd0c
Try megalinter
hiddewie May 11, 2024
a681584
Only enable editorconfig
hiddewie May 11, 2024
dd911a4
use Docker run command for linter
hiddewie May 11, 2024
ee85762
linting fixes changelog
hiddewie May 11, 2024
067989d
linting fixes contributing
hiddewie May 11, 2024
619a946
linting fixes docker
hiddewie May 11, 2024
13e8556
linting fixes install
hiddewie May 11, 2024
70eb324
linting fixes readme
hiddewie May 11, 2024
bfd1460
linting fixes openstreetmap-carto.lua
hiddewie May 11, 2024
6b5eeb9
disable indent size check, too many style errors
hiddewie May 11, 2024
a4be6e4
newline in scripts/readme
hiddewie May 11, 2024
7642f3f
last newline
hiddewie May 11, 2024
27b7a27
Update ci.yml
hiddewie May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
scripts/indexes.py --notexist > /dev/null &&
scripts/indexes.py --null > /dev/null &&
scripts/indexes.py --null > /dev/null
- name: Check for trailing whitespace
run: |
! grep --quiet ' $' style/*.mss project.mml
hiddewie marked this conversation as resolved.
Show resolved Hide resolved
import:
needs: [syntax]
runs-on: ubuntu-22.04
Expand Down
8 changes: 4 additions & 4 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Layer:
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,
CASE WHEN tunnel IN ('yes', 'culvert')
CASE WHEN tunnel IN ('yes', 'culvert')
OR waterway = 'canal' AND tunnel = 'flooded'
THEN 'yes' ELSE 'no' END AS int_tunnel,
'no' AS bridge
Expand Down Expand Up @@ -893,7 +893,7 @@ Layer:
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,
CASE WHEN tunnel IN ('yes', 'culvert')
CASE WHEN tunnel IN ('yes', 'culvert')
OR waterway = 'canal' AND tunnel = 'flooded'
THEN 'yes' ELSE 'no' END AS int_tunnel,
'yes' AS bridge
Expand Down Expand Up @@ -1623,7 +1623,7 @@ Layer:
) AS feature,
CASE WHEN access IN ('private', 'no', 'customers', 'permit', 'delivery') THEN 'restricted' ELSE 'yes' END AS int_access,
CASE
WHEN "natural" IN ('peak', 'volcano', 'saddle')
WHEN "natural" IN ('peak', 'volcano', 'saddle')
OR tags->'mountain_pass' = 'yes' THEN
CASE
WHEN tags->'ele' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'ele')::NUMERIC
Expand Down Expand Up @@ -2204,7 +2204,7 @@ Layer:
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,
CASE WHEN tunnel IN ('yes', 'culvert')
CASE WHEN tunnel IN ('yes', 'culvert')
OR waterway = 'canal' AND tunnel = 'flooded'
THEN 'yes' ELSE 'no' END AS int_tunnel
FROM planet_osm_line
Expand Down
4 changes: 2 additions & 2 deletions style/amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,8 +1476,8 @@
[zoom >= 18] {
[feature = 'amenity_parking'] { marker-file: url('symbols/amenity/parking.svg'); }
[feature = 'amenity_parking']["parking" = 'street_side'],
[feature = 'amenity_parking']["parking" = 'lane'] {
marker-file: url('symbols/amenity/parking_subtle.svg');
[feature = 'amenity_parking']["parking" = 'lane'] {
marker-file: url('symbols/amenity/parking_subtle.svg');
}
[feature = 'amenity_bicycle_parking'] { marker-file: url('symbols/amenity/bicycle_parking.svg'); }
[feature = 'amenity_motorcycle_parking'] { marker-file: url('symbols/amenity/motorcycle_parking.svg'); }
Expand Down
2 changes: 1 addition & 1 deletion style/fonts.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ A regular style.
"Noto Sans Vai Regular",
"Noto Sans Yi Regular",
"Noto Sans CJK JP Regular",

"Noto Serif Tibetan Regular",
"Noto Emoji Regular",

Expand Down
29 changes: 15 additions & 14 deletions style/roads.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line-pattern-join: round;
}
}
}
}

[feature = 'highway_secondary'] {
[zoom >= 9][link != 'yes'],
Expand Down Expand Up @@ -1742,7 +1742,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-width: @secondary-width-z12 - 2 * @secondary-casing-width-z12;
line-pattern-file: url("symbols/unpaved/unpaved_secondary-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_secondary-fill.svg");
line-pattern-cap: round;
line-pattern-join: round;
[zoom >= 13] {
Expand Down Expand Up @@ -1841,7 +1841,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-width: @tertiary-width-z12 - 2 * @casing-width-z12;
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
[zoom >= 13] { line-pattern-width: @tertiary-width-z13 - 2 * @casing-width-z13; }
[zoom >= 14] { line-pattern-width: @tertiary-width-z14 - 2 * @casing-width-z14; }
[zoom >= 15] { line-pattern-width: @tertiary-width-z15 - 2 * @casing-width-z15; }
Expand Down Expand Up @@ -1932,7 +1932,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 19] { line-pattern-width: @residential-width-z19 - 2 * @casing-width-z19; }
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
#bridges {
line-pattern-width: @residential-width-z13 - 2 * @bridge-casing-width-z13;
[zoom >= 14] { line-pattern-width: @residential-width-z14 - 2 * @bridge-casing-width-z14; }
Expand Down Expand Up @@ -1990,7 +1990,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 19] { line-pattern-width: @living-street-width-z19 - 2 * @casing-width-z19; }
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_living-street-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_living-street-fill.svg");
#bridges {
line-pattern-width: @living-street-width-z13 - 2 * @casing-width-z13;
[zoom >= 14] { line-pattern-width: @living-street-width-z14 - 2 * @bridge-casing-width-z14; }
Expand All @@ -2003,7 +2003,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line-pattern-join: round;
line-pattern-cap: round;
}
}
}

[feature = 'highway_road'] {
[zoom >= 10] {
Expand Down Expand Up @@ -2047,7 +2047,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 19] { line-pattern-width: @road-width-z19 - 2 * @casing-width-z19; }
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_road-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_road-fill.svg");
#bridges {
line-pattern-width: @road-width-z14 - 2 * @bridge-casing-width-z14;
[zoom >= 16] { line-pattern-width: @road-width-z16 - 2 * @bridge-casing-width-z16; }
Expand Down Expand Up @@ -2110,7 +2110,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 17][service = 'INT-minor'] {
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_residential-fill.svg");
[service = 'INT-normal'] {
line-pattern-width: @service-width-z14 - 2 * @casing-width-z14;
[zoom >= 16] { line-pattern-width: @service-width-z16 - 2 * @casing-width-z16; }
Expand Down Expand Up @@ -2183,7 +2183,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 19] { line-pattern-width: @pedestrian-width-z19 - 2 * @casing-width-z19; }
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_pedestrian-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_pedestrian-fill.svg");
#bridges {
line-pattern-width: @pedestrian-width-z14 - 2 * @bridge-casing-width-z14;
[zoom >= 15] { line-pattern-width: @pedestrian-width-z15 - 2 * @bridge-casing-width-z15; }
Expand Down Expand Up @@ -2216,7 +2216,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[zoom >= 12] {
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_raceway-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_raceway-fill.svg");
line-pattern-width: 1.2;
line-pattern-join: round;
line-pattern-cap: round;
Expand Down Expand Up @@ -2251,7 +2251,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
b/line-pattern-width: 4;
b/line-pattern-type: repeat;
b/line-pattern-alignment: global;
b/line-pattern-file: url("symbols/unpaved/unpaved_platform-fill.svg");
b/line-pattern-file: url("symbols/unpaved/unpaved_platform-fill.svg");
b/line-pattern-cap: round;
b/line-pattern-join: round;
}
Expand Down Expand Up @@ -2539,6 +2539,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
line-dasharray: 5,2;
}
}

[zoom >= 12] {
#roads-fill, #bridges {
dark/line-join: round;
Expand Down Expand Up @@ -2764,7 +2765,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
b/line-pattern-width: 4;
b/line-pattern-type: repeat;
b/line-pattern-alignment: global;
b/line-pattern-file: url("symbols/unpaved/unpaved_platform-fill.svg");
b/line-pattern-file: url("symbols/unpaved/unpaved_platform-fill.svg");
b/line-pattern-cap: round;
b/line-pattern-join: round;
}
Expand Down Expand Up @@ -3559,7 +3560,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[int_surface = 'unpaved'] {
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_aeroway-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_aeroway-fill.svg");
line-pattern-width: 2;
[zoom >= 12] { line-pattern-width: 4; }
[zoom >= 13] { line-pattern-width: 6; }
Expand Down Expand Up @@ -3593,7 +3594,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
[int_surface = 'unpaved'] {
line-pattern-type: repeat;
line-pattern-alignment: global;
line-pattern-file: url("symbols/unpaved/unpaved_aeroway-fill.svg");
line-pattern-file: url("symbols/unpaved/unpaved_aeroway-fill.svg");
line-pattern-width: 1;
[zoom >= 13] { line-pattern-width: 2; }
[zoom >= 14] { line-pattern-width: 4; }
Expand Down
4 changes: 2 additions & 2 deletions style/tourism.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
line-width: 2.5 + @bridge-casing-width-z16;
line-color: #000;
line-join: round;

[tunnel = 'yes'] { line-color: lighten(#000, 20%); }

[zoom >= 17] { line-width: 4 + @bridge-casing-width-z17; }
Expand All @@ -33,7 +33,7 @@
[tunnel = 'yes'][zoom >= 16] {
line-color: lighten(@roller-coaster-casing, 20%);
}
[zoom >= 16] {
[zoom >= 16] {
line-color: @roller-coaster-casing;
line-width: 2.5;
}
Expand Down
Loading