diff --git a/images/building-grid-hi-contrast2.gif b/images/building-grid-hi-contrast2.gif new file mode 100644 index 0000000..4cff9d1 Binary files /dev/null and b/images/building-grid-hi-contrast2.gif differ diff --git a/images/building-grid-hi-contrast3.gif b/images/building-grid-hi-contrast3.gif new file mode 100644 index 0000000..afc6c84 Binary files /dev/null and b/images/building-grid-hi-contrast3.gif differ diff --git a/images/building-grid-hi-contrast4.gif b/images/building-grid-hi-contrast4.gif new file mode 100644 index 0000000..32e1ed5 Binary files /dev/null and b/images/building-grid-hi-contrast4.gif differ diff --git a/refill-style.yaml b/refill-style.yaml index 1ec98b8..7453106 100644 --- a/refill-style.yaml +++ b/refill-style.yaml @@ -2591,8 +2591,8 @@ layers: color: [[13, global.white_color], [16, global.light_color], [17, global.white_color]] width: [[13, 0px], [14, 0.15px], [16, 1px], [18, 2px], [20, 1m]] outline: - color: [[14, global.light_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] - width: [[13, 0px], [14, 0.25], [15, 0.5], [16, 0px], [17, 1px]] + color: [[14, global.lighter_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 0px], [15, 0.5px], [16, 0px], [17, 1px]] early: filter: $zoom: { max: 15 } @@ -2609,8 +2609,8 @@ layers: color: [[13, global.white_color], [16, global.light_color], [17, global.white_color]] width: [[13, 0px], [14, 0.15px], [16, 1px], [18, 2px], [20, 1m]] outline: - color: [[14, global.light_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] - width: [[13, 0px], [14, 0.25], [15, 0.5], [16, 0px], [17, 1px]] + color: [[14, global.lighter_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 0px], [15, 0.5px], [16, 0px], [17, 1px]] footway: filter: { kind_detail: footway } draw: @@ -2618,8 +2618,8 @@ layers: color: [[13, global.white_color], [16, global.light_color], [17, global.white_color]] width: [[13, 0px], [14, 0.15px], [16, 1px], [18, 2px], [20, 1m]] outline: - color: [[14, global.light_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] - width: [[13, 0px], [14, 0.25], [15, 0.5], [16, 0px], [17, 1px]] + color: [[14, global.lighter_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 0px], [15, 0.5px], [16, 0px], [17, 1px]] bridge: filter: { is_bridge: true } draw: @@ -2655,7 +2655,7 @@ layers: width: [[13, 0px], [14, 0.15px], [16, 1px], [18, 1.5px], [20, 1m]] outline: color: [[14, global.light_color], [15, global.white_color], [16, global.white_color], [17, global.light_color]] - width: [[13, 0px], [14, 0.25], [15, 0.5], [16, 1px], [17, 1px]] + width: [[13, 0px], [14, 0.25px], [15, 0.5px], [16, 1px], [17, 1px]] bridge: filter: { is_bridge: true } draw: @@ -2665,7 +2665,7 @@ layers: width: [[13, 0px], [14, 0.15px], [16, 1px], [18, 1.5px], [20, 1m]] outline: color: [[14, global.light_color], [15, global.white_color], [16, global.white_color], [17, global.dark_color]] - width: [[13, 0px], [14, 0.25], [15, 0.5], [16, 1px], [17, 1px]] + width: [[13, 0px], [14, 0.25px], [15, 0.5px], [16, 1px], [17, 1px]] cap: butt steps: filter: diff --git a/theme/high-contrast.yaml b/theme/high-contrast.yaml index de793a3..c250518 100644 --- a/theme/high-contrast.yaml +++ b/theme/high-contrast.yaml @@ -69,6 +69,92 @@ layers: fill: global.lightest_color roads: + major_road: + tertiary: + draw: + lines: + color: [[11, global.lighter_color], [16, global.dark_color], [17, global.white_color]] + width: [[11, 0.5px], [15, 1px], [16, 2px], [17, 6px], [18, 9m]] + outline: + color: [[11, global.white_color], [16, global.white_color], [17, global.black_color]] + width: [[11, 1px], [15, 2px], [17, 2px], [18, 2px]] + + minor_road: + draw: + lines: + color: [[11, global.offwhite_color], [16, global.midlight_color], [17, global.white_color]] + width: [[11, 0.35px], [13, 0.5px], [14, 0.75px], [15, 1px], [16, 1.5px], [17, 3.5px], [18, 9m]] + outline: + color: [[11, global.white_color], [16, global.white_color], [17, global.black_color]] + width: [[11, 0px], [15, 2px], [16, 3px], [17, 1.5px], [18, 1.5px]] + + service_road: + draw: + lines: + color: [[13, global.offwhite_color], [16, global.midlight_color], [17, global.white_color]] + width: [[13, 0px], [15, 0.75px], [16, 1px], [17, 2.5px], [18, 5m]] + outline: + color: [[13, global.white_color], [16, global.white_color], [17, global.black_color]] + width: [[13, 0px], [15, 2px], [16, 1px], [17, 1.5px], [19, 1.5px]] + path: + # draw: + # lines: + # color: [[13, global.light_color], [16, global.light_color], [17, global.white_color]] + # width: [[13, 0px], [14, 0.25px], [16, 0.5px], [18, 2px], [20, 1m]] + # outline: + # color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + # width: [[13, 0px], [14, 0.25px], [15, 1px], [16, 2px], [17, 1px]] + # pedestrian: + # draw: + # lines: + # color: [[13, global.light_color], [16, global.light_color], [17, global.white_color]] + # width: [[13, 0px], [14, 0.25px], [16, 0.5px], [18, 2px], [20, 1m]] + # outline: + # color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + # width: [[13, 0px], [14, 0.25px], [15, 1px], [16, 2px], [17, 1px]] + # footway: + # draw: + # lines: + # color: [[13, global.light_color], [16, global.light_color], [17, global.white_color]] + # width: [[13, 0px], [14, 0.25px], [16, 0.5px], [18, 2px], [20, 1m]] + # outline: + # color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + # width: [[13, 0px], [14, 0.25px], [15, 1px], [16, 2px], [17, 1px]] + + in_park: + filter: { landuse_kind: [park,nature_reserve,conservation,golf_course,garden,national_park] } + draw: + lines: + outline: + color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 2px], [15, 2px], [16, 3px], [17, 1px]] + + pedestrian: + in_park: + filter: { landuse_kind: [park,nature_reserve,conservation,golf_course,garden,national_park] } + draw: + lines: + outline: + color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 2px], [15, 2px], [16, 3px], [17, 1px]] + + track: + # draw: + # lines: + # color: [[13, global.light_color], [16, global.light_color], [17, global.white_color]] + # width: [[13, 0px], [14, 0.15px], [16, 0.5px], [18, 1.5px], [20, 1m]] + # outline: + # color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + # width: [[13, 0px], [14, 0.5px], [15, 1px], [16, 2px], [17, 1px]] + + in_park: + filter: { landuse_kind: [park,nature_reserve,conservation,golf_course,garden,national_park] } + draw: + lines: + outline: + color: [[14, global.white_color], [16, global.white_color], [17, global.light_color]] + width: [[13, 0px], [14, 2px], [15, 2px], [16, 3px], [17, 1px]] + railway: draw: railway_dash: @@ -80,7 +166,7 @@ layers: polygons: color: global.white_color lines: - color: [[14, global.light_color], [16, global.midlight_color], [19, global.dark_color]] + color: global.lighter_color # building footprints, pre-extrusion footprints: @@ -93,7 +179,7 @@ styles: building-grid: shaders: uniforms: - u_grid_color: global.black_color + u_grid_color: global.light_color waves: shaders: @@ -105,7 +191,11 @@ styles: pixel-pattern-light: shaders: uniforms: - u_tint: [0.90,0.90,0.90] #global.lightest_color + u_tint: [0.980,0.980,0.980] #global.lightest_color + blocks: + filter: | + vec3 pos = vec3(getTileCoords()*110.0,1.0); + color.rgb = u_tint * vec3(random(abs(floor(pos)))+0.805); pixel-pattern-bright: @@ -120,4 +210,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast.gif + url: ../images/building-grid-hi-contrast3.gif diff --git a/theme/inverted.yaml b/theme/inverted.yaml index e1016d6..5c53785 100644 --- a/theme/inverted.yaml +++ b/theme/inverted.yaml @@ -5,10 +5,10 @@ global: mid_color: [0.500,0.500,0.500] midlight_color: [0.375,0.375,0.375] light_color: [0.250,0.250,0.250] - lighter_color: [0.150,0.150,0.150] - lightest_color: [0.120,0.120,0.120] - ultralight_color: [0.090,0.090,0.090] - offwhite_color: [0.070,0.070,0.070] + lighter_color: [0.180,0.180,0.180] + lightest_color: [0.140,0.140,0.140] + ultralight_color: [0.120,0.120,0.120] + offwhite_color: [0.100,0.100,0.100] white_color: [0.00,0.00,0.00] transparent: [0.270,0.270,0.270,0.250] route_line: [0.000,0.500,1.000] @@ -139,3 +139,7 @@ styles: # uniforms: # u_tint: [1, 1, 1] # u_fill: [0, 0, 0] + +textures: + building-grid: + url: ../images/building-grid-hi-contrast3.gif