diff --git a/svgmap/src/components/map/Map.tsx b/svgmap/src/components/map/Map.tsx index 6703d66..a8437dc 100644 --- a/svgmap/src/components/map/Map.tsx +++ b/svgmap/src/components/map/Map.tsx @@ -8,7 +8,7 @@ import SingleTouchHandler from './SingleTouchHandler'; import DoubleTouchHandler from './DoubleTouchHandler'; import TiledLayersStack from './TiledLayersStack'; -export interface TiledLayerKey { +export interface TileKey { provider: string; zoomLevel: number; x: number; @@ -20,8 +20,8 @@ interface MapProperties { width: number; } -export const tiledLayerKeyToString = (tiledLayerKey: TiledLayerKey) => { - return `${tiledLayerKey.provider}/${tiledLayerKey.zoomLevel}/${tiledLayerKey.x}/${tiledLayerKey.y}`; +export const tileKeyToString = (tileKey: TileKey) => { + return `${tileKey.provider}/${tileKey.zoomLevel}/${tileKey.x}/${tileKey.y}`; }; const Map: react.FC = (props: MapProperties) => { diff --git a/svgmap/src/components/map/Tile.tsx b/svgmap/src/components/map/Tile.tsx index 6b106bb..0ee7c3b 100644 --- a/svgmap/src/components/map/Tile.tsx +++ b/svgmap/src/components/map/Tile.tsx @@ -1,5 +1,5 @@ import react, { useEffect, useRef } from 'react'; -import { TiledLayerKey } from './Map'; +import { TileKey } from './Map'; interface TileProperties { href?: string; @@ -7,7 +7,7 @@ interface TileProperties { y: number; tileSize: number; delay?: number; - tileKey: TiledLayerKey; + tileKey: TileKey; } const Tile: react.FC = (props: TileProperties) => { diff --git a/svgmap/src/components/map/TiledLayer.tsx b/svgmap/src/components/map/TiledLayer.tsx index 1ea29f8..7d1eef0 100644 --- a/svgmap/src/components/map/TiledLayer.tsx +++ b/svgmap/src/components/map/TiledLayer.tsx @@ -1,7 +1,7 @@ import react, { useEffect, useState } from 'react'; import Tile from './Tile'; import fakeTile from './FakeTile.svg'; -import { TiledLayerKey, tiledLayerKeyToString } from './Map'; +import { TileKey, tileKeyToString } from './Map'; interface Point { x: number; @@ -17,7 +17,7 @@ interface TiledLayerProperties { tileSize: number; nbTiles: number; active: boolean; - tiledLayerKey: TiledLayerKey; + tiledLayerKey: TileKey; } const TiledLayer: react.FC = ( @@ -27,13 +27,13 @@ const TiledLayer: react.FC = ( for (let row = 0; row < props.nbTiles; row++) { let tileRow = []; for (let col = 0; col < props.nbTiles; col++) { - const tileKey: TiledLayerKey = { + const tileKey: TileKey = { provider: props.tiledLayerKey.provider, zoomLevel: props.tiledLayerKey.zoomLevel, x: props.tiledLayerKey.x + col, y: props.tiledLayerKey.y + row, }; - tileRow.push(); + tileRow.push(); } initialTiles.push(tileRow); } @@ -76,7 +76,7 @@ const TiledLayer: react.FC = ( for (let row = 0; row < props.nbTiles; row++) { let tileRow = []; for (let col = 0; col < props.nbTiles; col++) { - const tileKey: TiledLayerKey = { + const tileKey: TileKey = { provider: props.tiledLayerKey.provider, zoomLevel: props.tiledLayerKey.zoomLevel, x: props.tiledLayerKey.x + col, @@ -92,7 +92,7 @@ const TiledLayer: react.FC = ( console.log(`Adding tile ${row}/${col}`); tileRow.push( void]; + tiledLayerKeyState: [TileKey, (tiledLayerKey: TileKey) => void]; } const TiledLayersStack: react.FC = ( @@ -55,7 +55,7 @@ const TiledLayersStack: react.FC = ( }; return (