diff options
Diffstat (limited to 'examples/Styles/SatelliteStreets.elm')
| -rw-r--r-- | examples/Styles/SatelliteStreets.elm | 342 |
1 files changed, 171 insertions, 171 deletions
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" |