diff --git a/defaults/docs-defaults.yaml b/defaults/docs-defaults.yaml index 46d345e..6df1c91 100644 --- a/defaults/docs-defaults.yaml +++ b/defaults/docs-defaults.yaml @@ -104,22 +104,17 @@ defaults: web: pc default_device_embodied_emissions_per_second: scope3: - pc: 0.007000000 - phone: 0.005800000 + pc: 0.005450000 + phone: 0.006550000 radio: 0.002514375 smart-speaker: 0.006100000 - tablet: 0.002900000 - tv: 0.009600000 + tablet: 0.025700000 + tv: 0.008650000 sri: pc: 0.013200000 phone: 0.009460000 tablet: 0.012800000 tv: 0.008890000 - default_device_height: - pc: 1440 - phone: 1920 - tablet: 2048 - tv: 1080 default_device_per_impression: app: 1 ctv-bvod: 1 @@ -137,22 +132,17 @@ defaults: tv: 0 default_device_watts: scope3: - pc: 53.200000000 - phone: 0.770000000 + pc: 55.440000000 + phone: 4.680000000 radio: 6.550000000 smart-speaker: 2.500000000 - tablet: 3.000000000 - tv: 87.400000000 + tablet: 5.040000000 + tv: 136.800000000 sri: pc: 29.400000000 phone: 2.856000000 tablet: 29.400000000 tv: 81.600000000 - default_device_width: - pc: 2560 - phone: 1080 - tablet: 1536 - tv: 1920 default_display_creative_overhead_factor: 0.200000000 default_display_other_assets_bytes: 50000 default_dynamic_watts_per_mbps: @@ -408,6 +398,16 @@ defaults: fm: 245000 ota: 106000 satellite: 3150 + default_rendered_device_height: + pc: 1080 + phone: 844 + tablet: 820 + tv: 1080 + default_rendered_device_width: + pc: 1920 + phone: 390 + tablet: 1180 + tv: 1920 default_storage_kgco2e_per_gb: cloud_storage: 0.025300000 hard_disk_drive: 0.160000000 diff --git a/docs/calculations.mdx b/docs/calculations.mdx index 879fe22..d7626fe 100644 --- a/docs/calculations.mdx +++ b/docs/calculations.mdx @@ -437,9 +437,9 @@ for platform in [creative_platforms, ad_format.ad_platforms]: ### Creative Delivery - Consumer Device ``` -device_pixels = default_device_width[device_type] x default_device_height[device_type] -rendered_width = ad_format.rendered_width_pixels ?? default_device_width[device_type] -rendered_height = ad_format.rendered_height_pixels ?? default_device_height[device_type] +device_pixels = default_rendered_device_width[device_type] x default_rendered_device_height[device_type] +rendered_width = ad_format.rendered_width_pixels ?? default_rendered_device_width[device_type] +rendered_height = ad_format.rendered_height_pixels ?? default_rendered_device_height[device_type] visual_device_coverage = is_primary_experience ? 1 : diff --git a/docs/snippets/defaults_consumer_device.mdx b/docs/snippets/defaults_consumer_device.mdx index b9214c6..e54b0c4 100644 --- a/docs/snippets/defaults_consumer_device.mdx +++ b/docs/snippets/defaults_consumer_device.mdx @@ -1,12 +1,12 @@ ``` default_device_watts: scope3: - phone: 0.77 - pc: 53.2 - tablet: 3.0 - tv: 87.4 - smart-speaker: 2.5 - radio: 6.55 + pc: 55.44 + phone: 4.68 + radio: 6.55 + smart-speaker: 2.5 + tablet: 5.04 + tv: 136.8 sri: phone: 2.856 pc: 29.4 @@ -14,10 +14,10 @@ default_device_watts: tv: 81.6 default_device_embodied_emissions_per_second: scope3: - phone: 0.0058 - pc: 0.007 - tablet: 0.0029 - tv: 0.0096 + phone: 0.00655 + pc: 0.00545 + tablet: 0.0257 + tv: 0.00865 smart-speaker: 0.0061 radio: 0.002514375 sri: diff --git a/docs/snippets/defaults_device_size.mdx b/docs/snippets/defaults_device_size.mdx index 03223a9..502dc51 100644 --- a/docs/snippets/defaults_device_size.mdx +++ b/docs/snippets/defaults_device_size.mdx @@ -1,12 +1,12 @@ ``` -default_device_width: - phone: 1080 - tablet: 1536 - pc: 2560 - tv: 1920 -default_device_height: - phone: 1920 - tablet: 2048 - pc: 1440 - tv: 1080 +default_rendered_device_height: + pc: 1080 + phone: 844 + tablet: 820 + tv: 1080 +default_rendered_device_width: + pc: 1920 + phone: 390 + tablet: 1180 + tv: 1920 ```