From 26630439a4f701645282a2d6582d09f52985836f Mon Sep 17 00:00:00 2001
From: evlist <vdv@dyomedea.com>
Date: Sun, 16 Oct 2022 14:52:26 +0200
Subject: [PATCH] Pushing map coordinated down to tiles.

---
 svgmap/src/components/map/Map.tsx             | 23 +++++++++++++++----
 svgmap/src/components/map/Tile.tsx            |  4 +++-
 svgmap/src/components/map/TiledLayer.tsx      | 20 +++++++++++++---
 .../src/components/map/TiledLayersStack.tsx   | 17 +++++++++++---
 4 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/svgmap/src/components/map/Map.tsx b/svgmap/src/components/map/Map.tsx
index 317b235..6703d66 100644
--- a/svgmap/src/components/map/Map.tsx
+++ b/svgmap/src/components/map/Map.tsx
@@ -8,11 +8,22 @@ import SingleTouchHandler from './SingleTouchHandler';
 import DoubleTouchHandler from './DoubleTouchHandler';
 import TiledLayersStack from './TiledLayersStack';
 
+export interface TiledLayerKey {
+  provider: string;
+  zoomLevel: number;
+  x: number;
+  y: number;
+}
+
 interface MapProperties {
   height: number;
   width: number;
 }
 
+export const tiledLayerKeyToString = (tiledLayerKey: TiledLayerKey) => {
+  return `${tiledLayerKey.provider}/${tiledLayerKey.zoomLevel}/${tiledLayerKey.x}/${tiledLayerKey.y}`;
+};
+
 const Map: react.FC<MapProperties> = (props: MapProperties) => {
   const nbTiles =
     Math.ceil((Math.max(props.width, props.height) * 2) / 256) + 2;
@@ -21,6 +32,13 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
   const [shift, setShift] = useState({ x: -boardSize / 2, y: -boardSize / 2 });
   const [zoom, setZoom] = useState(1);
 
+  const [tiledLayerKey, setTiledLayerKey] = useState({
+    provider: 'osm',
+    zoomLevel: 16,
+    x: 33488,
+    y: 23939,
+  });
+
   const addShift = (deltaShift: { x: number; y: number }) => {
     setShift({ x: shift.x + deltaShift.x, y: shift.y + deltaShift.y });
   };
@@ -37,8 +55,6 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
     setZoom(zoom * zoomFactor);
   };
 
-  const [baseZoomLevel, setBaseZoomLevel] = useState(10);
-
   console.log(`Rendering Map, zoom:${zoom}, shift:${JSON.stringify(shift)}`);
 
   return (
@@ -88,8 +104,7 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
               tileSize={256}
               key='tiled-layers'
               numberOfZoomLevels={5}
-              baseZoomLevel={baseZoomLevel}
-              setBaseZoomLevel={setBaseZoomLevel}
+              tiledLayerKeyState={[tiledLayerKey, setTiledLayerKey]}
             />
             <circle key='circle' cx='50' cy='50' r='50' />,
           </>
diff --git a/svgmap/src/components/map/Tile.tsx b/svgmap/src/components/map/Tile.tsx
index 6fa1faf..6b106bb 100644
--- a/svgmap/src/components/map/Tile.tsx
+++ b/svgmap/src/components/map/Tile.tsx
@@ -1,4 +1,5 @@
 import react, { useEffect, useRef } from 'react';
+import { TiledLayerKey } from './Map';
 
 interface TileProperties {
   href?: string;
@@ -6,6 +7,7 @@ interface TileProperties {
   y: number;
   tileSize: number;
   delay?: number;
+  tileKey: TiledLayerKey;
 }
 
 const Tile: react.FC<TileProperties> = (props: TileProperties) => {
@@ -46,7 +48,7 @@ const Tile: react.FC<TileProperties> = (props: TileProperties) => {
       };
       loadImage();
     }
- }, [props.href, props.delay, props.tileSize]);
+  }, [props.href, props.delay, props.tileSize]);
 
   // const children = useMemo(
   //   () => (
diff --git a/svgmap/src/components/map/TiledLayer.tsx b/svgmap/src/components/map/TiledLayer.tsx
index bc86113..1ea29f8 100644
--- a/svgmap/src/components/map/TiledLayer.tsx
+++ b/svgmap/src/components/map/TiledLayer.tsx
@@ -1,6 +1,7 @@
 import react, { useEffect, useState } from 'react';
 import Tile from './Tile';
 import fakeTile from './FakeTile.svg';
+import { TiledLayerKey, tiledLayerKeyToString } from './Map';
 
 interface Point {
   x: number;
@@ -16,6 +17,7 @@ interface TiledLayerProperties {
   tileSize: number;
   nbTiles: number;
   active: boolean;
+  tiledLayerKey: TiledLayerKey;
 }
 
 const TiledLayer: react.FC<TiledLayerProperties> = (
@@ -25,7 +27,13 @@ const TiledLayer: react.FC<TiledLayerProperties> = (
   for (let row = 0; row < props.nbTiles; row++) {
     let tileRow = [];
     for (let col = 0; col < props.nbTiles; col++) {
-      tileRow.push(<g key={`${row}/${col}`} />);
+      const tileKey: TiledLayerKey = {
+        provider: props.tiledLayerKey.provider,
+        zoomLevel: props.tiledLayerKey.zoomLevel,
+        x: props.tiledLayerKey.x + col,
+        y: props.tiledLayerKey.y + row,
+      };
+      tileRow.push(<g key={tiledLayerKeyToString(tileKey)} />);
     }
     initialTiles.push(tileRow);
   }
@@ -68,7 +76,12 @@ const TiledLayer: react.FC<TiledLayerProperties> = (
       for (let row = 0; row < props.nbTiles; row++) {
         let tileRow = [];
         for (let col = 0; col < props.nbTiles; col++) {
-          const key = `${row}/${col}`;
+          const tileKey: TiledLayerKey = {
+            provider: props.tiledLayerKey.provider,
+            zoomLevel: props.tiledLayerKey.zoomLevel,
+            x: props.tiledLayerKey.x + col,
+            y: props.tiledLayerKey.y + row,
+          };
           if (
             tiles[row][col].type === 'g' &&
             row >= firstVisibleTiles.y &&
@@ -79,7 +92,8 @@ const TiledLayer: react.FC<TiledLayerProperties> = (
             console.log(`Adding tile ${row}/${col}`);
             tileRow.push(
               <Tile
-                key={key}
+                key={tiledLayerKeyToString(tileKey)}
+                tileKey={tileKey}
                 href={fakeTile}
                 x={col * props.tileSize}
                 y={row * props.tileSize}
diff --git a/svgmap/src/components/map/TiledLayersStack.tsx b/svgmap/src/components/map/TiledLayersStack.tsx
index fd639cb..138718a 100644
--- a/svgmap/src/components/map/TiledLayersStack.tsx
+++ b/svgmap/src/components/map/TiledLayersStack.tsx
@@ -1,5 +1,6 @@
 import react from 'react';
 import TiledLayer from './TiledLayer';
+import { TiledLayerKey, tiledLayerKeyToString } from './Map';
 
 interface Point {
   x: number;
@@ -13,13 +14,16 @@ interface TiledLayersStackProperties {
   zoom: number;
   tileSize: number;
   numberOfZoomLevels?: number;
-  baseZoomLevel: number;
-  setBaseZoomLevel: (baseZoomLevel: number) => void;
+  tiledLayerKeyState: [TiledLayerKey, (tiledLayerKey: TiledLayerKey) => void];
 }
 
 const TiledLayersStack: react.FC<TiledLayersStackProperties> = (
   props: TiledLayersStackProperties
 ) => {
+  console.log(`Rendering TiledLayersStack`);
+
+  const [tiledLayerKey, setTiledLayerKey] = props.tiledLayerKeyState;
+
   const numberOfZoomLevels =
     props.numberOfZoomLevels === undefined
       ? 1
@@ -43,9 +47,16 @@ const TiledLayersStack: react.FC<TiledLayersStackProperties> = (
 
   const getTiledLayer = (zoomLevel: number, isActive: boolean) => {
     const zoom = 2 ** (zoomLevel - safetyZoomLevels);
+    const currentTiledLayerKey = {
+      provider: tiledLayerKey.provider,
+      zoomLevel: zoomLevel + tiledLayerKey.zoomLevel,
+      x: tiledLayerKey.x * zoom,
+      y: tiledLayerKey.y * zoom,
+    };
     return (
       <TiledLayer
-        key={`layer${zoomLevel + props.baseZoomLevel}`}
+        key={tiledLayerKeyToString(currentTiledLayerKey)}
+        tiledLayerKey={currentTiledLayerKey}
         height={props.height * zoom}
         width={props.width * zoom}
         shift={{