Skip to content

Commit 5ade1a8

Browse files
authored
Merge branch 'main' into migrate-region-viewer
2 parents 47096a6 + b90e193 commit 5ade1a8

File tree

298 files changed

+1842
-758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+1842
-758
lines changed

dist/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ <h1>Maps JSAPI Samples</h1>
1111
<li><a href='/samples/3d-camera-boundary/dist'>3d-camera-boundary</a></li>
1212
<li><a href='/samples/3d-camera-to-around/dist'>3d-camera-to-around</a></li>
1313
<li><a href='/samples/3d-label-toggle/dist'>3d-label-toggle</a></li>
14+
<li><a href='/samples/3d-localization/dist'>3d-localization</a></li>
15+
<li><a href='/samples/3d-map-styling/dist'>3d-map-styling</a></li>
1416
<li><a href='/samples/3d-marker-click-event/dist'>3d-marker-click-event</a></li>
1517
<li><a href='/samples/3d-marker-collision-behavior/dist'>3d-marker-collision-behavior</a></li>
1618
<li><a href='/samples/3d-marker-customization/dist'>3d-marker-customization</a></li>

dist/samples/3d-accessibility-features/app/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ async function initMap() {
1212

1313
const map = new Map3DElement({
1414
center: { lat: 34.8405, lng : -111.7909, altitude: 1322.70 }, range: 13279.50, tilt: 67.44 ,heading: 0.01,
15-
mode: 'SATELLITE'
15+
mode: 'SATELLITE',
16+
gestureHandling: "COOPERATIVE"
1617
});
1718

1819
// Set LatLng and title text for the markers. The first marker (Boynton Pass)
@@ -43,7 +44,7 @@ async function initMap() {
4344

4445
tourStops.forEach(({ position, title }, i) => {
4546
const pin = new PinElement({
46-
glyph: `${i + 1}`,
47+
glyphText: `${i + 1}`,
4748
scale: 1.5,
4849
glyphColor: "#FFFFFF"
4950
});

dist/samples/3d-accessibility-features/dist/assets/index-CDjT9Ul7.js renamed to dist/samples/3d-accessibility-features/dist/assets/index-CoX0ZzLD.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/samples/3d-accessibility-features/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<head>
1010
<title>Map</title>
1111

12-
<script type="module" crossorigin src="./assets/index-CDjT9Ul7.js"></script>
12+
<script type="module" crossorigin src="./assets/index-CoX0ZzLD.js"></script>
1313
<link rel="stylesheet" crossorigin href="./assets/index-DDwKyjRS.css">
1414
</head>
1515
<body>

dist/samples/3d-accessibility-features/docs/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ async function initMap() {
1111
const { PinElement } = await google.maps.importLibrary("marker");
1212
const map = new Map3DElement({
1313
center: { lat: 34.8405, lng: -111.7909, altitude: 1322.70 }, range: 13279.50, tilt: 67.44, heading: 0.01,
14-
mode: 'SATELLITE'
14+
mode: 'SATELLITE',
15+
gestureHandling: "COOPERATIVE"
1516
});
1617
// Set LatLng and title text for the markers. The first marker (Boynton Pass)
1718
// receives the initial focus when tab is pressed. Use arrow keys to move
@@ -40,7 +41,7 @@ async function initMap() {
4041
];
4142
tourStops.forEach(({ position, title }, i) => {
4243
const pin = new PinElement({
43-
glyph: `${i + 1}`,
44+
glyphText: `${i + 1}`,
4445
scale: 1.5,
4546
glyphColor: "#FFFFFF"
4647
});

dist/samples/3d-accessibility-features/docs/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ async function initMap() {
1212

1313
const map = new Map3DElement({
1414
center: { lat: 34.8405, lng : -111.7909, altitude: 1322.70 }, range: 13279.50, tilt: 67.44 ,heading: 0.01,
15-
mode: 'SATELLITE'
15+
mode: 'SATELLITE',
16+
gestureHandling: "COOPERATIVE"
1617
});
1718

1819
// Set LatLng and title text for the markers. The first marker (Boynton Pass)
@@ -43,7 +44,7 @@ async function initMap() {
4344

4445
tourStops.forEach(({ position, title }, i) => {
4546
const pin = new PinElement({
46-
glyph: `${i + 1}`,
47+
glyphText: `${i + 1}`,
4748
scale: 1.5,
4849
glyphColor: "#FFFFFF"
4950
});

dist/samples/3d-accessibility-features/jsfiddle/demo.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ async function initMap() {
1111
const { PinElement } = await google.maps.importLibrary("marker");
1212
const map = new Map3DElement({
1313
center: { lat: 34.8405, lng: -111.7909, altitude: 1322.70 }, range: 13279.50, tilt: 67.44, heading: 0.01,
14-
mode: 'SATELLITE'
14+
mode: 'SATELLITE',
15+
gestureHandling: "COOPERATIVE"
1516
});
1617
// Set LatLng and title text for the markers. The first marker (Boynton Pass)
1718
// receives the initial focus when tab is pressed. Use arrow keys to move
@@ -40,7 +41,7 @@ async function initMap() {
4041
];
4142
tourStops.forEach(({ position, title }, i) => {
4243
const pin = new PinElement({
43-
glyph: `${i + 1}`,
44+
glyphText: `${i + 1}`,
4445
scale: 1.5,
4546
glyphColor: "#FFFFFF"
4647
});

dist/samples/3d-camera-boundary/app/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ async function initMap() {
1414
tilt: 67.5,
1515
mode: 'HYBRID',
1616
bounds: {south: -48.30, west: 163.56, north: -32.86, east: -180},
17+
gestureHandling: "COOPERATIVE"
1718
});
1819

1920
document.body.append(map);

dist/samples/3d-camera-boundary/dist/assets/index-CIxPjvxi.js renamed to dist/samples/3d-camera-boundary/dist/assets/index-Df7wxdaJ.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/samples/3d-camera-boundary/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<head>
1010
<title>Map</title>
1111

12-
<script type="module" crossorigin src="./assets/index-CIxPjvxi.js"></script>
12+
<script type="module" crossorigin src="./assets/index-Df7wxdaJ.js"></script>
1313
<link rel="stylesheet" crossorigin href="./assets/index-DDwKyjRS.css">
1414
</head>
1515
<body>

0 commit comments

Comments
 (0)