Skip to content

Commit ff34635

Browse files
authored
Merge branch 'master' into issues/454-fix-redundant-labels
2 parents a4054d7 + e503883 commit ff34635

File tree

5 files changed

+214
-154
lines changed

5 files changed

+214
-154
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
with:
1919
ref: ${{ github.event.pull_request.head.sha }}
2020

@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949

5050
steps:
51-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
5252

5353
- name: Get yarn cache directory path
5454
id: yarn-cache-dir-path
@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
110110

111111
- name: Installing dependencies
112112
run: |

public/example_templates/netjsonmap-indoormap.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
crs: L.CRS.Simple,
4949
// set map initial state.
5050
mapOptions: {
51+
// disable leaflet worldCopyJump on the indoor map
52+
// because it's incompatible (raises a JS error) and not needed
53+
worldCopyJump: false,
5154
center: [48.577, 18.539],
5255
zoom: 0,
5356
zoomSnap: 0.3,

src/js/netjsongraph.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ const NetJSONGraphDefaultConfig = {
165165
mapOptions: {
166166
roam: true,
167167
zoomAnimation: false,
168+
worldCopyJump: true,
168169
minZoom: 3,
169170
maxZoom: 18,
170171
nodeConfig: {

test/netjsongraph.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ describe("NetJSONGraph Specification", () => {
120120
const NetJSONGraphMapOptions = {
121121
roam: true,
122122
zoomAnimation: false,
123+
worldCopyJump: true,
123124
minZoom: 3,
124125
maxZoom: 18,
125126
nodeConfig: {

0 commit comments

Comments
 (0)