Use "#" in color scheme.

This commit is contained in:
Sergey Vartanov 2020-09-27 01:34:20 +03:00
parent 8d2c92e30c
commit 36ada6872c
2 changed files with 58 additions and 58 deletions

View file

@ -2,66 +2,66 @@ colors:
# Entity
direction_view_color: "E0F0FF"
direction_camera_color: "0088FF"
direction_view_color: "#E0F0FF"
direction_camera_color: "#0088FF"
allotments_color: "D0E0D0"
beach_color: "F0E0C0"
boundary_color: "880088"
building_border_color: "E0D0C0" # "AAAAAA"
building_color: "F8F0E8" # "D0D0C0"
construction_color: "CCCCCC"
cycle_color: "4444EE"
desert_color: "F0E0D0"
decidious_color: "FCAF3E"
emergency_color: "DD2222"
evergreen_color: "688C44"
farmland_color: "FFEEBB"
ferry_terminal_color: "AABBDD"
foot_border_color: "FFFFFF"
foot_color: "B89A74"
grass_border_color: "BFD098"
grass_color: "CFE0A8"
guide_strips_color: "228833"
hidden_color: "000000"
indoor_border_color: "C0B8B0"
indoor_color: "E8E4E0"
meadow_border_color: "BFD078"
meadow_color: "CFE088"
orchard_color: "B8DCA4"
outline_color: "FFFFFF"
parking_color: "DDCC99"
pitch_color: "AADDCC"
pitch_border_color: "88BBAA"
platform_border_color: "AAAAAA"
platform_color: "CCCCCC"
playground_border_color: "663300"
playground_color: "884400"
primary_border_color: "AA8800"
primary_color: "FFDD66"
private_access_color: "884444"
ridge_color: "000000"
road_border_color: "CCCCCC"
rock_color: "DDDDDD"
route_color: "FFFFFF"
sand_color: "F0E0D0"
secondary_border_color: "BB9911"
secondary_color: "FFEE77"
scree_color: "CCCCCC"
tertiary_border_color: "CCAA22"
tertiary_color: "FFFF88"
track_color: "A88A64"
tree_color: "98AC64"
water_border_color: "6688BB"
water_color: "AACCFF"
wetland_color: "BFE0D8"
wood_border_color: "A8BC74"
wood_color: "B8CC84"
allotments_color: "#D0E0D0"
beach_color: "#F0E0C0"
boundary_color: "#880088"
building_border_color: "#E0D0C0" # "AAAAAA"
building_color: "#F8F0E8" # "D0D0C0"
construction_color: "#CCCCCC"
cycle_color: "#4444EE"
desert_color: "#F0E0D0"
decidious_color: "#FCAF3E"
emergency_color: "#DD2222"
evergreen_color: "#688C44"
farmland_color: "#FFEEBB"
ferry_terminal_color: "#AABBDD"
foot_border_color: "#FFFFFF"
foot_color: "#B89A74"
grass_border_color: "#BFD098"
grass_color: "#CFE0A8"
guide_strips_color: "#228833"
hidden_color: "#000000"
indoor_border_color: "#C0B8B0"
indoor_color: "#E8E4E0"
meadow_border_color: "#BFD078"
meadow_color: "#CFE088"
orchard_color: "#B8DCA4"
outline_color: "#FFFFFF"
parking_color: "#DDCC99"
pitch_color: "#AADDCC"
pitch_border_color: "#88BBAA"
platform_border_color: "#AAAAAA"
platform_color: "#CCCCCC"
playground_border_color: "#663300"
playground_color: "#884400"
primary_border_color: "#AA8800"
primary_color: "#FFDD66"
private_access_color: "#884444"
ridge_color: "#000000"
road_border_color: "#CCCCCC"
rock_color: "#DDDDDD"
route_color: "#FFFFFF"
sand_color: "#F0E0D0"
secondary_border_color: "#BB9911"
secondary_color: "#FFEE77"
scree_color: "#CCCCCC"
tertiary_border_color: "#CCAA22"
tertiary_color: "#FFFF88"
track_color: "#A88A64"
tree_color: "#98AC64"
water_border_color: "#6688BB"
water_color: "#AACCFF"
wetland_color: "#BFE0D8"
wood_border_color: "#A8BC74"
wood_color: "#B8CC84"
# Colors not in W3C
"rose": "FF007F" # Wikipedia
"slate_blue": "6A5ACD" # W3C slateblue
"rose": "#FF007F" # Wikipedia
"slate_blue": "#6A5ACD" # W3C slateblue
node_icons:

View file

@ -72,9 +72,9 @@ class Scheme:
:return: 6-digit color specification with "#"
"""
if color in self.colors:
return Color("#" + self.colors[color])
return Color(self.colors[color])
if color.lower() in self.colors:
return Color("#" + self.colors[color.lower()])
return Color(self.colors[color.lower()])
try:
return Color(color)
except ValueError: