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.

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

Blue hexagon shields for Pakistan National Highways #415

Merged
merged 15 commits into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc-img/shield_map_world.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
3 changes: 3 additions & 0 deletions icons/shield_hex_horz_blue_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/shield_pk_motorway.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions src/js/shield_defs.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,10 @@ export function loadShields(shieldImages) {
};

let hexagonHorizontalShieldBlue = {
backgroundImage: shieldImages.shield_hex_horz_blue,
backgroundImage: [
shieldImages.shield_hex_horz_blue_2,
shieldImages.shield_hex_horz_blue_3,
],
textLayoutConstraint: ShieldText.ellipseTextConstraint,
textColor: Color.shields.white,
padding: {
Expand Down Expand Up @@ -2619,7 +2622,10 @@ export function loadShields(shieldImages) {
// Japan
shields["JP:E"] = roundedRectShield(Color.shields.green, Color.shields.white);
shields["JP:national"] = triangleConvexDownShieldBlue;
shields["JP:prefectural"] = hexagonHorizontalShieldBlue;
shields["JP:prefectural"] = {
...hexagonHorizontalShieldBlue,
backgroundImage: shieldImages.shield_hex_horz_blue_2,
};
[
"aichi",
"akita",
Expand Down Expand Up @@ -2689,6 +2695,20 @@ export function loadShields(shieldImages) {
shields["PH:N"] = homeDownShield;
shields["PH:E"] = homeDownShieldYellow;

// Pakistan
shields["PK:national"] = hexagonHorizontalShieldBlue;
shields["PK:motorway"] = {
backgroundImage: shieldImages.shield_pk_motorway,
textLayoutConstraint: ShieldText.southHalfellipseTextConstraint,
textColor: Color.shields.white,
padding: {
left: 2,
right: 2,
top: 2,
bottom: 7,
},
};

// South Korea
shields["KR:expressway"] = {
backgroundImage: [
Expand Down