CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 13:38:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename pannellum-streetside dist folder to pannellum, since Pannellum isn't used by just Bing Streetside anymore.

Browse Source 
TODO: Pannellum is loaded twice.
This commit is contained in:
Noenandre
2023-02-14 12:25:43 +01:00
parent a2c56b7d4f
commit 5522338716
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/streetside.js
+2 -2
View File
@@ -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);
modules/services/vegbilder.js
+11 -11
View File
@@ -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;
});
package.json
+1 -1
View File
@@ -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",