diff --git a/svgmap/src/components/map/Map.tsx b/svgmap/src/components/map/Map.tsx index 8340ddb..bd280d8 100644 --- a/svgmap/src/components/map/Map.tsx +++ b/svgmap/src/components/map/Map.tsx @@ -68,55 +68,52 @@ const Map: react.FC = (props: MapProperties) => { /> - - ), - }, - { - key: 'tiles1', - content: ( - - ), - }, - { - key: 'tiles2', - transform: 'scale(.5)', - content: ( - = 2} - /> - ), - }, - { key: 'circle', content: }, - ]} - /> + + <> + + + = Math.SQRT2 && zoom < 2 * Math.SQRT2} + /> + = 2 * Math.SQRT2} + /> + , + + ); diff --git a/svgmap/src/components/map/SlippyBoard.tsx b/svgmap/src/components/map/SlippyBoard.tsx index 0a05adb..97fd9c6 100644 --- a/svgmap/src/components/map/SlippyBoard.tsx +++ b/svgmap/src/components/map/SlippyBoard.tsx @@ -4,11 +4,7 @@ interface SlippyBoardProperties { boardSize: number; shift: { x: number; y: number }; zoom: number; - layers?: { - key: string; - transform?: string; - content: ReactElement | ReactNode | ReactElement[] | ReactElement[][]; - }[]; + children: any; } const SlippyBoard: react.FC = ( @@ -19,17 +15,7 @@ const SlippyBoard: react.FC = ( - {props.layers - ? props.layers.map((layer) => ( - - {layer.content} - - )) - : null} + {props.children} ); diff --git a/svgmap/src/components/map/TiledLayer.tsx b/svgmap/src/components/map/TiledLayer.tsx index c54b971..bc86113 100644 --- a/svgmap/src/components/map/TiledLayer.tsx +++ b/svgmap/src/components/map/TiledLayer.tsx @@ -12,6 +12,7 @@ interface TiledLayerProperties { width: number; shift: Point; zoom: number; + layerZoom: number; tileSize: number; nbTiles: number; active: boolean; @@ -20,16 +21,16 @@ interface TiledLayerProperties { const TiledLayer: react.FC = ( props: TiledLayerProperties ) => { - var initialTiledLayer: any[][] = []; + var initialTiles: any[][] = []; for (let row = 0; row < props.nbTiles; row++) { let tileRow = []; for (let col = 0; col < props.nbTiles; col++) { tileRow.push(); } - initialTiledLayer.push(tileRow); + initialTiles.push(tileRow); } - const [tiledLayer, setTiledLayer] = useState(initialTiledLayer); + const [tiles, setTiles] = useState(initialTiles); useEffect(() => { if (props.active) { @@ -63,13 +64,13 @@ const TiledLayer: react.FC = ( firstVisibleTiles )}/${JSON.stringify(lastVisibleTiles)}.` ); - const newTiledLayer: any[][] = []; + const newTiles: any[][] = []; for (let row = 0; row < props.nbTiles; row++) { let tileRow = []; for (let col = 0; col < props.nbTiles; col++) { const key = `${row}/${col}`; if ( - tiledLayer[row][col].type === 'g' && + tiles[row][col].type === 'g' && row >= firstVisibleTiles.y && row <= lastVisibleTiles.y && col >= firstVisibleTiles.x && @@ -87,13 +88,13 @@ const TiledLayer: react.FC = ( /> ); } else { - tileRow.push(tiledLayer[row][col]); + tileRow.push(tiles[row][col]); } } - newTiledLayer.push(tileRow); + newTiles.push(tileRow); } - setTiledLayer(newTiledLayer); + setTiles(newTiles); } }, [ props.shift, @@ -105,7 +106,7 @@ const TiledLayer: react.FC = ( props.tileSize, ]); - return <>{tiledLayer}; + return {tiles}; }; export default TiledLayer; diff --git a/svgmap/templates/Template.tsx b/svgmap/templates/Template.tsx index 8349dcc..84f2f73 100644 --- a/svgmap/templates/Template.tsx +++ b/svgmap/templates/Template.tsx @@ -1,9 +1,9 @@ import react from 'react'; -interface MapProperties {} +interface TemplateProperties {} -const Map: react.FC = (props: MapProperties) => { +const Template: react.FC = (props: TemplateProperties) => { return <>; }; -export default Map; +export default Template;