From 55223387169efdc25acc6de69232f6d50c9b3f90 Mon Sep 17 00:00:00 2001
From: Noenandre <5470915+noenandre@users.noreply.github.com>
Date: Tue, 14 Feb 2023 12:25:43 +0100
Subject: [PATCH] Rename pannellum-streetside dist folder to pannellum, since
 Pannellum isn't used by just Bing Streetside anymore. TODO: Pannellum is
 loaded twice.

---
 modules/services/streetside.js |  4 ++--
 modules/services/vegbilder.js  | 22 +++++++++++-----------
 package.json                   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/services/streetside.js b/modules/services/streetside.js
index b9ba34f2d..563b8791f 100644
--- a/modules/services/streetside.js
+++ b/modules/services/streetside.js
@@ -20,8 +20,8 @@ import { utilArrayUnion, utilQsString, utilRebind, utilStringQs, utilTiler, util
 const bubbleApi = 'https://dev.virtualearth.net/mapcontrol/HumanScaleServices/GetBubbles.ashx?';
 const streetsideImagesApi = 'https://t.ssl.ak.tiles.virtualearth.net/tiles/';
 const bubbleAppKey = 'AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm';
-const pannellumViewerCSS = 'pannellum-streetside/pannellum.css';
-const pannellumViewerJS = 'pannellum-streetside/pannellum.js';
+const pannellumViewerCSS = 'pannellum/pannellum.css';
+const pannellumViewerJS = 'pannellum/pannellum.js';
 const maxResults = 2000;
 const tileZoom = 16.5;
 const tiler = utilTiler().zoomExtent([tileZoom, tileZoom]).skipNullIsland(true);
diff --git a/modules/services/vegbilder.js b/modules/services/vegbilder.js
index 2e9f69246..cd3c36cde 100644
--- a/modules/services/vegbilder.js
+++ b/modules/services/vegbilder.js
@@ -7,8 +7,8 @@ import { geoExtent, geoScaleToZoom } from '../geo';
 import RBush from 'rbush';
 
 const owsEndpoint = 'https://www.vegvesen.no/kart/ogc/vegbilder_1_0/ows?';
-const pannellumViewerCSS = 'pannellum-streetside/pannellum.css';
-const pannellumViewerJS = 'pannellum-streetside/pannellum.js';
+const pannellumViewerCSS = 'pannellum/pannellum.css';
+const pannellumViewerJS = 'pannellum/pannellum.js';
 const tileZoom = 14;
 const tiler = utilTiler().zoomExtent([tileZoom, tileZoom]).skipNullIsland(true);
 const dispatch = d3_dispatch('loadedImages', 'viewerChanged');
@@ -367,33 +367,33 @@ export default {
       const head = d3_select('head');
 
       // load streetside pannellum viewer css
-      head.selectAll('#ideditor-streetside-viewercss')
+      head.selectAll('#ideditor-vegbilder-viewercss')
         .data([0])
         .enter()
         .append('link')
-        .attr('id', 'ideditor-streetside-viewercss')
+        .attr('id', 'ideditor-vegbilder-viewercss')
         .attr('rel', 'stylesheet')
         .attr('crossorigin', 'anonymous')
         .attr('href', context.asset(pannellumViewerCSS))
-        .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', function() {
+        .on('load.serviceVegbilder', loaded)
+        .on('error.serviceVegbilder', function() {
             reject();
         });
 
       // load streetside pannellum viewer js
-      head.selectAll('#ideditor-streetside-viewerjs')
+      head.selectAll('#ideditor-vegbilder-viewerjs')
         .data([0])
         .enter()
         .append('script')
-        .attr('id', 'ideditor-streetside-viewerjs')
+        .attr('id', 'ideditor-vegbilder-viewerjs')
         .attr('crossorigin', 'anonymous')
         .attr('src', context.asset(pannellumViewerJS))
-        .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', function() {
+        .on('load.serviceVegbilder', loaded)
+        .on('error.serviceVegbilder', function() {
             reject();
         });
     })
-      .catch(function() {
+      .catch(() => {
         _loadViewerPromise = null;
     });
 
diff --git a/package.json b/package.json
index 7f0742372..6d4995f6a 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "clean": "shx rm -f dist/esbuild.json dist/*.js dist/*.map dist/*.css dist/img/*.svg",
     "dist": "run-p dist:**",
     "dist:mapillary": "shx mkdir -p dist/mapillary-js && shx cp -R node_modules/mapillary-js/dist/* dist/mapillary-js/",
-    "dist:pannellum": "shx mkdir -p dist/pannellum-streetside && shx cp -R node_modules/pannellum/build/* dist/pannellum-streetside/",
+    "dist:pannellum": "shx mkdir -p dist/pannellum && shx cp -R node_modules/pannellum/build/* dist/pannellum/",
     "dist:min": "node config/esbuild.config.min.mjs",
     "dist:svg:iD": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"iD-%s\" --symbol-sprite dist/img/iD-sprite.svg \"svg/iD-sprite/**/*.svg\"",
     "dist:svg:community": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"community-%s\" --symbol-sprite dist/img/community-sprite.svg node_modules/osm-community-index/dist/img/*.svg",