diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Example01.elm | 1 | ||||
| -rw-r--r-- | examples/Example02.elm | 2 | ||||
| -rw-r--r-- | examples/Styles/Dark.elm | 372 | ||||
| -rw-r--r-- | examples/Styles/Light.elm | 372 | ||||
| -rw-r--r-- | examples/Styles/Outdoors.elm | 550 | ||||
| -rw-r--r-- | examples/Styles/SatelliteStreets.elm | 342 | ||||
| -rw-r--r-- | examples/Styles/Streets.elm | 484 |
7 files changed, 1062 insertions, 1061 deletions
diff --git a/examples/Example01.elm b/examples/Example01.elm index 721cc0e..9401a99 100644 --- a/examples/Example01.elm +++ b/examples/Example01.elm @@ -142,6 +142,7 @@ view model = |> E.fontScaledBy (float 0.8) |> E.withFont (E.strings [ "DIN Offc Pro Medium" ]) ] + , Layer.textTransform <| E.ifElse (E.getProperty (str "name_en") |> E.isEqual (str "Vienna")) E.uppercase E.none ] , Layer.fill "changes" "changes" diff --git a/examples/Example02.elm b/examples/Example02.elm index c485a7a..a985f2e 100644 --- a/examples/Example02.elm +++ b/examples/Example02.elm @@ -4,7 +4,7 @@ import Browser import Html exposing (div) import Html.Attributes import Mapbox.Element exposing (..) -import Styles.SatelliteStreets exposing (style) +import Styles.Dark exposing (style) main = diff --git a/examples/Styles/Dark.elm b/examples/Styles/Dark.elm index d6d339b..b1692c1 100644 --- a/examples/Styles/Dark.elm +++ b/examples/Styles/Dark.elm @@ -158,15 +158,15 @@ style = , Layer.lineColor (E.rgba 24 25 26 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 12 13 13 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 24 25 26 1) ] @@ -183,7 +183,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 51 51 50 1) - , Layer.lineCap E.lineCapRound + , Layer.lineCap E.rounded ] , Layer.fill "aeroway-polygon" "composite" @@ -247,8 +247,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" @@ -269,8 +269,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" @@ -291,8 +291,8 @@ style = , Layer.lineColor (E.rgba 72 75 75 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" @@ -312,8 +312,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" @@ -333,8 +333,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" @@ -352,8 +352,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 72 75 75 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-primary-case" "composite" @@ -371,8 +371,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 72 75 75 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-trunk_link-case" "composite" @@ -391,8 +391,8 @@ style = , Layer.lineColor (E.rgba 72 75 75 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" @@ -411,8 +411,8 @@ style = , Layer.lineColor (E.rgba 72 75 75 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" @@ -431,8 +431,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" @@ -451,8 +451,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" @@ -479,7 +479,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "tunnel-path" "composite" @@ -501,7 +501,7 @@ style = ) , Layer.lineColor (E.rgba 37 38 39 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" @@ -522,7 +522,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" @@ -541,8 +541,8 @@ style = , Layer.lineColor (E.rgba 37 38 39 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" @@ -561,8 +561,8 @@ style = , Layer.lineColor (E.rgba 37 38 39 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" @@ -581,7 +581,7 @@ style = , Layer.lineColor (E.rgba 37 38 39 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" @@ -601,8 +601,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) , Layer.lineColor (E.rgba 37 38 39 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" @@ -620,8 +620,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 37 38 39 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" @@ -639,8 +639,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 37 38 39 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" @@ -659,8 +659,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" @@ -679,8 +679,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" @@ -696,8 +696,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 37 38 39 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-motorway" "composite" @@ -716,8 +716,8 @@ style = , Layer.lineOpacity (float 1) , Layer.lineColor (E.rgba 37 38 39 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" @@ -728,7 +728,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 ] ] ) @@ -736,7 +736,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 1) , Layer.lineGapWidth (float 0) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.9, float 0 ), ( 14, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-street-low" "composite" @@ -747,7 +747,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 ] ] ) @@ -757,8 +757,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" @@ -769,7 +769,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 ] ] ) @@ -779,8 +779,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" @@ -801,7 +801,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 1) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13.9, float 0 ), ( 14, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-street_limited-case" "composite" @@ -812,7 +812,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 ] ] ) @@ -820,8 +820,8 @@ style = , Layer.lineColor (E.rgba 43 43 43 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.9, 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" @@ -832,7 +832,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 ] ] ) @@ -840,8 +840,8 @@ style = , Layer.lineColor (E.rgba 43 43 43 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.9, float 0 ), ( 14, float 1 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "road-main-case" "composite" @@ -862,8 +862,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" @@ -884,8 +884,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" @@ -907,8 +907,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" @@ -930,8 +930,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" @@ -950,8 +950,8 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -969,8 +969,8 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -981,7 +981,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 ] ] ) @@ -997,7 +997,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "road-sidewalks" "composite" @@ -1019,7 +1019,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" @@ -1042,7 +1042,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" @@ -1063,7 +1063,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" @@ -1081,8 +1081,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 68 68 68 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" @@ -1100,8 +1100,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 68 68 68 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" @@ -1112,7 +1112,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 ] ] ) @@ -1120,7 +1120,7 @@ style = , Layer.lineColor (E.rgba 68 68 68 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" @@ -1139,8 +1139,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "road-street_limited" "composite" @@ -1151,15 +1151,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 68 68 68 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" @@ -1170,15 +1170,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 68 68 68 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" @@ -1195,8 +1195,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 68 68 68 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" @@ -1213,8 +1213,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 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" @@ -1232,8 +1232,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 68 68 68 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" @@ -1250,8 +1250,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 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" @@ -1268,7 +1268,7 @@ style = ) , Layer.lineColor (E.rgba 43 43 43 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" @@ -1287,7 +1287,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1308,8 +1308,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" @@ -1330,8 +1330,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" @@ -1351,7 +1351,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , Layer.lineColor (E.rgba 43 43 43 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" @@ -1369,7 +1369,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , Layer.lineColor (E.rgba 43 43 43 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" @@ -1388,7 +1388,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1406,7 +1406,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1424,7 +1424,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1443,7 +1443,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1463,7 +1463,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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" @@ -1480,7 +1480,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10, float 1 ), ( 16, float 2 ) ]) , Layer.lineColor (E.rgba 43 43 43 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" @@ -1497,7 +1497,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 43 43 43 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" @@ -1524,7 +1524,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "bridge-path" "composite" @@ -1546,7 +1546,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" @@ -1567,7 +1567,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" @@ -1586,8 +1586,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 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link" "composite" @@ -1606,8 +1606,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 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-pedestrian" "composite" @@ -1626,7 +1626,7 @@ style = , Layer.lineColor (E.rgba 68 68 68 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" @@ -1645,8 +1645,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street_limited" "composite" @@ -1664,8 +1664,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 68 68 68 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 "bridge-street" "composite" @@ -1683,8 +1683,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 68 68 68 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 "bridge-secondary-tertiary" "composite" @@ -1701,8 +1701,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 68 68 68 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 "bridge-primary" "composite" @@ -1719,8 +1719,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 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 "bridge-trunk" "composite" @@ -1738,8 +1738,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway" "composite" @@ -1757,8 +1757,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-rail" "composite" @@ -1775,7 +1775,7 @@ style = ) , Layer.lineColor (E.rgba 43 43 43 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-trunk_link-2-case" "composite" @@ -1795,7 +1795,7 @@ style = , Layer.lineColor (E.rgba 68 68 68 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-2-case" "composite" @@ -1815,7 +1815,7 @@ style = , Layer.lineColor (E.rgba 43 43 43 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-2-case" "composite" @@ -1833,7 +1833,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10, float 1 ), ( 16, float 2 ) ]) , Layer.lineColor (E.rgba 68 68 68 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-2-case" "composite" @@ -1851,7 +1851,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 43 43 43 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-trunk_link-2" "composite" @@ -1869,8 +1869,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 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2" "composite" @@ -1888,8 +1888,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 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2" "composite" @@ -1906,8 +1906,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2" "composite" @@ -1924,8 +1924,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 68 68 68 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "admin-3-4-boundaries-bg" "composite" @@ -1942,7 +1942,7 @@ style = , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 8, float 3 ) ]) - , Layer.lineJoin E.lineJoinBevel + , Layer.lineJoin E.bevel ] , Layer.line "admin-2-boundaries-bg" "composite" @@ -1959,7 +1959,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 4, float 0.5 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "admin-3-4-boundaries" "composite" @@ -1974,8 +1974,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 0.75 ), ( 12, float 1.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 2, float 0 ), ( 3, float 1 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, E.rgba 68 68 68 1 ), ( 5, E.rgba 89 89 89 1 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries" "composite" @@ -1990,8 +1990,8 @@ style = ) , Layer.lineColor (E.rgba 109 109 109 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries-dispute" "composite" @@ -2007,7 +2007,7 @@ style = , Layer.lineDasharray (E.floats [ 1.5, 1.5 ]) , Layer.lineColor (E.rgba 35 35 35 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "waterway-label" "composite" @@ -2019,8 +2019,8 @@ style = , Layer.textColor (E.rgba 81 81 81 1) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textMaxAngle (float 30) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 12 ), ( 18, float 16 ) ]) ] @@ -2130,10 +2130,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 500) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2156,10 +2156,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 500) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2179,10 +2179,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 400) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2361,7 +2361,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.75 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (E.getProperty (str "ref"))) [ ( 14, E.toFormattedText (E.getProperty (str "name_en")) ) ] @@ -2403,7 +2403,7 @@ style = , Layer.textColor (E.rgba 178 178 178 1) , Layer.textHaloBlur (float 0) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 7) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) @@ -2421,7 +2421,7 @@ style = , Layer.textColor (E.rgba 178 178 178 1) , Layer.textHaloBlur (float 0) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 7) @@ -2542,7 +2542,7 @@ style = , Layer.iconOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, float 1 ), ( 8, float 0 ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 5, float 12 ), ( 12, float 22 ) ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.1 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.textFont (E.zoom @@ -2573,7 +2573,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor E.positionBottom + , Layer.textAnchor E.bottom , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.iconImage (str "dot-10") @@ -2602,7 +2602,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -2632,7 +2632,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -2655,8 +2655,8 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 12 ), ( 6, float 16 ) ]) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 100 ), ( 6, float 400 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 5) @@ -2700,8 +2700,8 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1.1) [ ( 2, float 12 ), ( 5, float 20 ) ]) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 5) @@ -2740,8 +2740,8 @@ style = , Layer.textMaxWidth (float 4) , Layer.textLetterSpacing (float 0.25) , Layer.textLineHeight (float 1.1) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 1, float 14 ), ( 4, float 30 ) ]) ] @@ -2773,7 +2773,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 10 ), ( 9, float 14 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2799,7 +2799,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 10 ), ( 8, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2820,7 +2820,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 10 ), ( 7, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textPadding (float 1) , Layer.textField 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.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 "bridge-street_limited" "composite" @@ -1675,8 +1675,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 "bridge-street" "composite" @@ -1694,8 +1694,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 "bridge-secondary-tertiary" "composite" @@ -1712,8 +1712,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 "bridge-primary" "composite" @@ -1730,8 +1730,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 "bridge-trunk" "composite" @@ -1749,8 +1749,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway" "composite" @@ -1768,8 +1768,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-rail" "composite" @@ -1786,7 +1786,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-trunk_link-2-case" "composite" @@ -1806,7 +1806,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-2-case copy" "composite" @@ -1826,7 +1826,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-2-case" "composite" @@ -1844,7 +1844,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-2-case" "composite" @@ -1862,7 +1862,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-trunk_link-2" "composite" @@ -1880,8 +1880,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-2" "composite" @@ -1899,8 +1899,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-trunk-2" "composite" @@ -1917,8 +1917,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2" "composite" @@ -1935,8 +1935,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "admin-3-4-boundaries-bg" "composite" @@ -1953,7 +1953,7 @@ style = , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 8, float 3 ) ]) - , Layer.lineJoin E.lineJoinBevel + , Layer.lineJoin E.bevel ] , Layer.line "admin-2-boundaries-bg" "composite" @@ -1970,7 +1970,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 4, float 0.5 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "admin-3-4-boundaries" "composite" @@ -1985,8 +1985,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 0.75 ), ( 12, float 1.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 2, float 0 ), ( 3, float 1 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, E.rgba 204 204 204 1 ), ( 5, E.rgba 178 178 178 1 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries" "composite" @@ -2001,8 +2001,8 @@ style = , Layer.sourceLayer "admin" , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, E.rgba 178 178 178 1 ), ( 4, E.rgba 158 158 158 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries-dispute" "composite" @@ -2018,7 +2018,7 @@ style = , Layer.lineDasharray (E.floats [ 1.5, 1.5 ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, E.rgba 178 178 178 1 ), ( 4, E.rgba 158 158 158 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "waterway-label" "composite" @@ -2030,8 +2030,8 @@ style = , Layer.textColor (E.rgba 120 136 138 1) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textMaxAngle (float 30) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 12 ), ( 18, float 16 ) ]) ] @@ -2141,10 +2141,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 500) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2167,10 +2167,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 500) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2190,10 +2190,10 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 400) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap - , Layer.textPitchAlignment E.anchorViewport + , Layer.textRotationAlignment E.map + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2372,7 +2372,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.75 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (E.getProperty (str "abbr"))) [ ( 14, E.toFormattedText (E.getProperty (str "name_en")) ) ] @@ -2414,7 +2414,7 @@ style = , Layer.textColor (E.rgba 158 158 158 1) , Layer.textHaloBlur (float 0) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 7) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) @@ -2432,7 +2432,7 @@ style = , Layer.textColor (E.rgba 158 158 158 1) , Layer.textHaloBlur (float 0) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 7) @@ -2554,7 +2554,7 @@ style = , Layer.iconOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, float 1 ), ( 8, float 0 ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 5, float 12 ), ( 12, float 22 ) ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.1 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.textFont (E.zoom @@ -2585,7 +2585,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor E.positionBottom + , Layer.textAnchor E.bottom , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.iconImage (str "dot-10") @@ -2616,7 +2616,7 @@ style = ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.iconSize (float 1) - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2647,7 +2647,7 @@ style = ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.iconSize (float 1) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2668,8 +2668,8 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 12 ), ( 6, float 16 ) ]) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 100 ), ( 6, float 400 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 5) @@ -2711,8 +2711,8 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1.1) [ ( 2, float 12 ), ( 5, float 20 ) ]) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 5) @@ -2749,8 +2749,8 @@ style = , Layer.textMaxWidth (float 4) , Layer.textLetterSpacing (float 0.25) , Layer.textLineHeight (float 1.1) - , Layer.symbolPlacement E.symbolPlacementLine - , Layer.textPitchAlignment E.anchorViewport + , Layer.symbolPlacement E.line + , Layer.textPitchAlignment E.viewport , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 1, float 14 ), ( 4, float 30 ) ]) ] @@ -2781,7 +2781,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 10 ), ( 9, float 14 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2807,7 +2807,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 10 ), ( 8, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2828,7 +2828,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textHaloBlur (float 0) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 10 ), ( 7, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textPadding (float 1) , Layer.textField diff --git a/examples/Styles/Outdoors.elm b/examples/Styles/Outdoors.elm index 1d29ce3..da120f8 100644 --- a/examples/Styles/Outdoors.elm +++ b/examples/Styles/Outdoors.elm @@ -112,7 +112,7 @@ style = , Layer.lineOffset (E.zoom |> E.interpolate (E.Exponential 1.4) [ ( 9, float 0 ), ( 14, float -2.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9, float 0 ), ( 10, float 0.75 ) ]) , Layer.lineBlur (float 3) - , Layer.lineCap E.lineCapRound + , Layer.lineCap E.rounded ] , Layer.line "national_park-outline" "composite" @@ -188,7 +188,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" @@ -291,9 +291,9 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.3) [ ( 8.5, float 0.4 ), ( 20, float 8 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 8, float 0 ), ( 8.5, float 1 ) ]) , Layer.lineTranslate (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 7, E.floats [ 0, 0 ] ), ( 16, E.floats [ -1, -1 ] ) ]) - , Layer.lineTranslateAnchor E.anchorViewport - , Layer.lineCap (E.zoom |> E.step E.lineCapButt [ ( 11, E.lineCapRound ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineTranslateAnchor E.viewport + , Layer.lineCap (E.zoom |> E.step E.butt [ ( 11, E.rounded ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "waterway-river-canal" "composite" @@ -303,8 +303,8 @@ style = , Layer.lineColor (E.rgba 140 202 247 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.3) [ ( 8.5, float 0.4 ), ( 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" @@ -314,15 +314,15 @@ style = , Layer.lineColor (E.rgba 140 202 247 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.35) [ ( 13.5, float 0.4 ), ( 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) ] @@ -340,7 +340,7 @@ style = , Layer.fillColor (E.rgba 160 212 217 1) , Layer.fillOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 10, float 0 ), ( 10.5, float 1 ) ]) , Layer.fillPattern (str "wetland") - , Layer.fillTranslateAnchor E.anchorViewport + , Layer.fillTranslateAnchor E.viewport ] , Layer.fill "barrier_line-land-polygon" "composite" @@ -354,7 +354,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" @@ -432,8 +432,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" @@ -454,8 +454,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-track-case" "composite" @@ -473,8 +473,8 @@ style = , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 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-service-link-case" "composite" @@ -494,8 +494,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" @@ -515,8 +515,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" @@ -536,8 +536,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" @@ -555,8 +555,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" @@ -574,8 +574,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" @@ -594,8 +594,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" @@ -614,8 +614,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" @@ -634,8 +634,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" @@ -654,8 +654,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" @@ -682,7 +682,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "tunnel-path" "composite" @@ -705,7 +705,7 @@ style = ) , Layer.lineColor (E.rgba 245 242 238 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-cycleway-piste" "composite" @@ -727,7 +727,7 @@ style = ) , Layer.lineColor (E.rgba 245 242 238 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-steps" "composite" @@ -748,7 +748,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 1.75, 0.4 ] ), ( 16, E.floats [ 0.75, 0.4 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-trunk_link" "composite" @@ -767,8 +767,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" @@ -787,8 +787,8 @@ style = , Layer.lineColor (E.rgba 242 201 170 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" @@ -807,7 +807,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-track" "composite" @@ -823,8 +823,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 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 "tunnel-service-link" "composite" @@ -843,8 +843,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" @@ -862,8 +862,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" @@ -881,8 +881,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" @@ -901,8 +901,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" @@ -921,8 +921,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" @@ -940,7 +940,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) @@ -968,7 +968,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) @@ -987,8 +987,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" @@ -1007,8 +1007,8 @@ style = , Layer.lineOpacity (float 1) , Layer.lineColor (E.rgba 242 201 170 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" @@ -1027,7 +1027,7 @@ style = ] ) , Layer.iconOpacity (float 0.5) - , 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) @@ -1040,8 +1040,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 15, float 0 ), ( 15.25, float 1 ) ]) , Layer.lineWidth (float 10) , Layer.linePattern (str "cliff") - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "ferry" "composite" @@ -1051,7 +1051,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" @@ -1065,7 +1065,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" @@ -1085,7 +1085,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 17, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-piste-bg" "composite" @@ -1104,7 +1104,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) , Layer.lineColor (E.rgba 99 123 242 1) , Layer.lineBlur (float 0) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-sidewalk-corridor-bg" "composite" @@ -1125,7 +1125,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.25 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-steps-bg" "composite" @@ -1143,7 +1143,7 @@ style = , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 17, float 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 0.25 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-pedestrian-case" "composite" @@ -1154,7 +1154,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 ] ] ) @@ -1162,7 +1162,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" @@ -1173,7 +1173,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 ] ] ) @@ -1183,8 +1183,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" @@ -1195,7 +1195,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 ] ] ) @@ -1205,8 +1205,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-track-case" "composite" @@ -1223,8 +1223,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 18, float 12 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "road-service-link-case" "composite" @@ -1243,8 +1243,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" @@ -1255,7 +1255,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 ] ] ) @@ -1263,8 +1263,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" @@ -1275,7 +1275,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 ] ] ) @@ -1283,8 +1283,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" @@ -1302,8 +1302,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" @@ -1321,8 +1321,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" @@ -1341,8 +1341,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" @@ -1361,8 +1361,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" @@ -1380,8 +1380,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" @@ -1398,8 +1398,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" @@ -1410,7 +1410,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 ] ] ) @@ -1426,7 +1426,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "road-sidewalk-corridor" "composite" @@ -1449,7 +1449,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 3, 0.4 ] ), ( 16, E.floats [ 3, 0.35 ] ), ( 17, E.floats [ 3, 0.35 ] ) ] ) , 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-smooth" "composite" @@ -1472,7 +1472,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 3, 0.4 ] ), ( 16, E.floats [ 3, 0.35 ] ), ( 17, E.floats [ 3, 0.35 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-path-rough" "composite" @@ -1495,7 +1495,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 1.75, 0.4 ] ), ( 16, E.floats [ 1, 0.4 ] ), ( 17, E.floats [ 1, 0.35 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-cycleway-piste" "composite" @@ -1513,7 +1513,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 18, float 4 ) ]) , Layer.lineColor (E.rgba 255 255 255 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-steps" "composite" @@ -1534,7 +1534,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 1.75, 0.4 ] ), ( 16, E.floats [ 0.75, 0.4 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-trunk_link" "composite" @@ -1552,8 +1552,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 229 203 117 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" @@ -1571,8 +1571,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 229 171 127 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" @@ -1583,7 +1583,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 ] ] ) @@ -1591,7 +1591,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" @@ -1602,7 +1602,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 ] ] ) @@ -1622,7 +1622,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 ] ] ) @@ -1662,8 +1662,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 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-service-link" "composite" @@ -1681,8 +1681,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" @@ -1693,15 +1693,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" @@ -1712,15 +1712,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" @@ -1737,8 +1737,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" @@ -1755,8 +1755,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 ), ( 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.symbol "road-oneway-arrows-blue-minor" "composite" @@ -1774,9 +1774,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) ] @@ -1803,9 +1803,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) ] @@ -1826,8 +1826,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 229 203 117 1 ) ] ) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "road-motorway" "composite" @@ -1843,8 +1843,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 229 171 127 1 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "road-rail" "composite" @@ -1861,7 +1861,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" @@ -1880,7 +1880,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 + , Layer.lineJoin E.rounded ] , Layer.symbol "road-oneway-arrows-white" "composite" @@ -1899,7 +1899,7 @@ style = ] ) , Layer.iconOpacity (float 0.5) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.iconImage (E.zoom |> E.step (str "oneway-white-small") [ ( 17, str "oneway-white-large" ) ]) , Layer.iconPadding (float 2) , Layer.symbolSpacing (float 200) @@ -1913,8 +1913,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 16, float 1 ), ( 20, float 3 ) ]) , Layer.lineOpacity (float 1) , Layer.lineDasharray (E.floats [ 1, 2, 5, 2, 1, 2 ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "fences" "composite" @@ -1925,8 +1925,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 16, float 1 ), ( 20, float 3 ) ]) , Layer.lineOpacity (float 1) , Layer.lineDasharray (E.floats [ 1, 2, 5, 2, 1, 2 ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "gates" "composite" @@ -1937,8 +1937,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 16, float 1 ), ( 20, float 3 ) ]) , Layer.lineOpacity (float 0.5) , Layer.lineDasharray (E.floats [ 1, 2, 5, 2, 1, 2 ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-path-bg" "composite" @@ -1957,7 +1957,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 17, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-piste-bg" "composite" @@ -1977,7 +1977,7 @@ style = , Layer.lineColor (E.rgba 88 163 217 1) , Layer.lineBlur (float 0) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-steps-bg" "composite" @@ -1995,7 +1995,7 @@ style = , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0 ), ( 17, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-pedestrian-case" "composite" @@ -2014,7 +2014,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 "bridge-street-low" "composite" @@ -2035,8 +2035,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" @@ -2057,8 +2057,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-track-case" "composite" @@ -2075,7 +2075,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , Layer.lineColor (E.rgba 204 170 0 1) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 18, float 12 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-service-link-case" "composite" @@ -2094,7 +2094,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street_limited-case" "composite" @@ -2112,7 +2112,7 @@ 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) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street-case" "composite" @@ -2131,7 +2131,7 @@ style = , Layer.lineColor (E.rgba 213 216 229 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" @@ -2149,7 +2149,7 @@ 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.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-primary-case" "composite" @@ -2167,7 +2167,7 @@ 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.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-case" "composite" @@ -2188,7 +2188,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-case" "composite" @@ -2209,7 +2209,7 @@ 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 (float 1) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-case" "composite" @@ -2228,7 +2228,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-case" "composite" @@ -2247,7 +2247,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-construction" "composite" @@ -2274,7 +2274,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "bridge-path" "composite" @@ -2297,7 +2297,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 3, 0.4 ] ), ( 16, E.floats [ 3, 0.35 ] ), ( 17, E.floats [ 3, 0.35 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-cycleway-piste" "composite" @@ -2315,7 +2315,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 18, float 4 ) ]) , Layer.lineColor (E.rgba 255 255 255 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-steps" "composite" @@ -2336,7 +2336,7 @@ style = |> E.step (E.floats [ 4, 0.4 ]) [ ( 15, E.floats [ 1.75, 0.4 ] ), ( 16, E.floats [ 0.75, 0.4 ] ), ( 17, E.floats [ 0.3, 0.3 ] ) ] ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 0 ), ( 13.25, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link" "composite" @@ -2355,8 +2355,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 229 203 117 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link" "composite" @@ -2375,8 +2375,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 229 171 127 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-pedestrian" "composite" @@ -2395,7 +2395,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-track" "composite" @@ -2411,8 +2411,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 15, float 1 ), ( 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 "bridge-service-link" "composite" @@ -2431,8 +2431,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 "bridge-street_limited" "composite" @@ -2450,8 +2450,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 "bridge-street" "composite" @@ -2469,8 +2469,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 "bridge-secondary-tertiary" "composite" @@ -2487,8 +2487,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 "bridge-primary" "composite" @@ -2505,8 +2505,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.symbol "bridge-oneway-arrows-blue-minor" "composite" @@ -2523,10 +2523,10 @@ 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.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map , Layer.iconPadding (float 2) ] , Layer.symbol "bridge-oneway-arrows-blue-major" @@ -2551,10 +2551,10 @@ 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.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map , Layer.iconPadding (float 2) ] , Layer.line "bridge-trunk" @@ -2573,8 +2573,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 229 203 117 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway" "composite" @@ -2592,8 +2592,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 229 171 127 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-rail" "composite" @@ -2610,7 +2610,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 "bridge-rail-tracks" "composite" @@ -2629,7 +2629,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 ), ( 20, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2-case" "composite" @@ -2649,7 +2649,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2-case" "composite" @@ -2669,7 +2669,7 @@ 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 (float 1) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2-case" "composite" @@ -2687,7 +2687,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2-case" "composite" @@ -2705,7 +2705,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2" "composite" @@ -2723,8 +2723,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 229 203 117 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2" "composite" @@ -2742,8 +2742,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 229 171 127 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2" "composite" @@ -2760,8 +2760,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 229 203 117 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2" "composite" @@ -2778,8 +2778,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 229 171 127 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.symbol "bridge-oneway-arrows-white" "composite" @@ -2798,7 +2798,7 @@ style = ] ) , Layer.iconOpacity (float 0.5) - , 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) @@ -2816,7 +2816,7 @@ style = , Layer.lineColor (E.rgba 255 255 255 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 2.5 ), ( 20, float 3 ) ]) , Layer.lineBlur (float 0.5) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "aerialway" "composite" @@ -2830,7 +2830,7 @@ style = ) , Layer.lineColor (E.rgba 70 71 76 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 "admin-3-4-boundaries-bg" "composite" @@ -2847,7 +2847,7 @@ style = , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 8, float 3 ) ]) - , Layer.lineJoin E.lineJoinBevel + , Layer.lineJoin E.bevel ] , Layer.line "admin-2-boundaries-bg" "composite" @@ -2864,7 +2864,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 4, float 0.5 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "admin-3-4-boundaries" "composite" @@ -2879,8 +2879,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 0.75 ), ( 12, float 1.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 2, float 0 ), ( 3, float 1 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, E.rgba 188 190 204 1 ), ( 7, E.rgba 150 152 165 1 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries" "composite" @@ -2895,8 +2895,8 @@ style = ) , Layer.lineColor (E.rgba 120 123 140 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries-dispute" "composite" @@ -2912,7 +2912,7 @@ style = , Layer.lineDasharray (E.floats [ 1.5, 1.5 ]) , Layer.lineColor (E.rgba 120 123 140 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "housenum-label" "composite" @@ -2938,7 +2938,7 @@ style = , Layer.textHaloBlur (float 0) , Layer.textHaloColor (E.rgba 255 255 255 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "ele") |> E.append (str " m"))) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textMaxAngle (float 25) , Layer.textPadding (float 5) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) @@ -2955,7 +2955,7 @@ style = , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textMaxAngle (float 30) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 12 ), ( 18, float 16 ) ]) ] @@ -3016,8 +3016,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3079,8 +3079,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3119,8 +3119,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3158,8 +3158,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3197,8 +3197,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3235,9 +3235,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -3267,9 +3267,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -3288,9 +3288,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -3355,13 +3355,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -3427,13 +3427,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -3477,8 +3477,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3495,7 +3495,7 @@ style = , Layer.iconImage (E.getProperty (str "maki") |> E.append (str "-15")) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3513,7 +3513,7 @@ style = , Layer.iconImage (E.getProperty (str "maki") |> E.append (str "-15")) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en") |> E.append (str ", ") |> E.append (E.getProperty (str "elevation_m")) |> E.append (str "m"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3554,8 +3554,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3596,8 +3596,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3620,8 +3620,8 @@ style = , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.85 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (str "")) [ ( 13, E.toFormattedText (E.getProperty (str "name_en")) ) ]) , Layer.textLetterSpacing (float 0.01) , Layer.iconPadding (float 0) @@ -3685,8 +3685,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3727,8 +3727,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3752,8 +3752,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.75 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (E.getProperty (str "ref"))) [ ( 12, E.toFormattedText (E.getProperty (str "name_en")) ) ] @@ -3779,7 +3779,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3795,7 +3795,7 @@ style = , Layer.textColor (E.rgba 63 71 115 1) , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 7) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) @@ -3813,7 +3813,7 @@ style = , Layer.textColor (E.rgba 63 71 115 1) , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 7) @@ -3863,7 +3863,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 12, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, E.floats [ 0, -0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 11.5 ), ( 15, float 20 ) ]) @@ -3883,7 +3883,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 7) @@ -3910,7 +3910,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.2 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -3933,7 +3933,7 @@ style = , Layer.iconOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, float 1 ), ( 8, float 0 ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.iconImage (str "dot-10") - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.1 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.textFont (E.zoom @@ -3964,7 +3964,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 5, float 12 ), ( 12, float 22 ) ]) @@ -3993,7 +3993,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -4023,7 +4023,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -4044,7 +4044,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 12 ), ( 6, float 16 ) ]) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 100 ), ( 6, float 400 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 5) @@ -4084,7 +4084,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1.1) [ ( 2, float 12 ), ( 5, float 20 ) ]) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 5) @@ -4119,7 +4119,7 @@ style = , Layer.textMaxWidth (float 4) , Layer.textLetterSpacing (float 0.25) , Layer.textLineHeight (float 1.1) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 1, float 14 ), ( 4, float 30 ) ]) ] @@ -4148,7 +4148,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 10 ), ( 9, float 14 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -4173,7 +4173,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 10 ), ( 8, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -4193,7 +4193,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 10 ), ( 7, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textPadding (float 1) , Layer.textField diff --git a/examples/Styles/SatelliteStreets.elm b/examples/Styles/SatelliteStreets.elm index b51050d..88d69eb 100644 --- a/examples/Styles/SatelliteStreets.elm +++ b/examples/Styles/SatelliteStreets.elm @@ -35,7 +35,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 12 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-street_limited case" "composite" @@ -58,7 +58,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 12 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-street case" "composite" @@ -81,7 +81,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , 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 "tunnel-primary-case" "composite" @@ -104,7 +104,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-trunk_link-case" "composite" @@ -127,7 +127,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , 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 "tunnel-motorway_link-case" "composite" @@ -150,8 +150,8 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-trunk-case" "composite" @@ -171,7 +171,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-motorway-case" "composite" @@ -191,7 +191,7 @@ style = , Layer.lineDasharray (E.floats [ 3, 3 ]) , Layer.lineBlur (float 0) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-path" "composite" @@ -213,7 +213,7 @@ style = (E.zoom |> 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-trunk_link" "composite" @@ -232,8 +232,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , 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-motorway_link" "composite" @@ -255,8 +255,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) , 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-pedestrian case" "composite" @@ -277,7 +277,7 @@ style = , Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.5, 1 ] ), ( 16, E.floats [ 1, 2 ] ) ]) , Layer.lineBlur (float 0) , 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 "tunnel-service-link-track case" "composite" @@ -298,7 +298,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0.75 ), ( 16, float 0.5 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 12 ) ]) , Layer.lineDasharray (E.floats [ 1, 0 ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-street_limited" "composite" @@ -317,7 +317,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineBlur (float 0) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-street" "composite" @@ -336,7 +336,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineBlur (float 0) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "tunnel-secondary-tertiary" "composite" @@ -355,8 +355,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 12 ) ]) , 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" @@ -375,8 +375,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineBlur (float 0) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.symbol "tunnel-oneway-arrows-blue-minor" "composite" @@ -438,8 +438,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) , 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-motorway" "composite" @@ -461,8 +461,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 18 ) ]) , 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-white" "composite" @@ -482,7 +482,7 @@ style = ] ) , Layer.iconImage (str "oneway-spaced-white-large") - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 150) , Layer.iconPadding (float 2) ] @@ -494,7 +494,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.5, float 0 ), ( 8, float 0.15 ), ( 16, float 0.5 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 18, float 2.5 ) ]) , Layer.lineDasharray (E.zoom |> E.step (E.floats [ 3.5, 2 ]) [ ( 14, E.floats [ 2, 1 ] ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "ferry, auto" "composite" @@ -508,7 +508,7 @@ style = , Layer.lineColor (E.rgba 219 219 219 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.5, float 0 ), ( 8, float 0.15 ), ( 16, float 0.5 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 18, float 2.5 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "ferry-label" "composite" @@ -525,7 +525,7 @@ style = , Layer.textLetterSpacing (float 0.01) , Layer.textLineHeight (float 1.1) , Layer.textMaxWidth (float 7) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line ] , Layer.line "road-link case" "composite" @@ -544,8 +544,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 20, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-motorway_link-case" "composite" @@ -567,8 +567,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 16, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-primary-case" "composite" @@ -593,7 +593,7 @@ style = ) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-trunk_link-case" "composite" @@ -615,8 +615,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 0.75 ), ( 12, float 0.65 ), ( 18, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 14, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-trunk-case" "composite" @@ -634,8 +634,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9, E.rgba 66 65 65 1 ), ( 12, E.rgba 79 78 78 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 0.5 ), ( 18, float 2 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 11, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 11, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-motorway-case" "composite" @@ -656,8 +656,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 2 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 11, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 11, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-path" "composite" @@ -680,7 +680,7 @@ style = (E.zoom |> 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-trunk_link" "composite" @@ -698,8 +698,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 184 172 64 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-motorway_link" "composite" @@ -720,8 +720,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-pedestrian" "composite" @@ -732,7 +732,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 ] ] ) @@ -740,7 +740,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 1 ), ( 18, float 2.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0.25 ), ( 15, float 0.4 ), ( 16, float 0.75 ) ]) , Layer.lineDasharray (E.zoom |> E.step (E.floats [ 1, 0 ]) [ ( 15, E.floats [ 1.5, 1 ] ), ( 16, E.floats [ 1, 2 ] ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "road-link" "composite" @@ -758,8 +758,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, E.rgba 143 141 141 1 ), ( 10, E.rgba 191 191 191 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 14, float 0.5 ), ( 18, float 12 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-street_limited" "composite" @@ -770,15 +770,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.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 0 ), ( 14, float 0.25 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-street" "composite" @@ -789,15 +789,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.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 0 ), ( 14, float 0.5 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-secondary-tertiary" "composite" @@ -814,8 +814,8 @@ style = , Layer.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 11.5, float 0 ), ( 12.5, float 0.65 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 16, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-primary" "composite" @@ -835,8 +835,8 @@ style = |> E.interpolate (E.Exponential 1) [ ( 6, float 0.25 ), ( 8, float 0.6 ), ( 14, float 1 ), ( 16, float 0 ) ] ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.5 ), ( 12, float 1.75 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.symbol "road-oneway-arrows-blue-minor" "composite" @@ -855,10 +855,10 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) - , Layer.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map ] , Layer.symbol "road-oneway-arrows-blue-major" "composite" @@ -884,10 +884,10 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) - , Layer.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map ] , Layer.line "road-trunk" "composite" @@ -905,8 +905,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 206 193 68 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "road-motorway" "composite" @@ -926,8 +926,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.symbol "road-oneway-arrows-white" "composite" @@ -946,7 +946,7 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) ] @@ -972,7 +972,7 @@ style = ) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-case" "composite" @@ -997,8 +997,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 0.75 ), ( 12, float 0.65 ), ( 18, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 14, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-case" "composite" @@ -1022,7 +1022,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 16, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-case" "composite" @@ -1042,8 +1042,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 9, E.rgba 66 65 65 1 ), ( 12, E.rgba 79 78 78 1 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 0.5 ), ( 18, float 2 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 11, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 11, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-case" "composite" @@ -1066,7 +1066,7 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 2 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-path" "composite" @@ -1088,7 +1088,7 @@ style = (E.zoom |> 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link" "composite" @@ -1108,8 +1108,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 184 172 64 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link" "composite" @@ -1132,8 +1132,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street_limited" "composite" @@ -1151,8 +1151,8 @@ style = , Layer.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 0 ), ( 14, float 0.25 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street" "composite" @@ -1170,8 +1170,8 @@ style = , Layer.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 0 ), ( 14, float 0.5 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 10.5, float 0.5 ), ( 12, float 4 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-secondary-tertiary" "composite" @@ -1188,8 +1188,8 @@ style = , Layer.lineColor (E.rgba 43 42 42 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 11.5, float 0 ), ( 12.5, float 0.65 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 16, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-primary" "composite" @@ -1209,8 +1209,8 @@ style = |> E.interpolate (E.Exponential 1) [ ( 6, float 0.25 ), ( 8, float 0.6 ), ( 14, float 1 ), ( 16, float 0 ) ] ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.5 ), ( 12, float 1.75 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.symbol "bridge-oneway-arrows-blue-minor" "composite" @@ -1228,10 +1228,10 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) - , Layer.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map ] , Layer.symbol "bridge-oneway-arrows-blue-major" "composite" @@ -1256,10 +1256,10 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) - , Layer.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map ] , Layer.line "bridge-trunk" "composite" @@ -1279,8 +1279,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 206 193 68 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway" "composite" @@ -1302,8 +1302,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2-case" "composite" @@ -1327,7 +1327,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 0.75 ), ( 12, float 0.65 ), ( 18, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.75 ), ( 14, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2-case" "composite" @@ -1350,7 +1350,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 16, float 2 ) ]) , Layer.lineGapWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2-case" "composite" @@ -1373,7 +1373,7 @@ style = (E.zoom |> E.interpolate (E.Exponential 1.2) [ ( 5, float 0 ), ( 5.5, float 0.5 ), ( 8, float 0.85 ), ( 14, float 0.2 ), ( 16, float 0 ) ] ) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2-case" "composite" @@ -1396,7 +1396,7 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 16, float 2 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2" "composite" @@ -1415,8 +1415,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 184 172 64 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2" "composite" @@ -1438,8 +1438,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 12, float 0.5 ), ( 14, float 2 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2" "composite" @@ -1457,8 +1457,8 @@ style = , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, E.rgba 206 193 68 1 ), ( 18, E.rgba 209 210 208 1 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2" "composite" @@ -1479,8 +1479,8 @@ style = ) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 16, float 0 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 1 ), ( 12, float 2 ), ( 18, float 1 ) ]) - , Layer.lineCap (E.zoom |> E.step E.lineCapRound [ ( 12, E.lineCapButt ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap (E.zoom |> E.step E.rounded [ ( 12, E.butt ) ]) + , Layer.lineJoin E.rounded ] , Layer.symbol "bridge-oneway-arrows-white" "composite" @@ -1500,7 +1500,7 @@ style = ] ) , Layer.iconImage (E.zoom |> E.step (str "oneway-spaced-small") [ ( 17, str "oneway-spaced-large" ) ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.symbolSpacing (float 200) , Layer.iconPadding (float 2) ] @@ -1531,7 +1531,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12.5, float 0 ), ( 14, float 0.25 ), ( 16, float 0.75 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 0.5 ), ( 18, float 2.5 ) ]) , Layer.lineBlur (float 1) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "aerialway" "composite" @@ -1560,7 +1560,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 0 ), ( 12.5, float 0.25 ), ( 16, float 0.75 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 14, float 1 ), ( 18, float 2.5 ) ]) , Layer.lineDasharray (E.zoom |> E.step (E.floats [ 3.5, 2 ]) [ ( 22, E.floats [ 2, 1 ] ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "admin-3-4-boundaries-bg" "composite" @@ -1580,7 +1580,7 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 2.5 ), ( 10, float 4.5 ) ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 8, float 3 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinBevel + , Layer.lineJoin E.bevel ] , Layer.line "admin-2-boundaries-bg" "composite" @@ -1597,7 +1597,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 0.1 ), ( 8, float 0.35 ) ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 10, float 2 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "admin-3-4-boundaries" "composite" @@ -1612,8 +1612,8 @@ style = , Layer.lineDasharray (E.floats [ 5, 2.5 ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 1 ), ( 12, float 0.5 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 1 ), ( 9, float 1.75 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "admin-2-boundaries" "composite" @@ -1628,8 +1628,8 @@ style = , Layer.lineColor (E.rgba 0 0 0 1) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 0.5 ), ( 6, float 0.75 ) ]) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 0.75 ), ( 4, float 3 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "admin-2-boundaries offset" "composite" @@ -1650,8 +1650,8 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 0.25 ), ( 4, float 0.5 ), ( 8, float 0.75 ) ]) , Layer.lineBlur (float 0) , Layer.lineOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 1.5 ), ( 4, float 0.75 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "admin-2-boundaries-dispute" "composite" @@ -1667,7 +1667,7 @@ style = , Layer.lineDasharray (E.floats [ 4, 8 ]) , Layer.lineWidth (float 0.75) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 0, float 1 ), ( 12, float 0.75 ), ( 16, float 0 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "waterway-label" "composite" @@ -1683,7 +1683,7 @@ style = , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textMaxAngle (float 30) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 12 ), ( 18, float 16 ) ]) ] @@ -1721,7 +1721,7 @@ style = ) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -1761,7 +1761,7 @@ style = ) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -1797,8 +1797,8 @@ style = , Layer.iconImage (E.zoom |> E.step (str "") [ ( 14, E.getProperty (str "maki") |> E.append (str "-15") ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Medium Italic", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -1837,7 +1837,7 @@ style = ) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -1873,8 +1873,8 @@ style = , Layer.iconImage (E.zoom |> E.step (str "") [ ( 14, E.getProperty (str "maki") |> E.append (str "-15") ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Medium Italic", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -1913,9 +1913,9 @@ style = (E.zoom |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 14, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) ] , Layer.symbol "road-label-medium" @@ -1937,9 +1937,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) ] , Layer.symbol "road-label-large" @@ -1955,9 +1955,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) ] , Layer.symbol "road-label-xlarge" @@ -1975,9 +1975,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) ] , Layer.symbol "road-shields-black" @@ -2052,13 +2052,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -2134,13 +2134,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -2191,7 +2191,7 @@ style = ) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textAnchor E.positionTop + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2228,8 +2228,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium Italic", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2252,8 +2252,8 @@ style = , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.85 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (str "")) [ ( 13, E.toFormattedText (E.getProperty (str "name_en")) ) ]) , Layer.textLetterSpacing (float 0.01) , Layer.iconPadding (float 0) @@ -2321,8 +2321,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium Italic", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2363,8 +2363,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2389,8 +2389,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.75 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (E.getProperty (str "ref"))) [ ( 12, E.toFormattedText (E.getProperty (str "name_en")) ) ] @@ -2413,7 +2413,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2430,7 +2430,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textLineHeight (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 11 ), ( 16, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 3) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) @@ -2449,7 +2449,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textLineHeight (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 12, float 11 ), ( 15, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 3) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) @@ -2497,7 +2497,7 @@ style = ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, E.floats [ 0, -0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.iconSize (float 1) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2525,7 +2525,7 @@ style = ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, E.floats [ 0, -0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.iconSize (float 1) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2544,7 +2544,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 7) @@ -2573,7 +2573,7 @@ style = ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.2 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.iconSize (float 1) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 0.02 ), ( 6, float 0.07 ) ]) , Layer.textMaxWidth (float 7) @@ -2598,7 +2598,7 @@ style = , Layer.textOpacity (float 1) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.iconImage (str "dot-10") - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.1 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.textFont (E.zoom @@ -2632,7 +2632,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2663,7 +2663,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2694,7 +2694,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -2714,7 +2714,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 12 ), ( 6, float 16 ) ]) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 100 ), ( 6, float 400 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 5) @@ -2754,7 +2754,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1.1) [ ( 2, float 12 ), ( 5, float 20 ) ]) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 5) @@ -2789,7 +2789,7 @@ style = , Layer.textMaxWidth (float 4) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 1, float 14 ), ( 4, float 30 ) ]) , Layer.textLineHeight (float 1.1) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) , Layer.textLetterSpacing (float 0.25) ] @@ -2818,7 +2818,7 @@ style = , Layer.textHaloWidth (float 1) , Layer.textOpacity (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 10 ), ( 9, float 14 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2842,7 +2842,7 @@ style = , Layer.textHaloColor (E.rgba 44 45 46 1) , Layer.textHaloWidth (float 2) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 10 ), ( 8, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -2862,7 +2862,7 @@ style = , Layer.textOpacity (float 1) , Layer.textHaloWidth (float 2) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 10 ), ( 7, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textPadding (float 1) , Layer.textField 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 + , Layer.lineJoin E.rounded ] , Layer.symbol "road-oneway-arrows-white" "composite" @@ -1610,7 +1610,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.iconPadding (float 2) , Layer.symbolSpacing (float 200) @@ -1631,7 +1631,7 @@ style = , Layer.iconAllowOverlap true , Layer.iconIgnorePlacement true , Layer.iconPadding (float 0) - , Layer.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map ] , Layer.line "bridge-path-bg" "composite" @@ -1651,8 +1651,8 @@ style = , Layer.lineColor (E.rgba 201 203 216 1) , Layer.lineBlur (float 0) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 15, float 0 ), ( 15.25, float 1 ) ]) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-steps-bg" "composite" @@ -1670,7 +1670,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 "bridge-pedestrian-case" "composite" @@ -1689,7 +1689,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 "bridge-street-low" "composite" @@ -1710,8 +1710,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" @@ -1732,8 +1732,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" @@ -1753,7 +1753,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street_limited-case" "composite" @@ -1771,7 +1771,7 @@ 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) [ ( 13, float 0 ), ( 14, float 2 ), ( 18, float 18 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-street-case" "composite" @@ -1790,7 +1790,7 @@ style = , Layer.lineColor (E.rgba 213 216 229 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" @@ -1808,7 +1808,7 @@ 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.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-primary-case" "composite" @@ -1826,7 +1826,7 @@ 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.lineTranslate (E.floats [ 0, 0 ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-case" "composite" @@ -1847,7 +1847,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-case" "composite" @@ -1868,7 +1868,7 @@ 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 (float 1) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-case" "composite" @@ -1887,7 +1887,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-case" "composite" @@ -1906,7 +1906,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-construction" "composite" @@ -1933,7 +1933,7 @@ style = , ( 18, E.floats [ 0.15, 0.15 ] ) ] ) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "bridge-path" "composite" @@ -1955,7 +1955,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" @@ -1976,7 +1976,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" @@ -1995,8 +1995,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link" "composite" @@ -2015,8 +2015,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-pedestrian" "composite" @@ -2035,7 +2035,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" @@ -2054,8 +2054,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 "bridge-street_limited" "composite" @@ -2073,8 +2073,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 "bridge-street" "composite" @@ -2092,8 +2092,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 "bridge-secondary-tertiary" "composite" @@ -2110,8 +2110,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 "bridge-primary" "composite" @@ -2128,8 +2128,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.symbol "bridge-oneway-arrows-blue-minor" "composite" @@ -2146,10 +2146,10 @@ 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.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map , Layer.iconPadding (float 2) ] , Layer.symbol "bridge-oneway-arrows-blue-major" @@ -2174,10 +2174,10 @@ 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.iconRotationAlignment E.anchorMap + , Layer.iconRotationAlignment E.map , Layer.iconPadding (float 2) ] , Layer.line "bridge-trunk" @@ -2196,8 +2196,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 242 208 99 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway" "composite" @@ -2215,8 +2215,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 255 162 91 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-rail" "composite" @@ -2233,7 +2233,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 "bridge-rail-tracks" "composite" @@ -2252,7 +2252,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 ), ( 20, float 1 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2-case" "composite" @@ -2272,7 +2272,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2-case" "composite" @@ -2292,7 +2292,7 @@ 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 (float 1) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2-case" "composite" @@ -2310,7 +2310,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2-case" "composite" @@ -2328,7 +2328,7 @@ 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.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk_link-2" "composite" @@ -2346,8 +2346,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway_link-2" "composite" @@ -2365,8 +2365,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.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-trunk-2" "composite" @@ -2383,8 +2383,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 242 208 99 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.line "bridge-motorway-2" "composite" @@ -2401,8 +2401,8 @@ style = ) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1.5) [ ( 5, float 0.75 ), ( 18, float 32 ) ]) , Layer.lineColor (E.rgba 255 162 91 1) - , Layer.lineCap E.lineCapRound - , Layer.lineJoin E.lineJoinRound + , Layer.lineCap E.rounded + , Layer.lineJoin E.rounded ] , Layer.symbol "bridge-oneway-arrows-white" "composite" @@ -2421,7 +2421,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) @@ -2438,7 +2438,7 @@ style = ) , Layer.lineColor (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 "admin-3-4-boundaries-bg" "composite" @@ -2455,7 +2455,7 @@ style = , Layer.lineDasharray (E.floats [ 1, 0 ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 8, float 3 ) ]) - , Layer.lineJoin E.lineJoinBevel + , Layer.lineJoin E.bevel ] , Layer.line "admin-2-boundaries-bg" "composite" @@ -2472,7 +2472,7 @@ style = , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 4, float 0.5 ) ]) , Layer.lineTranslate (E.floats [ 0, 0 ]) , Layer.lineBlur (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinMiter + , Layer.lineJoin E.miter ] , Layer.line "admin-3-4-boundaries" "composite" @@ -2487,8 +2487,8 @@ style = , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 0.75 ), ( 12, float 1.5 ) ]) , Layer.lineOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 2, float 0 ), ( 3, float 1 ) ]) , Layer.lineColor (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, E.rgba 188 190 204 1 ), ( 7, E.rgba 150 152 165 1 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries" "composite" @@ -2503,8 +2503,8 @@ style = ) , Layer.lineColor (E.rgba 120 123 140 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound - , Layer.lineCap E.lineCapRound + , Layer.lineJoin E.rounded + , Layer.lineCap E.rounded ] , Layer.line "admin-2-boundaries-dispute" "composite" @@ -2520,7 +2520,7 @@ style = , Layer.lineDasharray (E.floats [ 1.5, 1.5 ]) , Layer.lineColor (E.rgba 120 123 140 1) , Layer.lineWidth (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 0.5 ), ( 10, float 2 ) ]) - , Layer.lineJoin E.lineJoinRound + , Layer.lineJoin E.rounded ] , Layer.symbol "housenum-label" "composite" @@ -2547,7 +2547,7 @@ style = , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textMaxAngle (float 30) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 13, float 12 ), ( 18, float 16 ) ]) ] @@ -2586,8 +2586,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2627,8 +2627,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2667,8 +2667,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2706,8 +2706,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 1) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2745,8 +2745,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -2781,9 +2781,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2805,9 +2805,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2826,9 +2826,9 @@ style = , Layer.textMaxAngle (float 30) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textPadding (float 1) - , Layer.textRotationAlignment E.anchorMap + , Layer.textRotationAlignment E.map , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) ] @@ -2893,13 +2893,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -2965,13 +2965,13 @@ style = , Layer.textHaloWidth (float 0) , Layer.textSize (float 9) , Layer.iconImage (E.getProperty (str "shield") |> E.append (str "-") |> E.append (E.getProperty (str "reflen"))) - , Layer.iconRotationAlignment E.anchorViewport + , Layer.iconRotationAlignment E.viewport , Layer.textMaxAngle (float 38) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 11, float 150 ), ( 14, float 200 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) - , Layer.symbolPlacement (E.zoom |> E.step E.symbolPlacementPoint [ ( 11, E.symbolPlacementLine ) ]) + , Layer.symbolPlacement (E.zoom |> E.step E.point [ ( 11, E.line ) ]) , Layer.textPadding (float 2) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "ref"))) , Layer.textLetterSpacing (float 0.05) , Layer.iconPadding (float 2) @@ -3024,8 +3024,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3066,8 +3066,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3090,8 +3090,8 @@ style = , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textOffset (E.floats [ 0, 0.85 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (str "")) [ ( 13, E.toFormattedText (E.getProperty (str "name_en")) ) ]) , Layer.textLetterSpacing (float 0.01) , Layer.iconPadding (float 0) @@ -3155,8 +3155,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3197,8 +3197,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.65 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3222,8 +3222,8 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0.75 ]) - , Layer.textRotationAlignment E.anchorViewport - , Layer.textAnchor E.positionTop + , Layer.textRotationAlignment E.viewport + , Layer.textAnchor E.top , Layer.textField (E.zoom |> E.step (E.toFormattedText (E.getProperty (str "ref"))) [ ( 12, E.toFormattedText (E.getProperty (str "name_en")) ) ] @@ -3249,7 +3249,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 8) @@ -3265,7 +3265,7 @@ style = , Layer.textColor (E.rgba 63 71 115 1) , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 7) , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) @@ -3283,7 +3283,7 @@ style = , Layer.textColor (E.rgba 63 71 115 1) , Layer.textHaloBlur (float 0.5) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 7) @@ -3333,7 +3333,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 12, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, E.floats [ 0, -0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7, float 11.5 ), ( 15, float 20 ) ]) @@ -3353,7 +3353,7 @@ style = , Layer.textFont (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) , Layer.textPadding (float 2) , Layer.textOffset (E.floats [ 0, 0 ]) - , Layer.textRotationAlignment E.anchorViewport + , Layer.textRotationAlignment E.viewport , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.01) , Layer.textMaxWidth (float 7) @@ -3380,7 +3380,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.2 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) ] @@ -3403,7 +3403,7 @@ style = , Layer.iconOpacity (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, float 1 ), ( 8, float 0 ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.iconImage (str "dot-10") - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.1 ] ), ( 8, E.floats [ 0, 0 ] ) ]) , Layer.textFont (E.zoom @@ -3434,7 +3434,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 5, float 12 ), ( 12, float 22 ) ]) @@ -3463,7 +3463,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, 0.15 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionTop [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.top [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -3493,7 +3493,7 @@ style = |> E.step (E.strings [ "DIN Offc Pro Regular", "Arial Unicode MS Regular" ]) [ ( 8, E.strings [ "DIN Offc Pro Medium", "Arial Unicode MS Regular" ] ) ] ) , Layer.textOffset (E.zoom |> E.interpolate (E.Exponential 1) [ ( 7.99, E.floats [ 0, -0.25 ] ), ( 8, E.floats [ 0, 0 ] ) ]) - , Layer.textAnchor (E.zoom |> E.step E.positionBottom [ ( 8, E.positionCenter ) ]) + , Layer.textAnchor (E.zoom |> E.step E.bottom [ ( 8, E.center ) ]) , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textMaxWidth (float 7) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 0.9) [ ( 4, float 12 ), ( 10, float 22 ) ]) @@ -3514,7 +3514,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 3, float 12 ), ( 6, float 16 ) ]) , Layer.symbolSpacing (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 100 ), ( 6, float 400 ) ]) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.1) , Layer.textMaxWidth (float 5) @@ -3554,7 +3554,7 @@ style = , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1.1) [ ( 2, float 12 ), ( 5, float 20 ) ]) , Layer.symbolSpacing (float 250) , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textField (E.toFormattedText (E.getProperty (str "name_en"))) , Layer.textLetterSpacing (float 0.15) , Layer.textMaxWidth (float 5) @@ -3589,7 +3589,7 @@ style = , Layer.textMaxWidth (float 4) , Layer.textLetterSpacing (float 0.25) , Layer.textLineHeight (float 1.1) - , Layer.symbolPlacement E.symbolPlacementLine + , Layer.symbolPlacement E.line , Layer.textFont (E.strings [ "DIN Offc Pro Italic", "Arial Unicode MS Regular" ]) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 1, float 14 ), ( 4, float 30 ) ]) ] @@ -3618,7 +3618,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 6, float 10 ), ( 9, float 14 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -3643,7 +3643,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 5, float 10 ), ( 8, float 16 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textField (E.zoom @@ -3663,7 +3663,7 @@ style = , Layer.textHaloColor (E.rgba 255 255 255 1) , Layer.textHaloWidth (float 1) , Layer.textSize (E.zoom |> E.interpolate (E.Exponential 1) [ ( 4, float 10 ), ( 7, float 18 ) ]) - , Layer.textTransform E.textTransformUppercase + , Layer.textTransform E.uppercase , Layer.textFont (E.strings [ "DIN Offc Pro Bold", "Arial Unicode MS Bold" ]) , Layer.textPadding (float 1) , Layer.textField |