aboutsummaryrefslogtreecommitdiffstats
path: root/examples/Styles/Light.elm
diff options
context:
space:
mode:
Diffstat (limited to 'examples/Styles/Light.elm')
-rw-r--r--examples/Styles/Light.elm372
1 files changed, 186 insertions, 186 deletions
diff --git a/examples/Styles/Light.elm b/examples/Styles/Light.elm
index e487f36..35b334f 100644
--- a/examples/Styles/Light.elm
+++ b/examples/Styles/Light.elm
@@ -158,15 +158,15 @@ style =
, Layer.lineColor (E.rgba 203 211 212 1)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.3) [ ( 8.5, float 0.1 ), ( 20, float 8 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 8, float 0 ), ( 8.5, float 1 ) ])
- , Layer.lineCap (E.zoom |> E.step E.lineCapButt [ ( 11, E.lineCapRound ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap (E.zoom |> E.step E.butt [ ( 11, E.rounded ) ])
+ , Layer.lineJoin E.rounded
]
, Layer.fill "water shadow"
"composite"
[ Layer.sourceLayer "water"
, Layer.fillColor (E.rgba 181 190 190 1)
, Layer.fillTranslate (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 7, E.floats [ 0, 0 ] ), ( 16, E.floats [ -1, -1 ] ) ])
- , Layer.fillTranslateAnchor E.anchorViewport
+ , Layer.fillTranslateAnchor E.viewport
, Layer.fillOpacity (float 1)
]
, Layer.fill "water" "composite" [ Layer.sourceLayer "water", Layer.fillColor (E.rgba 202 210 210 1) ]
@@ -182,7 +182,7 @@ style =
, Layer.filter (E.all [ E.geometryType |> E.isEqual (str "LineString"), E.getProperty (str "class") |> E.isEqual (str "land") ])
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.99) [ ( 14, float 0.75 ), ( 20, float 40 ) ])
, Layer.lineColor (E.rgba 240 245 243 1)
- , Layer.lineCap E.lineCapRound
+ , Layer.lineCap E.rounded
]
, Layer.fill "aeroway-polygon"
"composite"
@@ -246,8 +246,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11.5, float 0 ), ( 12, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-street_limited-low"
"composite"
@@ -268,8 +268,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11.5, float 0 ), ( 12, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-service-link-track-case"
"composite"
@@ -290,8 +290,8 @@ style =
, Layer.lineColor (E.rgba 223 229 230 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ])
, Layer.lineDasharray (E.floats [ 3, 3 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-street_limited-case"
"composite"
@@ -311,8 +311,8 @@ style =
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineDasharray (E.floats [ 3, 3 ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-street-case"
"composite"
@@ -332,8 +332,8 @@ style =
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineDasharray (E.floats [ 3, 3 ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-secondary-tertiary-case"
"composite"
@@ -351,8 +351,8 @@ style =
, Layer.lineDasharray (E.floats [ 3, 3 ])
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 8.5, float 0.5 ), ( 10, float 0.75 ), ( 18, float 26 ) ])
, Layer.lineColor (E.rgba 223 229 230 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-primary-case"
"composite"
@@ -370,8 +370,8 @@ style =
, Layer.lineDasharray (E.floats [ 3, 3 ])
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 223 229 230 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-trunk_link-case"
"composite"
@@ -390,8 +390,8 @@ style =
, Layer.lineColor (E.rgba 223 229 230 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineDasharray (E.floats [ 3, 3 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-motorway_link-case"
"composite"
@@ -410,8 +410,8 @@ style =
, Layer.lineColor (E.rgba 223 229 230 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineDasharray (E.floats [ 3, 3 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-trunk-case"
"composite"
@@ -430,8 +430,8 @@ style =
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 3, 3 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-motorway-case"
"composite"
@@ -450,8 +450,8 @@ style =
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 3, 3 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-construction"
"composite"
@@ -478,7 +478,7 @@ style =
, ( 18, E.floats [ 0.15, 0.15 ] )
]
)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.line "tunnel-path"
"composite"
@@ -500,7 +500,7 @@ style =
)
, Layer.lineColor (E.rgba 216 216 216 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-steps"
"composite"
@@ -521,7 +521,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-trunk_link"
"composite"
@@ -540,8 +540,8 @@ style =
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-motorway_link"
"composite"
@@ -560,8 +560,8 @@ style =
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-pedestrian"
"composite"
@@ -580,7 +580,7 @@ style =
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.5, 0.4 ] ), ( 16, E.floats [ 1, 0.2 ] ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-service-link-track"
"composite"
@@ -600,8 +600,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ])
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-street_limited"
"composite"
@@ -619,8 +619,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12.5, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-street"
"composite"
@@ -638,8 +638,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12.5, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-secondary-tertiary"
"composite"
@@ -658,8 +658,8 @@ style =
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
, Layer.lineBlur (float 0)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-primary"
"composite"
@@ -678,8 +678,8 @@ style =
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
, Layer.lineBlur (float 0)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-trunk"
"composite"
@@ -695,8 +695,8 @@ style =
)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 222 226 226 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-motorway"
"composite"
@@ -715,8 +715,8 @@ style =
, Layer.lineOpacity (float 1)
, Layer.lineColor (E.rgba 222 226 226 1)
, Layer.lineBlur (float 0)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-pedestrian-case"
"composite"
@@ -726,7 +726,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "pedestrian")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -738,7 +738,7 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street-low"
"composite"
@@ -748,7 +748,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -759,8 +759,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11, float 0 ), ( 11.25, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street_limited-low"
"composite"
@@ -770,7 +770,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street_limited")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -781,8 +781,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11, float 0 ), ( 11.25, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-service-link-track-case"
"composite"
@@ -806,7 +806,7 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street_limited-case"
"composite"
@@ -816,7 +816,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street_limited")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -828,8 +828,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street-case"
"composite"
@@ -839,7 +839,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -851,8 +851,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-main-case"
"composite"
@@ -873,8 +873,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-primary-case"
"composite"
@@ -895,8 +895,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-motorway_link-case"
"composite"
@@ -918,8 +918,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk_link-case"
"composite"
@@ -941,8 +941,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 7, float 0.4 ), ( 9, float 0.5 ), ( 10, float 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk-case"
"composite"
@@ -961,8 +961,8 @@ style =
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9, E.rgba 219 224 222 1 ), ( 11, E.rgba 232 237 235 1 ) ])
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.5 ), ( 9, float 1.4 ), ( 18, float 32 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 0 ), ( 6.1, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-motorway-case"
"composite"
@@ -980,8 +980,8 @@ style =
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9, E.rgba 219 224 222 1 ), ( 11, E.rgba 232 237 235 1 ) ])
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineOpacity (float 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-construction"
"composite"
@@ -991,7 +991,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "construction")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1008,7 +1008,7 @@ style =
, ( 18, E.floats [ 0.15, 0.15 ] )
]
)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.line "road-sidewalks"
"composite"
@@ -1030,7 +1030,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 1, 0.5 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 16, float 0 ), ( 16.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-path"
"composite"
@@ -1053,7 +1053,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 1, 0.5 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-steps"
"composite"
@@ -1074,7 +1074,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk_link"
"composite"
@@ -1092,8 +1092,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-motorway_link"
"composite"
@@ -1111,8 +1111,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-pedestrian"
"composite"
@@ -1122,7 +1122,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "pedestrian")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1131,7 +1131,7 @@ style =
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.5, 0.4 ] ), ( 16, E.floats [ 1, 0.2 ] ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-service-link-track"
"composite"
@@ -1150,8 +1150,8 @@ style =
, Layer.sourceLayer "road"
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street_limited"
"composite"
@@ -1161,7 +1161,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street_limited")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1169,8 +1169,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12.5, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street"
"composite"
@@ -1180,7 +1180,7 @@ style =
[ E.geometryType |> E.isEqual (str "LineString")
, E.all
[ E.getProperty (str "class") |> E.isEqual (str "street")
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1188,8 +1188,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12.5, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-secondary-tertiary"
"composite"
@@ -1206,8 +1206,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 8.5, float 0.5 ), ( 10, float 0.75 ), ( 18, float 26 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 5, float 0 ), ( 5.5, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-primary"
"composite"
@@ -1224,8 +1224,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 5, float 0 ), ( 5.5, float 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk"
"composite"
@@ -1243,8 +1243,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.5 ), ( 9, float 1.4 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-motorway"
"composite"
@@ -1261,8 +1261,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-rail"
"composite"
@@ -1279,7 +1279,7 @@ style =
, Layer.sourceLayer "road"
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0.75 ), ( 20, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-pedestrian-case"
"composite"
@@ -1298,7 +1298,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (float 0)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-street-low"
"composite"
@@ -1319,8 +1319,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11.5, float 0 ), ( 12, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-street_limited-low"
"composite"
@@ -1341,8 +1341,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 11.5, float 0 ), ( 12, float 1 ), ( 14, float 1 ), ( 14.01, float 0 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-service-link-track-case"
"composite"
@@ -1362,7 +1362,7 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ])
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-street_limited-case"
"composite"
@@ -1380,7 +1380,7 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ])
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-street-case"
"composite"
@@ -1399,7 +1399,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.99, float 0 ), ( 14, float 1 ) ])
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-secondary-tertiary-case"
"composite"
@@ -1417,7 +1417,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 8.5, float 0.5 ), ( 10, float 0.75 ), ( 18, float 26 ) ])
, Layer.lineTranslate (E.floats [ 0, 0 ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-primary-case"
"composite"
@@ -1435,7 +1435,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineTranslate (E.floats [ 0, 0 ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-trunk_link-case"
"composite"
@@ -1454,7 +1454,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 10.99, float 0 ), ( 11, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-motorway_link-case"
"composite"
@@ -1474,7 +1474,7 @@ style =
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineOpacity (float 1)
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-trunk-case"
"composite"
@@ -1491,7 +1491,7 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10, float 1 ), ( 16, float 2 ) ])
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-motorway-case"
"composite"
@@ -1508,7 +1508,7 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 7, float 0.5 ), ( 10, float 1 ), ( 16, float 2 ) ])
, Layer.lineColor (E.rgba 232 237 235 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-construction"
"composite"
@@ -1535,7 +1535,7 @@ style =
, ( 18, E.floats [ 0.15, 0.15 ] )
]
)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.line "bridge-path"
"composite"
@@ -1557,7 +1557,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 1, 0.5 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-steps"
"composite"
@@ -1578,7 +1578,7 @@ style =
|> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.75, 1 ] ), ( 16, E.floats [ 1, 0.75 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ]
)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-trunk_link"
"composite"
@@ -1597,8 +1597,8 @@ style =
, Layer.sourceLayer "road"
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-motorway_link"
"composite"
@@ -1617,8 +1617,8 @@ style =
, Layer.sourceLayer "road"
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ), ( 18, float 18 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-pedestrian"
"composite"
@@ -1637,7 +1637,7 @@ style =
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineOpacity (float 1)
, Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.5, 0.4 ] ), ( 16, E.floats [ 1, 0.2 ] ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "bridge-service-link-track"
"composite"
@@ -1656,8 +1656,8 @@ style =
, Layer.sour