From a142c57a4a75477727122130b091f3aec1bd8d91 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Sat, 16 Dec 2023 17:52:57 -0500
Subject: finally got map resizing working ?

---
 src/client/views/nodes/MapBox/MapBox.tsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/views/nodes/MapBox/MapBox.tsx b/src/client/views/nodes/MapBox/MapBox.tsx
index b18bb9ad1..d3b293bc2 100644
--- a/src/client/views/nodes/MapBox/MapBox.tsx
+++ b/src/client/views/nodes/MapBox/MapBox.tsx
@@ -1561,9 +1561,8 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
                 }), MapBox._rerenderDelay);
             return null;
         }
-        const parscale = this.props.ScreenToLocalTransform().Scale ?? 1;
         const scale = this.props.NativeDimScaling?.() || 1;
-        const docscale = this.props.DocumentView?.().props.ScreenToLocalTransform().Scale ?? 1;
+        const parscale = scale === 1 ? 1 : this.props.ScreenToLocalTransform().Scale ?? 1;
 
         const renderAnnotations = (childFilters?: () => string[]) => null;
         return (
@@ -1574,8 +1573,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
                     onPointerDown={async e => {
                         e.button === 0 && !e.ctrlKey && e.stopPropagation();
                     }}
-                    style={{ width: `calc(100% - ${this.sidebarWidthPercent})`, pointerEvents: this.pointerEvents() }}>
-                    {/* style={{ transformOrigin: "top left",  transform: `scale(${scale})`,  width: `calc(100% - ${this.sidebarWidthPercent})`, pointerEvents: this.pointerEvents() }}> */}
+                    style={{ transformOrigin: 'top left', transform: `scale(${scale})`, width: `calc(100% - ${this.sidebarWidthPercent})`, pointerEvents: this.pointerEvents() }}>
                     <div style={{ mixBlendMode: 'multiply' }}>{renderAnnotations(this.transparentFilter)}</div>
                     {renderAnnotations(this.opaqueFilter)}
                     {SnappingManager.GetIsDragging() ? null : renderAnnotations()}
@@ -1665,17 +1663,15 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
                         <MapboxMap
                             ref={this._mapRef}
                             mapboxAccessToken={MAPBOX_ACCESS_TOKEN}
-                            viewState={this.isAnimating ? undefined : { ...this.mapboxMapViewState, width: NumCast(this.layoutDoc._width) / scale, height: NumCast(this.layoutDoc._height) / scale }}
+                            viewState={this.isAnimating ? undefined : { ...this.mapboxMapViewState, width: NumCast(this.layoutDoc._width), height: NumCast(this.layoutDoc._height) }}
                             mapStyle={this.dataDoc.map_style ? StrCast(this.dataDoc.map_style) : 'mapbox://styles/mapbox/streets-v11'}
                             style={{
-                                transformOrigin: 'top left',
                                 position: 'absolute',
                                 top: 0,
                                 left: 0,
-                                transform: `scale(${scale < 1 ? 1 : scale})`,
                                 zIndex: '0',
-                                width: '100%', //NumCast(this.layoutDoc._width) / scale,
-                                height: '100%', // NumCast(this.layoutDoc._height) / scale,
+                                width: NumCast(this.layoutDoc._width) * parscale,
+                                height: NumCast(this.layoutDoc._height) * parscale,
                             }}
                             initialViewState={this.isAnimating ? undefined : this.mapboxMapViewState}
                             onMove={this.onMapMove}
-- 
cgit v1.2.3-70-g09d2