diff --git a/@here/harp-map-theme/resources/berlin_tilezen_effects_outlines.json b/@here/harp-map-theme/resources/berlin_tilezen_effects_outlines.json index 8c5966b794..176671c5ed 100644 --- a/@here/harp-map-theme/resources/berlin_tilezen_effects_outlines.json +++ b/@here/harp-map-theme/resources/berlin_tilezen_effects_outlines.json @@ -105,8 +105,9 @@ "renderOrder": 10, "final": true }, + { - "description": "residential", + "description": "residential - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -119,58 +120,75 @@ ["==", ["get", "kind_detail"], "service"] ] ], - "styles": [ - { - "category": "outline", - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": { - "interpolation": "Linear", - "zoomLevels": [10, 11, 12, 13, 14], - "values": [42, 28, 18, 7, 3.5] - }, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 11 + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": { + "interpolation": "Linear", + "zoomLevels": [10, 11, 12, 13, 14], + "values": [42, 28, 18, 7, 3.5] }, - { - "description": "residential", - "category": "fill", - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": { - "interpolation": "Linear", - "zoomLevels": [10, 11, 12, 13, 14], - "values": [38, 24, 13, 5, 3] - }, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 11.3 + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 11 + }, + { + "description": "residential - fill", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "minor_road"], + [ + "any", + ["==", ["get", "kind_detail"], "unclassified"], + ["==", ["get", "kind_detail"], "residential"], + ["==", ["get", "kind_detail"], "service"] + ] + ], + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": { + "interpolation": "Linear", + "zoomLevels": [10, 11, 12, 13, 14], + "values": [38, 24, 13, 5, 3] }, - { - "technique": "text", - "attr": { - "color": "#999999", - "backgroundColor": "#141414", - "backgroundAlpha": 0.5, - "textLabel": "kind_detail", - "size": 0, - "priority": 15, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12 - } - ] + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 11.3 + }, + { + "description": "residential - text", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "minor_road"], + [ + "any", + ["==", ["get", "kind_detail"], "unclassified"], + ["==", ["get", "kind_detail"], "residential"], + ["==", ["get", "kind_detail"], "service"] + ] + ], + "technique": "text", + "attr": { + "color": "#999999", + "backgroundColor": "#141414", + "backgroundOpacity": 0.5, + "textLabel": "kind_detail", + "size": 0, + "priority": 15, + "fadeNear": 0.8, + "fadeFar": 0.9 + }, + "renderOrder": 12 }, - {}, { "description": "secondary", "when": [ @@ -184,18 +202,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textLabel": "kind_detail", "size": 16, "priority": 15, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 12 }, { - "category": "fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -238,18 +254,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 20, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 13 }, { - "description": "tertiary", - "category": "outline", + "description": "tertiary - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -272,8 +286,7 @@ "renderOrder": 10.3 }, { - "description": "tertiary", - "category": "fill", + "description": "tertiary - fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -313,18 +326,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 25, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 10 }, { - "description": "primary", - "category": "outline", + "description": "primary - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -351,8 +362,7 @@ "renderOrder": 10.4 }, { - "description": "primary", - "category": "fill", + "description": "primary - fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -391,12 +401,11 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 25, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 10 }, @@ -453,7 +462,7 @@ "final": true }, { - "description": "pedestrian", + "description": "pedestrian - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -480,73 +489,94 @@ ] ] ], - "styles": [ - { - "category": "outline", - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": 1.5, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 10.3 - }, - { - "category": "fill", - "when": [ - "all", - ["==", ["get", "$layer"], "roads"], - ["!=", ["get", "kind"], "rail"], - ["==", ["get", "kind"], "path"], + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": 1.5, + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 10.3 + }, + { + "description": "pedestrian - fill", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "path"], + [ + "any", + ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], + [ + "in", + ["get", "landuse_kind"], [ - "any", - ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], - [ - "in", - ["get", "landuse_kind"], - [ - "park", - "residential", - "footway", - "garden", - "pedestrian", - "grass", - "allotments", - "forest", - "cemetery", - "natural_wood" - ] - ] + "park", + "residential", + "footway", + "garden", + "pedestrian", + "grass", + "allotments", + "forest", + "cemetery", + "natural_wood" ] - ], - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": 1.3, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12.3 - }, - { - "technique": "text", - "attr": { - "color": "#999999", - "backgroundColor": "#141414", - "backgroundAlpha": 0.5, - "textLabel": "kind_detail", - "size": 0, - "priority": 15, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12 - } - ] + ] + ] + ], + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": 1.3, + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 12.3 + }, + { + "description": "pedestrian - text", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "path"], + [ + "any", + ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], + [ + "in", + ["get", "landuse_kind"], + [ + "park", + "residential", + "footway", + "garden", + "pedestrian", + "grass", + "allotments", + "forest", + "cemetery", + "natural_wood" + ] + ] + ] + ], + "technique": "text", + "attr": { + "color": "#999999", + "backgroundColor": "#141414", + "backgroundOpacity": 0.5, + "textLabel": "kind_detail", + "size": 0, + "priority": 15, + "fadeNear": 0.8, + "fadeFar": 0.9 + }, + "renderOrder": 12 }, { "description": "tram", @@ -592,8 +622,7 @@ "final": true }, { - "description": "Railway+S-Bahn background", - "category": "outline", + "description": "Railway+S-Bahn background - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -605,7 +634,6 @@ "technique": "solid-line", "attr": { "color": "#6A6C6F", - "xclipping": false, "lineWidth": { "interpolation": "Linear", "zoomLevels": [13, 14.6, 15], @@ -615,8 +643,7 @@ "renderOrder": 5.2 }, { - "description": "Railway+S-Bahn background", - "category": "outline", + "description": "Railway+S-Bahn background - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -628,7 +655,6 @@ "technique": "solid-line", "attr": { "color": "#6A6C6F", - "xclipping": false, "lineWidth": { "interpolation": "Linear", "zoomLevels": [13, 21], @@ -650,7 +676,6 @@ "technique": "dashed-line", "attr": { "color": "#7B7E81", - "xclipping": false, "dashSize": { "interpolation": "Discrete", "zoomLevels": [10, 11, 12, 13, 14, 15, 20], @@ -683,7 +708,6 @@ "technique": "dashed-line", "attr": { "color": "#454648", - "xclipping": false, "dashSize": { "interpolation": "Discrete", "zoomLevels": [10, 11, 12, 13, 14, 15, 16], @@ -723,14 +747,13 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "opacity": 0.5, "size": 0 } }, { "description": "country border", - "category": "outline", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -765,7 +788,6 @@ }, { "description": "country border", - "category": "fill", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -796,7 +818,7 @@ "priority": 100, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, @@ -822,7 +844,6 @@ "technique": "dashed-line", "attr": { "color": "#2E3234", - "secondaryColor": "#373A3C", "lineWidth": { "interpolation": "Linear", "zoomLevels": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], @@ -844,26 +865,6 @@ 2 ] }, - "secondaryWidth": { - "interpolation": "Linear", - "zoomLevels": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], - "values": [ - 10000, - 8000, - 7000, - 5000, - 3000, - 2000, - 1000, - 500, - 250, - 120, - 80, - 40, - 20, - 10 - ] - }, "dashSize": { "interpolation": "Cubic", "zoomLevels": [10, 11, 12, 13, 14], @@ -875,8 +876,7 @@ "values": [512, 256, 128, 64, 32] } }, - "renderOrder": 4.1, - "secondaryRenderOrder": 4 + "renderOrder": 4.1 }, { "description": "disputed border line - text", @@ -902,13 +902,12 @@ "priority": 100, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, { - "description": "region border", - "category": "outline", + "description": "region border - outline", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -958,7 +957,7 @@ "priority": 90, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, @@ -972,7 +971,7 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 27.2, "priority": 200 }, @@ -1231,7 +1230,7 @@ }, "color": "#3B3E45", "backgroundColor": "#000000", - "smallCaps": true, + "fontVariant": "SmallCaps", "opacity": 0.6 } }, @@ -1268,11 +1267,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1296,11 +1294,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1323,11 +1320,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1350,7 +1346,7 @@ "priority": 65, "color": "#ffffff", "backgroundColor": "#000000", - "smallCaps": true, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, "iconFadeTime": 0.5, @@ -1370,7 +1366,7 @@ ], "technique": "text", "attr": { - "bold": true, + "fontStyle": "Bold", "priority": 61, "size": { "interpolation": "Linear", @@ -1379,9 +1375,8 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1406,9 +1401,8 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1433,9 +1427,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1460,9 +1453,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1487,9 +1479,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1514,9 +1505,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1541,9 +1531,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1568,9 +1557,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1620,19 +1608,9 @@ "size": 14.4, "opacity": 0.6, "minZoomLevel": 17, - "roughness": 1.95, - "metalness": 0.85, - "emissive": "#1F2020", - "emissiveIntensity": 0.625, - "footprint": true, - "maxSlope": 0.9, "lineWidth": 1, - "lineColor": "#070707", - "lineColorMix": 0.5, "fadeNear": 0.9, - "fadeFar": 1, - "lineFadeNear": 0.25, - "lineFadeFar": 1 + "fadeFar": 1 }, "renderOrder": 100 } diff --git a/@here/harp-map-theme/resources/berlin_tilezen_effects_streets.json b/@here/harp-map-theme/resources/berlin_tilezen_effects_streets.json index 4360b91637..ecd4fa903d 100644 --- a/@here/harp-map-theme/resources/berlin_tilezen_effects_streets.json +++ b/@here/harp-map-theme/resources/berlin_tilezen_effects_streets.json @@ -105,8 +105,9 @@ "renderOrder": 10, "final": true }, + { - "description": "residential", + "description": "residential - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -119,58 +120,75 @@ ["==", ["get", "kind_detail"], "service"] ] ], - "styles": [ - { - "category": "outline", - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": { - "interpolation": "Linear", - "zoomLevels": [10, 11, 12, 13, 14], - "values": [42, 28, 18, 7, 3.5] - }, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 11 + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": { + "interpolation": "Linear", + "zoomLevels": [10, 11, 12, 13, 14], + "values": [42, 28, 18, 7, 3.5] }, - { - "description": "residential", - "category": "fill", - "technique": "solid-line", - "attr": { - "color": "#F2D12E", - "lineWidth": { - "interpolation": "Linear", - "zoomLevels": [10, 11, 12, 13, 14], - "values": [38, 24, 13, 5, 3] - }, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 11.3 + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 11 + }, + { + "description": "residential - fill", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "minor_road"], + [ + "any", + ["==", ["get", "kind_detail"], "unclassified"], + ["==", ["get", "kind_detail"], "residential"], + ["==", ["get", "kind_detail"], "service"] + ] + ], + "technique": "solid-line", + "attr": { + "color": "#F2D12E", + "lineWidth": { + "interpolation": "Linear", + "zoomLevels": [10, 11, 12, 13, 14], + "values": [38, 24, 13, 5, 3] }, - { - "technique": "none", - "attr": { - "color": "#999999", - "backgroundColor": "#141414", - "backgroundAlpha": 0.5, - "textLabel": "kind_detail", - "size": 0, - "priority": 15, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12 - } - ] + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 11.3 + }, + { + "description": "residential - text", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "minor_road"], + [ + "any", + ["==", ["get", "kind_detail"], "unclassified"], + ["==", ["get", "kind_detail"], "residential"], + ["==", ["get", "kind_detail"], "service"] + ] + ], + "technique": "none", + "attr": { + "color": "#999999", + "backgroundColor": "#141414", + "backgroundOpacity": 0.5, + "textLabel": "kind_detail", + "size": 0, + "priority": 15, + "fadeNear": 0.8, + "fadeFar": 0.9 + }, + "renderOrder": 12 }, - {}, { "description": "secondary", "when": [ @@ -184,18 +202,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textLabel": "kind_detail", "size": 16, "priority": 15, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 12 }, { - "category": "fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -238,18 +254,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 20, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 13 }, { - "description": "tertiary", - "category": "outline", + "description": "tertiary - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -272,8 +286,7 @@ "renderOrder": 10.3 }, { - "description": "tertiary", - "category": "fill", + "description": "tertiary - fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -313,18 +326,16 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 25, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 10 }, { - "description": "primary", - "category": "outline", + "description": "primary - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -351,8 +362,7 @@ "renderOrder": 10.4 }, { - "description": "primary", - "category": "fill", + "description": "primary - fill", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -391,12 +401,11 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 0, "priority": 25, "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false + "fadeFar": 0.9 }, "renderOrder": 10 }, @@ -453,7 +462,7 @@ "final": true }, { - "description": "pedestrian", + "description": "pedestrian - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -480,73 +489,94 @@ ] ] ], - "styles": [ - { - "category": "outline", - "technique": "solid-line", - "attr": { - "color": "#000", - "lineWidth": 1.5, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 10.3 - }, - { - "category": "fill", - "when": [ - "all", - ["==", ["get", "$layer"], "roads"], - ["!=", ["get", "kind"], "rail"], - ["==", ["get", "kind"], "path"], + "technique": "solid-line", + "attr": { + "color": "#000", + "lineWidth": 1.5, + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 10.3 + }, + { + "description": "pedestrian - fill", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "path"], + [ + "any", + ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], + [ + "in", + ["get", "landuse_kind"], [ - "any", - ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], - [ - "in", - ["get", "landuse_kind"], - [ - "park", - "residential", - "footway", - "garden", - "pedestrian", - "grass", - "allotments", - "forest", - "cemetery", - "natural_wood" - ] - ] + "park", + "residential", + "footway", + "garden", + "pedestrian", + "grass", + "allotments", + "forest", + "cemetery", + "natural_wood" ] - ], - "technique": "solid-line", - "attr": { - "color": "#FFDD30", - "lineWidth": 1.3, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12.3 - }, - { - "technique": "text", - "attr": { - "color": "#999999", - "backgroundColor": "#141414", - "backgroundAlpha": 0.5, - "textLabel": "kind_detail", - "size": 0, - "priority": 15, - "fadeNear": 0.8, - "fadeFar": 0.9, - "clipping": false - }, - "renderOrder": 12 - } - ] + ] + ] + ], + "technique": "solid-line", + "attr": { + "color": "#FFF4BF", + "lineWidth": 1.3, + "fadeNear": 0.8, + "fadeFar": 0.9, + "clipping": false + }, + "renderOrder": 12.3 + }, + { + "description": "pedestrian - text", + "when": [ + "all", + ["==", ["get", "$layer"], "roads"], + ["!=", ["get", "kind"], "rail"], + ["==", ["get", "kind"], "path"], + [ + "any", + ["in", ["get", "kind_detail"], ["pedestrian", "path", "footway"]], + [ + "in", + ["get", "landuse_kind"], + [ + "park", + "residential", + "footway", + "garden", + "pedestrian", + "grass", + "allotments", + "forest", + "cemetery", + "natural_wood" + ] + ] + ] + ], + "technique": "text", + "attr": { + "color": "#999999", + "backgroundColor": "#141414", + "backgroundOpacity": 0.5, + "textLabel": "kind_detail", + "size": 0, + "priority": 15, + "fadeNear": 0.8, + "fadeFar": 0.9 + }, + "renderOrder": 12 }, { "description": "tram", @@ -592,8 +622,7 @@ "final": true }, { - "description": "Railway+S-Bahn background", - "category": "outline", + "description": "Railway+S-Bahn background - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -605,7 +634,6 @@ "technique": "solid-line", "attr": { "color": "#6A6C6F", - "xclipping": false, "lineWidth": { "interpolation": "Linear", "zoomLevels": [13, 14.6, 15], @@ -615,8 +643,7 @@ "renderOrder": 5.2 }, { - "description": "Railway+S-Bahn background", - "category": "outline", + "description": "Railway+S-Bahn background - outline", "when": [ "all", ["==", ["get", "$layer"], "roads"], @@ -628,7 +655,6 @@ "technique": "solid-line", "attr": { "color": "#6A6C6F", - "xclipping": false, "lineWidth": { "interpolation": "Linear", "zoomLevels": [13, 21], @@ -650,7 +676,6 @@ "technique": "dashed-line", "attr": { "color": "#7B7E81", - "xclipping": false, "dashSize": { "interpolation": "Discrete", "zoomLevels": [10, 11, 12, 13, 14, 15, 20], @@ -683,7 +708,6 @@ "technique": "dashed-line", "attr": { "color": "#454648", - "xclipping": false, "dashSize": { "interpolation": "Discrete", "zoomLevels": [10, 11, 12, 13, 14, 15, 16], @@ -723,14 +747,13 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "opacity": 0.5, "size": 0 } }, { "description": "country border", - "category": "outline", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -765,7 +788,6 @@ }, { "description": "country border", - "category": "fill", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -796,7 +818,7 @@ "priority": 100, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, @@ -822,7 +844,6 @@ "technique": "dashed-line", "attr": { "color": "#2E3234", - "secondaryColor": "#373A3C", "lineWidth": { "interpolation": "Linear", "zoomLevels": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], @@ -844,26 +865,6 @@ 2 ] }, - "secondaryWidth": { - "interpolation": "Linear", - "zoomLevels": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], - "values": [ - 10000, - 8000, - 7000, - 5000, - 3000, - 2000, - 1000, - 500, - 250, - 120, - 80, - 40, - 20, - 10 - ] - }, "dashSize": { "interpolation": "Cubic", "zoomLevels": [10, 11, 12, 13, 14], @@ -875,8 +876,7 @@ "values": [512, 256, 128, 64, 32] } }, - "renderOrder": 4.1, - "secondaryRenderOrder": 4 + "renderOrder": 4.1 }, { "description": "disputed border line - text", @@ -902,13 +902,12 @@ "priority": 100, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, { - "description": "region border", - "category": "outline", + "description": "region border - outline", "when": [ "all", ["==", ["get", "$layer"], "boundaries"], @@ -958,7 +957,7 @@ "priority": 90, "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 12.8 } }, @@ -972,7 +971,7 @@ "attr": { "color": "#999999", "backgroundColor": "#141414", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "size": 27.2, "priority": 200 }, @@ -1231,7 +1230,7 @@ }, "color": "#3B3E45", "backgroundColor": "#000000", - "smallCaps": true, + "fontVariant": "SmallCaps", "opacity": 0.6 } }, @@ -1268,11 +1267,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1296,11 +1294,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1323,11 +1320,10 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, - "smallCaps": true, + "backgroundOpacity": 0.5, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1350,7 +1346,7 @@ "priority": 65, "color": "#ffffff", "backgroundColor": "#000000", - "smallCaps": true, + "fontVariant": "SmallCaps", "opacity": 0.8, "textFadeTime": 0.75, "iconFadeTime": 0.5, @@ -1370,7 +1366,7 @@ ], "technique": "text", "attr": { - "bold": true, + "fontStyle": "Bold", "priority": 61, "size": { "interpolation": "Linear", @@ -1379,9 +1375,8 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1406,9 +1401,8 @@ }, "color": "#ffffff", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1433,9 +1427,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1460,9 +1453,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1487,9 +1479,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1514,9 +1505,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1541,9 +1531,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1568,9 +1557,8 @@ }, "color": "#f4f4f4", "backgroundColor": "#000000", - "backgroundAlpha": 0.5, + "backgroundOpacity": 0.5, "textFadeTime": 0.75, - "iconFadeTime": 0.5, "fadeNear": 0.8, "fadeFar": 0.9 }, @@ -1620,19 +1608,9 @@ "size": 14.4, "opacity": 0.6, "minZoomLevel": 17, - "roughness": 1.95, - "metalness": 0.85, - "emissive": "#1F2020", - "emissiveIntensity": 0.625, - "footprint": true, - "maxSlope": 0.9, "lineWidth": 1, - "lineColor": "#070707", - "lineColorMix": 0.5, "fadeNear": 0.9, - "fadeFar": 1, - "lineFadeNear": 0.25, - "lineFadeFar": 1 + "fadeFar": 1 }, "renderOrder": 100 } diff --git a/@here/harp-map-theme/test/DefaultThemeTest.ts b/@here/harp-map-theme/test/DefaultThemeTest.ts index ec350d4203..f386c704a5 100644 --- a/@here/harp-map-theme/test/DefaultThemeTest.ts +++ b/@here/harp-map-theme/test/DefaultThemeTest.ts @@ -31,7 +31,9 @@ describe("Berlin Theme", function() { "resources/berlin_tilezen_base.json", "resources/berlin_tilezen_base_globe.json", "resources/berlin_tilezen_day_reduced.json", - "resources/berlin_tilezen_night_reduced.json" + "resources/berlin_tilezen_night_reduced.json", + "resources/berlin_tilezen_effects_outlines.json", + "resources/berlin_tilezen_effects_streets.json" ]; themes.forEach(themePath => { diff --git a/@here/harp-test-utils/lib/TestDataUtils.web.ts b/@here/harp-test-utils/lib/TestDataUtils.web.ts index e19dd1734b..fde1040852 100644 --- a/@here/harp-test-utils/lib/TestDataUtils.web.ts +++ b/@here/harp-test-utils/lib/TestDataUtils.web.ts @@ -92,6 +92,9 @@ export function loadTestResourceWeb( logger.log("loadTestResourceWeb, url: ", url); return fetch(url).then(response => { + if (!response.ok) { + throw new Error(`failed to load ${url}: ${response.status} ${response.statusText}`); + } switch (type) { case "arraybuffer": return response.arrayBuffer(); diff --git a/package.json b/package.json index 39ecd91bed..8262d02f00 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "hard-source-webpack-plugin": "^0.13.1", "mkpath": "^1.0.0", "mocha": "^6.1.4", - "mocha-webdriver-runner": "^0.5.2", + "mocha-webdriver-runner": "^0.5.3", "prettier": "^1.18.2", "serve-handler": "^6.0.1", "three": "^0.107.0", diff --git a/webpack.tests.config.js b/webpack.tests.config.js index 3643471b11..4e0aa6b3ae 100644 --- a/webpack.tests.config.js +++ b/webpack.tests.config.js @@ -59,7 +59,11 @@ const browserTestsConfig = { require.resolve("mocha-webdriver-runner/dist/mocha-webdriver-client.js"), ...testResources, path.join(harpMapThemePath, "resources/berlin*.json"), - path.join(harpDataSourceProtocolPath, "theme.schema.json"), + { + from: path.join(harpDataSourceProtocolPath, "theme.schema.json"), + to: "./@here/harp-datasource-protocol", + toType: "dir" + }, { from: path.join(harpFontResourcesPath, "resources"), to: "@here/harp-fontcatalog/resources" diff --git a/yarn.lock b/yarn.lock index 4f2c959ce1..c3e39b788b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1686,17 +1686,12 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== - commander@2.17.x: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0: +commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -2061,13 +2056,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@3.2.6, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -3333,18 +3321,6 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" @@ -3676,11 +3652,6 @@ hasha@^2.2.0: is-stream "^1.0.1" pinkie-promise "^2.0.0" -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= - he@1.2.0, he@1.2.x: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -5078,36 +5049,19 @@ mkpath@^1.0.0: resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d" integrity sha1-67Opd+evHGg65v2hK1Raa6bFhT0= -mocha-webdriver-runner@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/mocha-webdriver-runner/-/mocha-webdriver-runner-0.5.2.tgz#9b417b3d4cf578c8d812abc2a076588de7fc5a37" - integrity sha512-THC+oQiXzP5QgmVrYt+POjoztUXkQYJr+jjvXwlaBK/LJ/v4nRIQsIFFOrHhB0ThxBm7vS2xL23XZZ0XsBFtoQ== +mocha-webdriver-runner@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mocha-webdriver-runner/-/mocha-webdriver-runner-0.5.3.tgz#ccf496b949631d0b6b5f439e06250f932bf61ad6" + integrity sha512-3oXAFCYzlZ+LEK6mI3qKYohIuISmAv5PAg5Fz+C9Tj36CobQglt9M07aip5xh+ImxEz52WZ0nN6fnnMdzveFgw== dependencies: "@zbigg/treesync" "^0.3.0" - commander "^2.18.0" + commander "^2.20.0" events "^3.0.0" - lodash "^4.17.11" - mocha "^5.2.0" - selenium-webdriver "^4.0.0-alpha.1" - -mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== - dependencies: - browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.5" - he "1.1.1" - minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" + lodash "^4.17.15" + mocha "^6.2.0" + selenium-webdriver "^4.0.0-alpha.4" -mocha@^6.1.4: +mocha@^6.1.4, mocha@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.0.tgz#f896b642843445d1bb8bca60eabd9206b8916e56" integrity sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ== @@ -6805,7 +6759,7 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selenium-webdriver@^4.0.0-alpha.1: +selenium-webdriver@^4.0.0-alpha.4: version "4.0.0-alpha.4" resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.4.tgz#73694490e02c941d9d0bf7a36f7c49beb9372512" integrity sha512-etJt20d8qInkxMAHIm5SEpPBSS+CdxVcybnxzSIB/GlWErb8pIWrArz/VA6VfUW0/6tIcokepXQ5ufvdzqqk1A== @@ -7463,13 +7417,6 @@ style-loader@^0.23.0: loader-utils "^1.1.0" schema-utils "^1.0.0" -supports-color@5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== - dependencies: - has-flag "^3.0.0" - supports-color@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"