TEST: Added Berlin ZoomIn test

heremaps · Feb 19, 2020 · 45b2294 · 45b2294
1 parent 947f1c1
commit 45b2294
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/@here/harp-examples/lib/PerformanceConfig.ts b/@here/harp-examples/lib/PerformanceConfig.ts
@@ -203,7 +203,31 @@ export namespace PerformanceTestData {
         tilts: [0, 0, 0, 0, 0, 0],
         numberOfDrawPoints: 250
     };
-
+    export const BERLIN_ZOOM_IN = {
+        controlPoints: [
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4,
+            52.5,
+            13.4
+        ],
+        zoomLevels: [12, 13, 14, 15, 16, 17, 18, 19, 20],
+        tilts: [0, 0, 0, 0, 0, 0, 0, 0, 0],
+        numberOfDrawPoints: 250
+    };
     export const PARIS_ZOOM_IN_AND_OUT_2 = {
         controlPoints: [
             48.8566,

diff --git a/@here/harp-examples/lib/PerformanceUtils.ts b/@here/harp-examples/lib/PerformanceUtils.ts
@@ -70,7 +70,7 @@ export namespace PerformanceUtils {
     ];
 
     const DEFAULT_THEME = {
-        resource: "resources/berlin_tilezen_base.json"
+        resource: "resources/normal.day.json"
     };
 
     function getVendorFomContext(context: WebGLRenderingContext): GlInfo {
@@ -197,7 +197,7 @@ export namespace PerformanceUtils {
                     dataSource = new OmvDataSource({
                         baseUrl: "https://xyz.api.here.com/tiles/herebase.02",
                         apiFormat: APIFormat.XYZOMV,
-                        styleSetName: "tilezen",
+                        styleSetName: "here_olp",
                         maxZoomLevel: 17,
                         authenticationCode: accessToken,
                         copyrightInfo: copyrights

diff --git a/@here/harp-examples/src/performance_benchmark.ts b/@here/harp-examples/src/performance_benchmark.ts
@@ -549,6 +549,22 @@ export namespace PerformanceBenchmark {
         finishTest();
     }
 
+    async function ZoomInBerlin() {
+        startTest("ZoomIn", "Berlin");
+        latestResult = await PerformanceUtils.measureFlyoverSpline(
+            mapViewApp,
+            "ZoomIn_Berlin",
+            PerformanceTestData.BERLIN_ZOOM_IN,
+            flyoverNumFrames,
+            false,
+            true,
+            showLabels,
+            flyoverNumRuns,
+            checkIfCancelled
+        );
+        finishTest();
+    }
+
     async function ZoomInOutParis() {
         startTest("ZoomInOut", "Paris");
         latestResult = await PerformanceUtils.measureFlyoverSpline(
@@ -591,7 +607,8 @@ export namespace PerformanceBenchmark {
                 reducedDay: "resources/berlin_tilezen_day_reduced.json",
                 reducedNight: "resources/berlin_tilezen_night_reduced.json",
                 streets: "resources/berlin_tilezen_effects_streets.json",
-                outlines: "resources/berlin_tilezen_effects_outlines.json"
+                outlines: "resources/berlin_tilezen_effects_outlines.json",
+                miami: "resources/normal.day.json"
             },
             PixelRatio: {
                 default: undefined,
@@ -601,6 +618,7 @@ export namespace PerformanceBenchmark {
             },
             CanvasSize: {
                 default: undefined,
+                "1100×900": "1100×900",
                 "640×400": "640×400",
                 "1024×768": "1024×768",
                 "1024×1024": "1024×1024",
@@ -660,7 +678,7 @@ export namespace PerformanceBenchmark {
                 "6": 6,
                 "8": 8
             },
-            PhasedLoading: true,
+            PhasedLoading: false,
             Berlin: () => {
                 openMapBerlin();
             },
@@ -712,6 +730,9 @@ export namespace PerformanceBenchmark {
             FlyOverEuropeLoaded: () => {
                 flyoverEuropeLoaded();
             },
+            ZoomInBerlin: () => {
+                ZoomInBerlin();
+            },
             ZoomInOutParis: () => {
                 ZoomInOutParis();
             },
@@ -737,7 +758,7 @@ export namespace PerformanceBenchmark {
                     mapViewApp.mapView.theme = newTheme;
                 });
             })
-            .setValue("resources/berlin_tilezen_base.json");
+            .setValue("resources/normal.day.json");
 
         benchmarksFolder
             .add(guiOptions, "CanvasSize", guiOptions.CanvasSize)
@@ -765,7 +786,7 @@ export namespace PerformanceBenchmark {
                 }
                 canvasSize = `${theCanvasElement.clientWidth}×${theCanvasElement.clientHeight}`;
             })
-            .setValue(undefined);
+            .setValue("1100×900");
 
         benchmarksFolder
             .add(guiOptions, "PowerPreference", guiOptions.PowerPreference)
@@ -863,6 +884,7 @@ export namespace PerformanceBenchmark {
             })
             .setValue(undefined);
 
+        flyOversFolder.add(guiOptions, "ZoomInBerlin");
         flyOversFolder.add(guiOptions, "ZoomInOutParis");
         flyOversFolder.add(guiOptions, "ZoomInOutParis2");
         flyOversFolder.add(guiOptions, "FlyOverNY");