From c4094b28aeb7267b33bdc987ca9dd22069341d77 Mon Sep 17 00:00:00 2001
From: evlist <vdv@dyomedea.com>
Date: Thu, 3 Nov 2022 11:37:22 +0100
Subject: [PATCH] Refactoring to send a viewport property to slippy graphics
 (new, more generic, name for markers)

---
 src/App.tsx                       |  2 +-
 src/components/map/LayerStack.tsx | 35 ++++++++++---------------------
 src/components/map/LiveMap.tsx    |  6 +++---
 src/components/map/Map.tsx        |  6 +++---
 src/components/map/Marker.tsx     |  5 ++---
 src/components/map/TiledLayer.tsx | 19 ++++++++++++++++-
 6 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index ab2bb63..cb0340a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -99,7 +99,7 @@ const App: React.FC = () => {
             scope={scope}
             setScope={debounce(setScope, 1000)}
             numberOfTiledLayers={5}
-            markers={[<CurrentLocation key='currentLocation' />]}
+            slippyGraphics={[<CurrentLocation key='currentLocation' />]}
           />
         </IonApp>
       </IonContent>
diff --git a/src/components/map/LayerStack.tsx b/src/components/map/LayerStack.tsx
index 1d0d610..2772b87 100644
--- a/src/components/map/LayerStack.tsx
+++ b/src/components/map/LayerStack.tsx
@@ -28,8 +28,8 @@ export interface LayerStackProperties {
    * The coordinates system
    */
   coordinateSystem: CoordinateSystem;
-  /** Markers are non scalable SVG snippets tied to geo location */
-  markers?: ReactElement<any, string | JSXElementConstructor<any>>[];
+  /** Slippy graphics are non scalable SVG snippets defined by geo locations */
+  slippyGraphics?: ReactElement<any, string | JSXElementConstructor<any>>[];
 }
 
 /**
@@ -53,7 +53,10 @@ export const LayerStack: react.FC<LayerStackProperties> = (
 
   const activeTiledLayer = Math.floor(numberOfTiledLayers / 2);
 
-  const getTiledLayer = (i: number) => {
+  const getTiledLayer = (
+    i: number,
+    slippyGraphics?: typeof props.slippyGraphics
+  ) => {
     const relativeZoomLevel = i - activeTiledLayer;
     const zoom = 2 ** relativeZoomLevel;
     const origin = {
@@ -82,6 +85,7 @@ export const LayerStack: react.FC<LayerStackProperties> = (
         shift={shift}
         zoom={256 / zoom}
         coordinateSystem={props.coordinateSystem}
+        slippyGraphics={slippyGraphics}
       />
     );
   };
@@ -96,36 +100,19 @@ export const LayerStack: react.FC<LayerStackProperties> = (
       >
         {
           // Tiled layers with less detail
-          range(0, activeTiledLayer).map(getTiledLayer)
+          range(0, activeTiledLayer).map((index) => getTiledLayer(index))
         }
         {
           // Tiled layers with more details
-          range(numberOfTiledLayers - 1, activeTiledLayer, -1).map(
-            getTiledLayer
+          range(numberOfTiledLayers - 1, activeTiledLayer, -1).map((index) =>
+            getTiledLayer(index)
           )
         }
         {
           // And the active one
-          getTiledLayer(activeTiledLayer)
+          getTiledLayer(activeTiledLayer, props.slippyGraphics)
         }
       </g>
-      {props.markers !== undefined ? (
-        <g
-          key='markers'
-          transform={`translate(${props.coordinateSystem.shift.x}, ${props.coordinateSystem.shift.y}) scale(${props.coordinateSystem.zoom})`}
-        >
-          <g
-            transform={`scale(256) translate(-${props.keyObject.x}, -${props.keyObject.y})`}
-          >
-            {props.markers.map((marker) =>
-              cloneElement(marker, {
-                keyObject: props.keyObject,
-                zoom: props.coordinateSystem.zoom,
-              })
-            )}
-          </g>
-        </g>
-      ) : null}
     </svg>
   );
 };
diff --git a/src/components/map/LiveMap.tsx b/src/components/map/LiveMap.tsx
index c9ce37e..e6e490c 100644
--- a/src/components/map/LiveMap.tsx
+++ b/src/components/map/LiveMap.tsx
@@ -39,8 +39,8 @@ export interface LiveMapProperties {
   numberOfTiledLayers?: number;
   /** If provided, a function to call when the scope is updated. */
   setScope?: (scope: MapScope) => void;
-  /** Markers are non scalable SVG snippets tied to geo location */
-  markers?: ReactElement<any, string | JSXElementConstructor<any>>[];
+  /** Slippy graphics are non scalable SVG snippets defined by geo locations */
+  slippyGraphics?: ReactElement<any, string | JSXElementConstructor<any>>[];
 }
 
 /**
@@ -137,7 +137,7 @@ export const LiveMap: react.FC<LiveMapProperties> = (
       <Map
         scope={scope}
         numberOfTiledLayers={props.numberOfTiledLayers}
-        markers={props.markers}
+        slippyGraphics={props.slippyGraphics}
       />
     </div>
   );
diff --git a/src/components/map/Map.tsx b/src/components/map/Map.tsx
index a759cb0..9568b52 100644
--- a/src/components/map/Map.tsx
+++ b/src/components/map/Map.tsx
@@ -11,8 +11,8 @@ import { lon2tile, lat2tile } from '../../lib/geo';
 export interface MapProperties {
   scope: MapScope;
   numberOfTiledLayers?: number;
-  /** Markers are non scalable SVG snippets tied to geo location */
-  markers?: ReactElement<any, string | JSXElementConstructor<any>>[];
+  /** Slippy graphics are non scalable SVG snippets defined by geo locations */
+  slippyGraphics?: ReactElement<any, string | JSXElementConstructor<any>>[];
 }
 
 /**
@@ -62,7 +62,7 @@ export const Map: react.FC<MapProperties> = (props: MapProperties) => {
           },
           zoom: relativeScale,
         }}
-        markers={props.markers}
+        slippyGraphics={props.slippyGraphics}
       />
     </div>
   );
diff --git a/src/components/map/Marker.tsx b/src/components/map/Marker.tsx
index 20ffa6b..a355804 100644
--- a/src/components/map/Marker.tsx
+++ b/src/components/map/Marker.tsx
@@ -1,14 +1,13 @@
-import { KeyObject } from 'crypto';
 import react, { ReactNode } from 'react';
 import { lat2tile, lon2tile } from '../../lib/geo';
-import { CoordinateSystem } from './LiveMap';
-import { geoPoint, TileKeyObject } from './types';
+import { geoPoint, Rectangle, TileKeyObject } from './types';
 
 export interface MarkerProperties {
   coordinates: geoPoint;
   icon: ReactNode;
   keyObject?: TileKeyObject;
   zoom?: number;
+  viewPort?: Rectangle;
 }
 
 export const Marker: react.FC<MarkerProperties> = (props: MarkerProperties) => {
diff --git a/src/components/map/TiledLayer.tsx b/src/components/map/TiledLayer.tsx
index dadb2b4..f10ade8 100644
--- a/src/components/map/TiledLayer.tsx
+++ b/src/components/map/TiledLayer.tsx
@@ -1,4 +1,9 @@
-import react, { ReactNode, useRef } from 'react';
+import react, {
+  cloneElement,
+  JSXElementConstructor,
+  ReactElement,
+  useRef,
+} from 'react';
 import TileSet from './TileSet';
 import { Point, TileKeyObject } from './types';
 import { CoordinateSystem } from './LiveMap';
@@ -20,6 +25,8 @@ export interface TiledLayerProperties {
    * The coordinate system
    */
   coordinateSystem: CoordinateSystem;
+  /** Slippy graphics are non scalable SVG snippets defined by geo locations */
+  slippyGraphics?: ReactElement<any, string | JSXElementConstructor<any>>[];
 }
 
 /**
@@ -89,6 +96,16 @@ export const TiledLayer: react.FC<TiledLayerProperties> = (
           }}
           viewPort={viewPort}
         />
+        {props.slippyGraphics !== undefined && viewPort !== undefined
+          ? // Slippy graphics (if needed)
+            props.slippyGraphics.map((slippyGraphic) =>
+              cloneElement(slippyGraphic, {
+                keyObject: props.keyObject,
+                zoom: props.coordinateSystem.zoom,
+                viewPort: viewPort,
+              })
+            )
+          : null}
       </g>
     </>
   );