From e95008b8fdb64f9332a312d56f934e76d5520d33 Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Wed, 4 Sep 2024 20:16:08 -0700
Subject: [PATCH 1/3] new assets

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 22595cc3..6a354185 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 22595cc3411fe30ba1b833644d770311e4c97723
+Subproject commit 6a3541854762f4550eb5f653e14d6892ff0f9385

From a74cb338e0fbe923715d0d3bf5f8fb5a4977d7b7 Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Wed, 4 Sep 2024 20:22:22 -0700
Subject: [PATCH 2/3] revert safehit, add new bollard

---
 src/assets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/assets.js b/src/assets.js
index 8d7eb5c3..44fe233d 100644
--- a/src/assets.js
+++ b/src/assets.js
@@ -201,7 +201,8 @@ function buildAssetHTML(assetUrl, categories) {
         <a-mixin shadow id="dividers-planter-box" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: planter-box"></a-mixin>
         <a-mixin shadow id="dividers-bush" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bush"></a-mixin>
         <a-mixin shadow id="dividers-dome" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: dome"></a-mixin>
-        <a-mixin shadow id="safehit" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bollard"></a-mixin>
+        <a-mixin shadow id="safehit" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: safehit"></a-mixin>
+        <a-mixin shadow id="bollard" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: bollard"></a-mixin>
         <a-mixin shadow id="temporary-barricade" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: barricade"></a-mixin>
         <a-mixin shadow id="temporary-traffic-cone" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: traffic-cone"></a-mixin>
         <a-mixin shadow id="temporary-jersey-barrier-plastic" scale="1 1 1" rotation="0 0 0" gltf-part="src: #dividers; part: jersey-barrier-plastic"></a-mixin>

From 74d4fe37fce4129620764fbb8bc3b1fc894a8711 Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Wed, 4 Sep 2024 20:22:57 -0700
Subject: [PATCH 3/3] use bollard for bollard segments

---
 src/aframe-streetmix-parsers.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/aframe-streetmix-parsers.js b/src/aframe-streetmix-parsers.js
index 553d52ea..28160122 100644
--- a/src/aframe-streetmix-parsers.js
+++ b/src/aframe-streetmix-parsers.js
@@ -214,9 +214,9 @@ function createTracksParentElement(length, objectMixinId) {
   return placedObjectEl;
 }
 
-function createSafehitsParentElement() {
+function createBollardsParentElement() {
   const placedObjectEl = document.createElement('a-entity');
-  placedObjectEl.setAttribute('class', 'safehit-parent');
+  placedObjectEl.setAttribute('class', 'bollard-parent');
   return placedObjectEl;
 }
 
@@ -1163,16 +1163,16 @@ function processSegments(
       }
     } else if (segments[i].type === 'divider' && variantList[0] === 'bollard') {
       groundMixinId = 'divider';
-      // make some safehits
-      const safehitsParentEl = createSafehitsParentElement();
+      // make some bollards
+      const bollardsParentEl = createBollardsParentElement();
       cloneMixinAsChildren({
-        objectMixinId: 'safehit',
-        parentEl: safehitsParentEl,
+        objectMixinId: 'bollard',
+        parentEl: bollardsParentEl,
         step: 4,
         radius: clonedObjectRadius
       });
-      // add the safehits to the segment parent
-      segmentParentEl.append(safehitsParentEl);
+      // add the bollards to the segment parent
+      segmentParentEl.append(bollardsParentEl);
       repeatCount[0] = 1;
       repeatCount[1] = parseInt(length) / 4;
     } else if (segments[i].type === 'divider' && variantList[0] === 'flowers') {