aboutsummaryrefslogtreecommitdiffstats
path: root/examples/Styles/Streets.elm
diff options
context:
space:
mode:
Diffstat (limited to 'examples/Styles/Streets.elm')
-rw-r--r--examples/Styles/Streets.elm484
1 files changed, 242 insertions, 242 deletions
diff --git a/examples/Styles/Streets.elm b/examples/Styles/Streets.elm
index 1e7c300..d618a8e 100644
--- a/examples/Styles/Streets.elm
+++ b/examples/Styles/Streets.elm
@@ -103,7 +103,7 @@ style =
, Layer.minzoom 15
, Layer.filter (E.getProperty (str "class") |> E.isEqual (str "pitch"))
, Layer.lineColor (E.rgba 225 237 190 1)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.fill "cemetery"
"composite"
@@ -188,8 +188,8 @@ style =
, Layer.lineColor (E.rgba 140 202 247 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.line "waterway-small"
"composite"
@@ -199,15 +199,15 @@ style =
, Layer.lineColor (E.rgba 140 202 247 1)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.35) [ ( 13.5, float 0.1 ), ( 20, float 3 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.5, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
- , Layer.lineCap E.lineCapRound
+ , Layer.lineJoin E.rounded
+ , Layer.lineCap E.rounded
]
, Layer.fill "water-shadow"
"composite"
[ Layer.sourceLayer "water"
, Layer.fillColor (E.rgba 109 164 242 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 117 207 239 1) ]
@@ -223,7 +223,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 230 227 223 1)
- , Layer.lineCap E.lineCapRound
+ , Layer.lineCap E.rounded
]
, Layer.fill "aeroway-polygon"
"composite"
@@ -301,8 +301,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"
@@ -323,8 +323,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"
@@ -345,8 +345,8 @@ style =
, Layer.lineColor (E.rgba 179 183 203 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"
@@ -366,8 +366,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"
@@ -387,8 +387,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"
@@ -406,8 +406,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 179 183 203 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-primary-case"
"composite"
@@ -425,8 +425,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 179 183 203 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-trunk_link-case"
"composite"
@@ -445,8 +445,8 @@ style =
, Layer.lineColor (E.rgba 255 255 255 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"
@@ -465,8 +465,8 @@ style =
, Layer.lineColor (E.rgba 255 255 255 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"
@@ -485,8 +485,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"
@@ -505,8 +505,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"
@@ -533,7 +533,7 @@ style =
, ( 18, E.floats [ 0.15, 0.15 ] )
]
)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.line "tunnel-path"
"composite"
@@ -555,7 +555,7 @@ style =
)
, Layer.lineColor (E.rgba 245 242 238 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"
@@ -576,7 +576,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"
@@ -595,8 +595,8 @@ style =
, Layer.lineColor (E.rgba 242 221 155 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"
@@ -615,8 +615,8 @@ style =
, Layer.lineColor (E.rgba 255 191 142 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"
@@ -635,7 +635,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 "tunnel-service-link-track"
"composite"
@@ -655,8 +655,8 @@ style =
, 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.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"
@@ -674,8 +674,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 239 237 234 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"
@@ -693,8 +693,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 "tunnel-secondary-tertiary"
"composite"
@@ -713,8 +713,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"
@@ -733,8 +733,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.symbol "tunnel-oneway-arrows-blue-minor"
"composite"
@@ -752,7 +752,7 @@ style =
]
]
)
- , Layer.symbolPlacement E.symbolPlacementLine
+ , Layer.symbolPlacement E.line
, Layer.iconImage (E.zoom |> E.step (str "oneway-small") [ ( 18, str "oneway-large" ) ])
, Layer.symbolSpacing (float 200)
, Layer.iconPadding (float 2)
@@ -780,7 +780,7 @@ style =
]
]
)
- , Layer.symbolPlacement E.symbolPlacementLine
+ , Layer.symbolPlacement E.line
, Layer.iconImage (E.zoom |> E.step (str "oneway-small") [ ( 17, str "oneway-large" ) ])
, Layer.symbolSpacing (float 200)
, Layer.iconPadding (float 2)
@@ -799,8 +799,8 @@ style =
)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.rgba 242 221 155 1)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "tunnel-motorway"
"composite"
@@ -819,8 +819,8 @@ style =
, Layer.lineOpacity (float 1)
, Layer.lineColor (E.rgba 255 191 142 1)
, Layer.lineBlur (float 0)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.symbol "tunnel-oneway-arrows-white"
"composite"
@@ -839,7 +839,7 @@ style =
]
]
)
- , Layer.symbolPlacement E.symbolPlacementLine
+ , Layer.symbolPlacement E.line
, Layer.iconImage (E.zoom |> E.step (str "oneway-white-small") [ ( 17, str "oneway-white-large" ) ])
, Layer.symbolSpacing (float 200)
, Layer.iconPadding (float 2)
@@ -852,7 +852,7 @@ style =
, Layer.lineOpacity (float 1)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 20, float 1 ) ])
, Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 13, E.floats [ 12, 4 ] ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "ferry_auto"
"composite"
@@ -866,7 +866,7 @@ style =
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 15, E.rgba 91 172 229 1 ), ( 17, E.rgba 91 114 229 1 ) ])
, Layer.lineOpacity (float 1)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 20, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-path-bg"
"composite"
@@ -887,7 +887,7 @@ style =
, Layer.lineColor (E.rgba 201 203 216 1)
, Layer.lineBlur (float 0)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 0.75 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-steps-bg"
"composite"
@@ -905,7 +905,7 @@ style =
, Layer.lineColor (E.rgba 201 203 216 1)
, Layer.lineDasharray (E.floats [ 1, 0 ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 14.25, float 0.75 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-sidewalk-bg"
"composite"
@@ -925,7 +925,7 @@ style =
, Layer.lineColor (E.rgba 201 203 216 1)
, Layer.lineBlur (float 0)
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 16, float 0 ), ( 16.25, float 0.75 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.symbol "turning-features-outline"
"composite"
@@ -946,7 +946,7 @@ style =
, Layer.iconAllowOverlap true
, Layer.iconIgnorePlacement true
, Layer.iconPadding (float 0)
- , Layer.iconRotationAlignment E.anchorMap
+ , Layer.iconRotationAlignment E.map
]
, Layer.line "road-pedestrian-case"
"composite"
@@ -957,7 +957,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
]
]
)
@@ -965,7 +965,7 @@ style =
, Layer.lineColor (E.rgba 213 216 229 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 "road-street-low"
"composite"
@@ -976,7 +976,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
]
]
)
@@ -986,8 +986,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"
@@ -998,7 +998,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
]
]
)
@@ -1008,8 +1008,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"
@@ -1029,8 +1029,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ])
, Layer.lineColor (E.rgba 213 216 229 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-street_limited-case"
"composite"
@@ -1041,7 +1041,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
]
]
)
@@ -1049,8 +1049,8 @@ style =
, Layer.lineColor (E.rgba 213 216 229 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
, 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-case"
"composite"
@@ -1061,7 +1061,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
]
]
)
@@ -1069,8 +1069,8 @@ style =
, Layer.lineColor (E.rgba 213 216 229 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ])
, 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-case"
"composite"
@@ -1088,8 +1088,8 @@ style =
, Layer.lineColor (E.rgba 213 216 229 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 8.5, float 0.5 ), ( 10, float 0.75 ), ( 18, float 26 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9.99, float 0 ), ( 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"
@@ -1107,8 +1107,8 @@ style =
, Layer.lineColor (E.rgba 213 216 229 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9.99, float 0 ), ( 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"
@@ -1127,8 +1127,8 @@ style =
, Layer.lineColor (E.rgba 255 255 255 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.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk_link-case"
"composite"
@@ -1147,8 +1147,8 @@ style =
, Layer.lineColor (E.rgba 255 255 255 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.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-trunk-case"
"composite"
@@ -1166,8 +1166,8 @@ style =
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 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"
@@ -1184,8 +1184,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10, float 1 ), ( 16, float 2 ) ])
, Layer.lineColor (E.rgba 255 255 255 1)
, Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-construction"
"composite"
@@ -1196,7 +1196,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
]
]
)
@@ -1212,7 +1212,7 @@ style =
, ( 18, E.floats [ 0.15, 0.15 ] )
]
)
- , Layer.lineJoin E.lineJoinMiter
+ , Layer.lineJoin E.miter
]
, Layer.line "road-sidewalks"
"composite"
@@ -1234,7 +1234,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"
@@ -1257,7 +1257,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"
@@ -1278,7 +1278,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"
@@ -1296,8 +1296,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 242 208 99 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"
@@ -1315,8 +1315,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 162 91 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"
@@ -1327,7 +1327,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
]
]
)
@@ -1335,7 +1335,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.fill "road-pedestrian-polygon-fill"
"composite"
@@ -1346,7 +1346,7 @@ style =
[ E.geometryType |> E.isEqual (str "Polygon")
, E.all
[ E.getProperty (str "class") |> E.matchesStr [ ( "path", true ), ( "pedestrian", true ) ] false
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1366,7 +1366,7 @@ style =
[ E.geometryType |> E.isEqual (str "Polygon")
, E.all
[ E.getProperty (str "class") |> E.matchesStr [ ( "path", true ), ( "pedestrian", true ) ] false
- , E.getProperty (str "structure") |> E.isEqual E.textFitNone
+ , E.getProperty (str "structure") |> E.isEqual E.none
]
]
)
@@ -1392,8 +1392,8 @@ style =
)
, 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"
@@ -1404,15 +1404,15 @@ 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
]
]
)
, 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 239 237 234 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"
@@ -1423,15 +1423,15 @@ 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
]
]
)
, 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"
@@ -1448,8 +1448,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.zoom |> E.interpolate (E.Exponential 1) [ ( 5, E.rgba 239 233 224 1 ), ( 8, 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"
@@ -1466,8 +1466,8 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, E.rgba 239 233 224 1 ), ( 7, 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.symbol "road-oneway-arrows-blue-minor"
"composite"
@@ -1485,9 +1485,9 @@ style =
]
]
)
- , Layer.symbolPlacement E.symbolPlacementLine
+ , Layer.symbolPlacement E.line
, Layer.iconImage (E.zoom |> E.step (str "oneway-small") [ ( 18, str "oneway-large" ) ])
- , Layer.iconRotationAlignment E.anchorMap
+ , Layer.iconRotationAlignment E.map
, Layer.iconPadding (float 2)
, Layer.symbolSpacing (float 200)
]
@@ -1514,9 +1514,9 @@ style =
]
]
)
- , Layer.symbolPlacement E.symbolPlacementLine
+ , Layer.symbolPlacement E.line
, Layer.iconImage (E.zoom |> E.step (str "oneway-small") [ ( 17, str "oneway-large" ) ])
- , Layer.iconRotationAlignment E.anchorMap
+ , Layer.iconRotationAlignment E.map
, Layer.iconPadding (float 2)
, Layer.symbolSpacing (float 200)
]
@@ -1537,8 +1537,8 @@ style =
(E.zoom
|> E.interpolate (E.Exponential 1) [ ( 6, E.rgba 255 255 255 1 ), ( 6.1, E.rgba 234 196 71 1 ), ( 9, E.rgba 242 208 99 1 ) ]
)
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-motorway"
"composite"
@@ -1554,8 +1554,8 @@ style =
)
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ])
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 8, E.rgba 242 146 73 1 ), ( 9, E.rgba 255 162 91 1 ) ])
- , Layer.lineCap E.lineCapRound
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineCap E.rounded
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-rail"
"composite"
@@ -1572,7 +1572,7 @@ style =
)
, Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, E.rgba 216 214 201 1 ), ( 16, E.rgba 182 184 195 1 ) ])
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 20, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound
+ , Layer.lineJoin E.rounded
]
, Layer.line "road-rail-tracks"
"composite"
@@ -1591,7 +1591,7 @@ style =
, Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 4 ), ( 20, float 8 ) ])
, Layer.lineDasharray (E.floats [ 0.1, 15 ])
, Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.75, float 0 ), ( 14, float 1 ) ])
- , Layer.lineJoin E.lineJoinRound