@panoramax/web-viewer 4.3.1-develop-2c4b2129 → 4.3.1-develop-e9d0b3c3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/CHANGELOG.md +5 -0
  2. package/build/index.js +3 -3
  3. package/build/index.js.map +1 -1
  4. package/build/photoviewer.js +2 -2
  5. package/build/photoviewer.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/components/core/Editor.js +1 -1
  8. package/src/components/ui/Photo.js +1 -1
  9. package/src/utils/map.js +73 -62
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panoramax/web-viewer",
3
- "version": "4.3.1-develop-2c4b2129",
3
+ "version": "4.3.1-develop-e9d0b3c3",
4
4
  "description": "Panoramax web viewer for geolocated pictures",
5
5
  "main": "build/index.js",
6
6
  "author": "Panoramax team",
package/src/components/core/Editor.js CHANGED
@@ -5,7 +5,7 @@ import Map from "../ui/Map";
5
5
  import Photo from "../ui/Photo";
6
6
  import { apiFeatureToPSVNode } from "../../utils/picture";
7
7
  import { linkMapAndPhoto } from "../../utils/map";
8
- import { VECTOR_STYLES } from "../../utils/map";
8
+ import { VECTOR_STYLES_NOCROWD as VECTOR_STYLES } from "../../utils/map";
9
9
  import { SYSTEM as PSSystem } from "@photo-sphere-viewer/core";
10
10
  import { createWebComp } from "../../utils/widgets";
11
11
 
package/src/components/ui/Photo.js CHANGED
@@ -104,7 +104,7 @@ export default class Photo extends PSViewer {
104
104
  showErrorTile: false,
105
105
  baseBlur: false,
106
106
  resolution: parent.isWidthSmall() ? 32 : 64,
107
- shouldGoFast: options.shouldGoFast,
107
+ shouldGoFast: options?.shouldGoFast || (() => false),
108
108
  useXmpData: false,
109
109
  }],
110
110
  withCredentials: parent.api._getPSVWithCredentials(),
package/src/utils/map.js CHANGED
@@ -11,72 +11,83 @@ export const TILES_PICTURES_SYMBOL_ZOOM = 19;
11
11
  const CROWDED_TILE_COND = ["!", ["has", "uncrowded"]];
12
12
  const EQUIRECT_COND = ["==", ["get", "type"], "equirectangular"];
13
13
 
14
- export const VECTOR_STYLES = {
15
- PICTURES: {
16
- "paint": {
17
- "circle-radius": ["interpolate", ["linear"], ["zoom"],
18
- TILES_PICTURES_ZOOM, 0,
19
- TILES_PICTURES_ZOOM+0.5, ["case", CROWDED_TILE_COND, 0, 1],
20
- TILES_PICTURES_ZOOM+1.5, ["case", CROWDED_TILE_COND, 0, 2],
21
- TILES_PICTURES_ZOOM+2, ["case", CROWDED_TILE_COND, 1, 4],
22
- TILES_PICTURES_ZOOM+3, ["case", CROWDED_TILE_COND, 3, 5],
23
- TILES_PICTURES_ZOOM+5, ["case", CROWDED_TILE_COND, 5, 7],
24
- TILES_PICTURES_ZOOM+7, ["case", CROWDED_TILE_COND, 7, 7],
25
- ],
26
- "circle-opacity": ["interpolate", ["linear"], ["zoom"],
27
- TILES_PICTURES_ZOOM, 0,
28
- TILES_PICTURES_ZOOM+0.5, ["case", CROWDED_TILE_COND, 0, 1],
29
- TILES_PICTURES_ZOOM+1.5, ["case", CROWDED_TILE_COND, 0, 1],
30
- TILES_PICTURES_ZOOM+2, 1
31
- ],
32
- "circle-stroke-opacity": ["case",
33
- ["all", CROWDED_TILE_COND, EQUIRECT_COND], 0.2,
34
- EQUIRECT_COND, 0.4,
35
- 0
36
- ],
37
- "circle-stroke-width": ["interpolate", ["linear"], ["zoom"],
38
- TILES_PICTURES_ZOOM+2.5, 0,
39
- TILES_PICTURES_ZOOM+3.5, ["case",
40
- ["all", CROWDED_TILE_COND, EQUIRECT_COND], 0,
41
- EQUIRECT_COND, 10,
42
- CROWDED_TILE_COND, 0,
43
- 2
14
+ function getVectorStyles(noCrowded) {
15
+ return {
16
+ PICTURES: {
17
+ "paint": {
18
+ "circle-radius": ["interpolate", ["linear"], ["zoom"],
19
+ TILES_PICTURES_ZOOM, 0,
20
+ TILES_PICTURES_ZOOM+0.5, noCrowded ? 1 : ["case", CROWDED_TILE_COND, 0, 1],
21
+ TILES_PICTURES_ZOOM+1.5, noCrowded ? 2 : ["case", CROWDED_TILE_COND, 0, 2],
22
+ TILES_PICTURES_ZOOM+2, noCrowded ? 4 : ["case", CROWDED_TILE_COND, 1, 4],
23
+ TILES_PICTURES_ZOOM+3, noCrowded ? 5 : ["case", CROWDED_TILE_COND, 3, 5],
24
+ TILES_PICTURES_ZOOM+5, noCrowded ? 7 : ["case", CROWDED_TILE_COND, 5, 7],
25
+ TILES_PICTURES_ZOOM+7, noCrowded ? 7 : ["case", CROWDED_TILE_COND, 7, 7],
44
26
  ],
45
- TILES_PICTURES_ZOOM+4.5, ["case",
46
- ["all", CROWDED_TILE_COND, EQUIRECT_COND], 10,
47
- EQUIRECT_COND, 10,
48
- CROWDED_TILE_COND, 0,
49
- 2
50
- ]
51
- ],
52
- },
53
- "layout": {}
54
- },
55
- SEQUENCES: {
56
- "paint": {
57
- "line-width": ["interpolate", ["linear"], ["zoom"],
58
- 0, 0.5,
59
- 10, 1.5,
60
- TILES_PICTURES_ZOOM-0.5, 1.5,
61
- TILES_PICTURES_ZOOM+0.5, ["case", CROWDED_TILE_COND, 0.5, 2],
62
- 22, ["case", CROWDED_TILE_COND, 1, 4],
63
- ],
27
+ "circle-opacity": ["interpolate", ["linear"], ["zoom"],
28
+ TILES_PICTURES_ZOOM, 0,
29
+ TILES_PICTURES_ZOOM+0.5, noCrowded ? 1 : ["case", CROWDED_TILE_COND, 0, 1],
30
+ TILES_PICTURES_ZOOM+1.5, noCrowded ? 1 : ["case", CROWDED_TILE_COND, 0, 1],
31
+ TILES_PICTURES_ZOOM+2, 1
32
+ ],
33
+ "circle-stroke-opacity": ["case",
34
+ ["all", CROWDED_TILE_COND, EQUIRECT_COND], 0.2,
35
+ EQUIRECT_COND, 0.4,
36
+ 0
37
+ ],
38
+ "circle-stroke-width": ["interpolate", ["linear"], ["zoom"],
39
+ TILES_PICTURES_ZOOM+2.5, 0,
40
+ TILES_PICTURES_ZOOM+3.5, noCrowded ? ["case",
41
+ EQUIRECT_COND, 10,
42
+ 2
43
+ ] : ["case",
44
+ ["all", CROWDED_TILE_COND, EQUIRECT_COND], 0,
45
+ EQUIRECT_COND, 10,
46
+ CROWDED_TILE_COND, 0,
47
+ 2
48
+ ],
49
+ TILES_PICTURES_ZOOM+4.5, noCrowded ? ["case",
50
+ EQUIRECT_COND, 10,
51
+ 2
52
+ ]: ["case",
53
+ ["all", CROWDED_TILE_COND, EQUIRECT_COND], 10,
54
+ EQUIRECT_COND, 10,
55
+ CROWDED_TILE_COND, 0,
56
+ 2
57
+ ]
58
+ ],
59
+ },
60
+ "layout": {}
64
61
  },
65
- "layout": {
66
- "line-cap": "square",
67
- }
68
- },
69
- SEQUENCES_PLUS: {
70
- "paint": {
71
- "line-width": ["interpolate", ["linear"], ["zoom"], 0, 15, TILES_PICTURES_ZOOM+1, 30],
72
- "line-opacity": 0,
73
- "line-color": "#ff0000",
62
+ SEQUENCES: {
63
+ "paint": {
64
+ "line-width": ["interpolate", ["linear"], ["zoom"],
65
+ 0, 0.5,
66
+ 10, 1.5,
67
+ TILES_PICTURES_ZOOM-0.5, 1.5,
68
+ TILES_PICTURES_ZOOM+0.5, noCrowded ? 2 : ["case", CROWDED_TILE_COND, 0.5, 2],
69
+ 22, noCrowded ? 4 : ["case", CROWDED_TILE_COND, 1, 4],
70
+ ],
71
+ },
72
+ "layout": {
73
+ "line-cap": "square",
74
+ }
74
75
  },
75
- "layout": {
76
- "line-cap": "square",
76
+ SEQUENCES_PLUS: {
77
+ "paint": {
78
+ "line-width": ["interpolate", ["linear"], ["zoom"], 0, 15, TILES_PICTURES_ZOOM+1, 30],
79
+ "line-opacity": 0,
80
+ "line-color": "#ff0000",
81
+ },
82
+ "layout": {
83
+ "line-cap": "square",
84
+ }
77
85
  }
78
- }
79
- };
86
+ };
87
+ }
88
+
89
+ export const VECTOR_STYLES = getVectorStyles(false);
90
+ export const VECTOR_STYLES_NOCROWD = getVectorStyles(true);
80
91
 
81
92
  export const MAP_THEMES = {
82
93
  DEFAULT: "default",