Merge branch 'main' into refactor-3d-accessibility-features

Author: willum070

.github/workflows/dist-pr.yml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Create release PR for dist
+name: Create, approve, and merge release PR for dist
 
 on:
   workflow_dispatch:
@@ -23,30 +23,82 @@ on:
         type: string
 
 jobs:
-  create-pr:
+  create-approve-merge-pr:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write
+
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_MERGE_TOKEN }}
-          fetch-depth: 0 # Fetch all history
+          fetch-depth: 0
 
       - name: Set Git Identity
         run: |
           git config --global user.name 'googlemaps-bot'
           git config --global user.email 'googlemaps-bot@google.com'
 
+      - name: Ensure temp branch exists on origin
+        run: |
+          git fetch origin temp-build-branch:temp-build-branch
+          git ls-remote --exit-code --heads origin temp-build-branch
+
+      - name: Find existing PR
+        id: find_pr
+        env:
+          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
+        run: |
+          PR_URL="$(gh pr list \
+            --base main \
+            --head temp-build-branch \
+            --state open \
+            --json url \
+            --jq '.[0].url')"
+
+          if [ -n "$PR_URL" ] && [ "$PR_URL" != "null" ]; then
+            echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
+            echo "pr_exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "pr_exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Create Pull Request
+        id: create_pr
+        if: steps.find_pr.outputs.pr_exists != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
         run: |
-          gh pr create \
+          PR_URL="$(gh pr create \
             --base main \
             --head temp-build-branch \
             --title "chore: automated output update (dist)" \
             --body "This PR contains updated build output from the dist branch." \
-            --label "automated pr,dist-update"
+            --label "automated pr" \
+            --label "dist-update")"
+          echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"
+
+      - name: Determine PR URL
+        id: pr
+        run: |
+          if [ "${{ steps.find_pr.outputs.pr_exists }}" = "true" ]; then
+            echo "pr_url=${{ steps.find_pr.outputs.pr_url }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "pr_url=${{ steps.create_pr.outputs.pr_url }}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Approve PR
         env:
-          GH_TOKEN: ${{ secrets.GH_MERGE_TOKEN }}
+          PR_URL: ${{ steps.pr.outputs.pr_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr review --approve "$PR_URL"
+
+      - name: Enable auto-merge
+        env:
+          PR_URL: ${{ steps.pr.outputs.pr_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr merge --auto --squash --delete-branch "$PR_URL"

.github/workflows/release.yml

@@ -130,6 +130,6 @@ jobs:
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: dist-pr.yml
-          ref: "temp-build-branch"
+          ref: "main"
           token: ${{ secrets.GH_APPROVER_TOKEN }} # Use the same token that pushed, it needs 'workflows: write' permissions
           inputs: '{ "source_run_id": "${{ github.run_id }}" }' # Optional: Pass the run ID for traceability

dist/index.html

@@ -10,12 +10,14 @@ <h1>Maps JSAPI Samples</h1>
   <li><a href='/samples/3d-accessibility-features/dist'>3d-accessibility-features</a></li>
   <li><a href='/samples/3d-camera-boundary/dist'>3d-camera-boundary</a></li>
   <li><a href='/samples/3d-camera-center/dist'>3d-camera-center</a></li>
+  <li><a href='/samples/3d-camera-position/dist'>3d-camera-position</a></li>
   <li><a href='/samples/3d-camera-to-around/dist'>3d-camera-to-around</a></li>
   <li><a href='/samples/3d-clamp-mode/dist'>3d-clamp-mode</a></li>
   <li><a href='/samples/3d-coverage-map/dist'>3d-coverage-map</a></li>
   <li><a href='/samples/3d-label-toggle/dist'>3d-label-toggle</a></li>
   <li><a href='/samples/3d-localization/dist'>3d-localization</a></li>
   <li><a href='/samples/3d-map-45-degree/dist'>3d-map-45-degree</a></li>
+  <li><a href='/samples/3d-map-45-degree-locked/dist'>3d-map-45-degree-locked</a></li>
   <li><a href='/samples/3d-map-events/dist'>3d-map-events</a></li>
   <li><a href='/samples/3d-map-roadmap/dist'>3d-map-roadmap</a></li>
   <li><a href='/samples/3d-map-styling/dist'>3d-map-styling</a></li>

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

@@ -11,14 +11,15 @@
 
         <link rel="stylesheet" type="text/css" href="./style.css" />
         <script type="module" src="./index.js"></script>
+        <script>
+            // prettier-ignore
+            (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+                key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"
+            });
+        </script>
     </head>
     <body>
         <div id="map"></div>
-
-        <!-- prettier-ignore -->
-        <script>(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})
-            ({key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"});
-        </script>
     </body>
 </html>
 <!-- [END maps_3d_accessibility_features] -->

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

@@ -5,10 +5,14 @@
  */
 
 // [START maps_3d_accessibility_features]
-async function initMap() {
-    const { Map3DElement, Marker3DInteractiveElement, PopoverElement } =
-        await google.maps.importLibrary('maps3d');
-    const { PinElement } = await google.maps.importLibrary('marker');
+async function init() {
+    const [
+        { Map3DElement, Marker3DInteractiveElement, PopoverElement },
+        { PinElement },
+    ] = await Promise.all([
+        google.maps.importLibrary('maps3d'),
+        google.maps.importLibrary('marker'),
+    ]);
 
     const map = new Map3DElement({
         center: { lat: 34.8405, lng: -111.7909, altitude: 1322.7 },
@@ -78,5 +82,5 @@ async function initMap() {
     document.body.append(map);
 }
 
-initMap();
+void init();
 // [END maps_3d_accessibility_features]

dist/samples/3d-accessibility-features/dist/assets/index-CAWeQ9mC.js

@@ -9,16 +9,17 @@
     <head>
         <title>Map</title>
 
-      <script type="module" crossorigin src="./assets/index-y43h04GL.js"></script>
+        <script>
+            // prettier-ignore
+            (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+                key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"
+            });
+        </script>
+      <script type="module" crossorigin src="./assets/index-CAWeQ9mC.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-BVXE32j3.css">
     </head>
     <body>
         <div id="map"></div>
-
-        <!-- prettier-ignore -->
-        <script>(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})
-            ({key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"});
-        </script>
     </body>
 </html>
 <!-- [END maps_3d_accessibility_features] -->

dist/samples/3d-accessibility-features/dist/assets/index-y43h04GL.js

@@ -11,14 +11,15 @@
 
         <link rel="stylesheet" type="text/css" href="./style.css" />
         <script type="module" src="./index.js"></script>
+        <script>
+            // prettier-ignore
+            (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+                key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"
+            });
+        </script>
     </head>
     <body>
         <div id="map"></div>
-
-        <!-- prettier-ignore -->
-        <script>(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})
-            ({key: "AIzaSyA6myHzS10YXdcazAFalmXvDkrYCp5cLc8"});
-        </script>
     </body>
 </html>
 <!-- [END maps_3d_accessibility_features] -->

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

@@ -6,10 +6,14 @@
  */
 
 // [START maps_3d_accessibility_features]
-async function initMap() {
-    const { Map3DElement, Marker3DInteractiveElement, PopoverElement } =
-        await google.maps.importLibrary('maps3d');
-    const { PinElement } = await google.maps.importLibrary('marker');
+async function init() {
+    const [
+        { Map3DElement, Marker3DInteractiveElement, PopoverElement },
+        { PinElement },
+    ] = await Promise.all([
+        google.maps.importLibrary('maps3d'),
+        google.maps.importLibrary('marker'),
+    ]);
 
     const map = new Map3DElement({
         center: { lat: 34.8405, lng: -111.7909, altitude: 1322.7 },
@@ -79,5 +83,5 @@ async function initMap() {
     document.body.append(map);
 }
 
-initMap();
+void init();
 // [END maps_3d_accessibility_features]