Skip to content

Commit

Permalink
Reduce duplication. Don't treat customers as noaccess
Browse files Browse the repository at this point in the history
  • Loading branch information
@quincylvania
quincylvania committed Dec 26, 2024
1 parent 7d062f1 commit 80cfd9e
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions js/styleGenerator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ async function generateStyle(travelMode, lens) {
labelHalo: "rgba(255, 255, 255, 1)",
selection: "yellow",
};
const noaccessValsLiteral = ["literal", ["no", "private", "discouraged", "limited"]]; // `limited` for `wheelchair`
const lineWidth = [
"interpolate", ["linear"], ["zoom"],
12, 1,
Expand Down Expand Up @@ -158,8 +159,8 @@ async function generateStyle(travelMode, lens) {
atv: [
"any",
["in", ["get", "highway"], ["literal", ["footway", "steps"]]],
["in", ["get", "vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "motor_vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "vehicle"], noaccessValsLiteral],
["in", ["get", "motor_vehicle"], noaccessValsLiteral],
isNotHighwayExpression,
],
bicycle: [
Expand All @@ -169,7 +170,7 @@ async function generateStyle(travelMode, lens) {
["==", ["get", "highway"], "steps"],
["!=", ["get", "ramp:bicycle"], "yes"],
],
["in", ["get", "vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "vehicle"], noaccessValsLiteral],
isNotHighwayExpression,
],
canoe: ["!", ["has", "canoe"]],
Expand All @@ -195,21 +196,21 @@ async function generateStyle(travelMode, lens) {
],
mtb: [
"any",
["in", ["get", "vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "bicycle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "vehicle"], noaccessValsLiteral],
["in", ["get", "bicycle"], noaccessValsLiteral],
isNotHighwayExpression,
],
portage: ["!", ["has", "portage"]],
'ski:nordic': [
"any",
["in", ["get", "ski"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "ski"], noaccessValsLiteral],
isNotHighwayExpression,
],
snowmobile: [
"any",
["in", ["get", "highway"], ["literal", ["footway", "steps"]]],
["in", ["get", "vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "motor_vehicle"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "vehicle"], noaccessValsLiteral],
["in", ["get", "motor_vehicle"], noaccessValsLiteral],
isNotHighwayExpression,
],
wheelchair: [
Expand Down Expand Up @@ -846,11 +847,11 @@ async function generateStyle(travelMode, lens) {
["==", ["get", "information"], "route_marker"], 20,
[
"any",
["in", ["get", "canoe"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "canoe"], noaccessValsLiteral],
[
"all",
["!", ["has", "canoe"]],
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]]
["in", ["get", "access"], noaccessValsLiteral]
]
], 21,
10,
Expand Down Expand Up @@ -1114,17 +1115,17 @@ async function generateStyle(travelMode, lens) {
"case",
["==", ["get", "route"], "ferry"], [
"case",
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]], ["image", "ferry-noaccess"],
["in", ["get", "access"], noaccessValsLiteral], ["image", "ferry-noaccess"],
["image", "ferry"],
],
["==", ["get", "amenity"], "ranger_station"], [
"case",
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]], ["image", "ranger_station-noaccess"],
["in", ["get", "access"], noaccessValsLiteral], ["image", "ranger_station-noaccess"],
["image", "ranger_station"],
],
["==", ["get", "highway"], "trailhead"], [
"case",
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]], ["image", "trailhead-noaccess"],
["in", ["get", "access"], noaccessValsLiteral], ["image", "trailhead-noaccess"],
["image", "trailhead"],
],
["==", ["get", "man_made"], "cairn"], ["image", "cairn"],
Expand All @@ -1133,12 +1134,12 @@ async function generateStyle(travelMode, lens) {
["==", ["get", "man_made"], "monitoring_station"], ["image", "streamgage"],
["==", ["get", "tourism"], "camp_site"], [
"case",
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]], ["image", "campground-noaccess"],
["in", ["get", "access"], noaccessValsLiteral], ["image", "campground-noaccess"],
["image", "campground"],
],
["==", ["get", "tourism"], "caravan_site"], [
"case",
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]], ["image", "caravan_site-noaccess"],
["in", ["get", "access"], noaccessValsLiteral], ["image", "caravan_site-noaccess"],
["image", "caravan_site"],
],
["==", ["get", "tourism"], "camp_pitch"], ["image", "campsite"],
Expand All @@ -1155,7 +1156,7 @@ async function generateStyle(travelMode, lens) {
[
"all",
["has", "canoe"],
["!", ["in", ["get", "canoe"], ["literal", ["no", "private", "discouraged"]]]]
["!", ["in", ["get", "canoe"], noaccessValsLiteral]]
], [
"case",
["==", ["get", "natural"], "beaver_dam"], ["image", showHazards ? "beaver_dam-canoeable" : "beaver_dam"],
Expand All @@ -1170,11 +1171,11 @@ async function generateStyle(travelMode, lens) {
],
[
"any",
["in", ["get", "canoe"], ["literal", ["no", "private", "discouraged"]]],
["in", ["get", "canoe"], noaccessValsLiteral],
[
"all",
["!", ["has", "canoe"]],
["in", ["get", "access"], ["literal", ["no", "private", "discouraged"]]]
["in", ["get", "access"], noaccessValsLiteral]
]
], [
"case",
Expand Down Expand Up @@ -1256,7 +1257,7 @@ async function generateStyle(travelMode, lens) {
}

function notNoAccessExpression(mode) {
return ["!", ["in", ["get", mode], ["literal", ["no", "private", "discouraged", "customers", "limited"]]]];
return ["!", ["in", ["get", mode], noaccessValsLiteral]];
}

function modeIsAllowedExpression(mode) {
Expand Down

0 comments on commit 80cfd9e

Please sign in to comment.