chore: use cdn image

ooooorobo · Nov 26, 2023 · d5c2602 · d5c2602
1 parent 28ab5d7
commit d5c2602
Show file tree

Hide file tree

Showing 129 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ name: Deploy static content to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ['main']
+    branches: [ 'main' ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -39,6 +39,8 @@ jobs:
         run: npm install
       - name: Build
         run: npm run build
+        env:
+          VITE_IMAGE_URL: ${{ secrets.VITE_IMAGE_URL }}
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact

diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,4 @@ dist-ssr
 *.sln
 *.sw?
 
-.idea
+.env
diff --git a/public/tile/0/tile000.png b/public/tile/0/tile000.png
diff --git a/public/tile/0/tile001.png b/public/tile/0/tile001.png
diff --git a/public/tile/0/tile002.png b/public/tile/0/tile002.png
diff --git a/public/tile/0/tile003.png b/public/tile/0/tile003.png
diff --git a/public/tile/0/tile004.png b/public/tile/0/tile004.png
diff --git a/public/tile/0/tile005.png b/public/tile/0/tile005.png
diff --git a/public/tile/0/tile006.png b/public/tile/0/tile006.png
diff --git a/public/tile/0/tile007.png b/public/tile/0/tile007.png
diff --git a/public/tile/0/tile008.png b/public/tile/0/tile008.png
diff --git a/public/tile/0/tile009.png b/public/tile/0/tile009.png
diff --git a/public/tile/0/tile010.png b/public/tile/0/tile010.png
diff --git a/public/tile/0/tile011.png b/public/tile/0/tile011.png
diff --git a/public/tile/0/tile012.png b/public/tile/0/tile012.png
diff --git a/public/tile/0/tile013.png b/public/tile/0/tile013.png
diff --git a/public/tile/0/tile014.png b/public/tile/0/tile014.png
diff --git a/public/tile/0/tile015.png b/public/tile/0/tile015.png
diff --git a/public/tile/0/tile016.png b/public/tile/0/tile016.png
diff --git a/public/tile/0/tile017.png b/public/tile/0/tile017.png
diff --git a/public/tile/0/tile018.png b/public/tile/0/tile018.png
diff --git a/public/tile/0/tile019.png b/public/tile/0/tile019.png
diff --git a/public/tile/0/tile020.png b/public/tile/0/tile020.png
diff --git a/public/tile/0/tile021.png b/public/tile/0/tile021.png
diff --git a/public/tile/0/tile022.png b/public/tile/0/tile022.png
diff --git a/public/tile/0/tile023.png b/public/tile/0/tile023.png
diff --git a/public/tile/0/tile024.png b/public/tile/0/tile024.png
diff --git a/public/tile/0/tile025.png b/public/tile/0/tile025.png
diff --git a/public/tile/0/tile026.png b/public/tile/0/tile026.png
diff --git a/public/tile/0/tile027.png b/public/tile/0/tile027.png
diff --git a/public/tile/0/tile028.png b/public/tile/0/tile028.png
diff --git a/public/tile/0/tile029.png b/public/tile/0/tile029.png
diff --git a/public/tile/0/tile030.png b/public/tile/0/tile030.png
diff --git a/public/tile/0/tile031.png b/public/tile/0/tile031.png
diff --git a/public/tile/0/tile032.png b/public/tile/0/tile032.png
diff --git a/public/tile/0/tile033.png b/public/tile/0/tile033.png
diff --git a/public/tile/0/tile034.png b/public/tile/0/tile034.png
diff --git a/public/tile/0/tile035.png b/public/tile/0/tile035.png
diff --git a/public/tile/0/tile036.png b/public/tile/0/tile036.png
diff --git a/public/tile/0/tile037.png b/public/tile/0/tile037.png
diff --git a/public/tile/0/tile038.png b/public/tile/0/tile038.png
diff --git a/public/tile/0/tile039.png b/public/tile/0/tile039.png
diff --git a/public/tile/0/tile040.png b/public/tile/0/tile040.png
diff --git a/public/tile/0/tile041.png b/public/tile/0/tile041.png
diff --git a/public/tile/0/tile042.png b/public/tile/0/tile042.png
diff --git a/public/tile/0/tile043.png b/public/tile/0/tile043.png
diff --git a/public/tile/0/tile044.png b/public/tile/0/tile044.png
diff --git a/public/tile/0/tile045.png b/public/tile/0/tile045.png
diff --git a/public/tile/0/tile046.png b/public/tile/0/tile046.png
diff --git a/public/tile/0/tile047.png b/public/tile/0/tile047.png
diff --git a/public/tile/0/tile048.png b/public/tile/0/tile048.png
diff --git a/public/tile/0/tile049.png b/public/tile/0/tile049.png
diff --git a/public/tile/0/tile050.png b/public/tile/0/tile050.png
diff --git a/public/tile/0/tile051.png b/public/tile/0/tile051.png
diff --git a/public/tile/0/tile052.png b/public/tile/0/tile052.png
diff --git a/public/tile/0/tile053.png b/public/tile/0/tile053.png
diff --git a/public/tile/0/tile054.png b/public/tile/0/tile054.png
diff --git a/public/tile/0/tile055.png b/public/tile/0/tile055.png
diff --git a/public/tile/0/tile056.png b/public/tile/0/tile056.png
diff --git a/public/tile/0/tile057.png b/public/tile/0/tile057.png
diff --git a/public/tile/0/tile058.png b/public/tile/0/tile058.png
diff --git a/public/tile/0/tile059.png b/public/tile/0/tile059.png
diff --git a/public/tile/0/tile060.png b/public/tile/0/tile060.png
diff --git a/public/tile/0/tile061.png b/public/tile/0/tile061.png
diff --git a/public/tile/0/tile062.png b/public/tile/0/tile062.png
diff --git a/public/tile/0/tile063.png b/public/tile/0/tile063.png
diff --git a/public/tile/0/tile064.png b/public/tile/0/tile064.png
diff --git a/public/tile/0/tile065.png b/public/tile/0/tile065.png
diff --git a/public/tile/0/tile066.png b/public/tile/0/tile066.png
diff --git a/public/tile/0/tile067.png b/public/tile/0/tile067.png
diff --git a/public/tile/0/tile068.png b/public/tile/0/tile068.png
diff --git a/public/tile/0/tile069.png b/public/tile/0/tile069.png
diff --git a/public/tile/0/tile070.png b/public/tile/0/tile070.png
diff --git a/public/tile/0/tile071.png b/public/tile/0/tile071.png
diff --git a/public/tile/0/tile072.png b/public/tile/0/tile072.png
diff --git a/public/tile/0/tile073.png b/public/tile/0/tile073.png
diff --git a/public/tile/0/tile074.png b/public/tile/0/tile074.png
diff --git a/public/tile/0/tile075.png b/public/tile/0/tile075.png
diff --git a/public/tile/0/tile076.png b/public/tile/0/tile076.png
diff --git a/public/tile/0/tile077.png b/public/tile/0/tile077.png
diff --git a/public/tile/0/tile078.png b/public/tile/0/tile078.png
diff --git a/public/tile/0/tile079.png b/public/tile/0/tile079.png
diff --git a/public/tile/0/tile080.png b/public/tile/0/tile080.png
diff --git a/public/tile/0/tile081.png b/public/tile/0/tile081.png
diff --git a/public/tile/0/tile082.png b/public/tile/0/tile082.png
diff --git a/public/tile/0/tile083.png b/public/tile/0/tile083.png
diff --git a/public/tile/0/tile084.png b/public/tile/0/tile084.png
diff --git a/public/tile/0/tile085.png b/public/tile/0/tile085.png
diff --git a/public/tile/0/tile086.png b/public/tile/0/tile086.png
diff --git a/public/tile/0/tile087.png b/public/tile/0/tile087.png
diff --git a/public/tile/0/tile088.png b/public/tile/0/tile088.png
diff --git a/public/tile/0/tile089.png b/public/tile/0/tile089.png
diff --git a/public/tile/1/tile000.png b/public/tile/1/tile000.png
diff --git a/public/tile/1/tile001.png b/public/tile/1/tile001.png
diff --git a/public/tile/1/tile002.png b/public/tile/1/tile002.png
diff --git a/public/tile/1/tile003.png b/public/tile/1/tile003.png
diff --git a/public/tile/1/tile004.png b/public/tile/1/tile004.png
diff --git a/public/tile/1/tile005.png b/public/tile/1/tile005.png
diff --git a/public/tile/1/tile006.png b/public/tile/1/tile006.png
diff --git a/public/tile/1/tile007.png b/public/tile/1/tile007.png
diff --git a/public/tile/1/tile008.png b/public/tile/1/tile008.png
diff --git a/public/tile/1/tile009.png b/public/tile/1/tile009.png
diff --git a/public/tile/1/tile010.png b/public/tile/1/tile010.png
diff --git a/public/tile/1/tile011.png b/public/tile/1/tile011.png
diff --git a/public/tile/1/tile012.png b/public/tile/1/tile012.png
diff --git a/public/tile/1/tile013.png b/public/tile/1/tile013.png
diff --git a/public/tile/1/tile014.png b/public/tile/1/tile014.png
diff --git a/public/tile/1/tile015.png b/public/tile/1/tile015.png
diff --git a/public/tile/1/tile016.png b/public/tile/1/tile016.png
diff --git a/public/tile/1/tile017.png b/public/tile/1/tile017.png
diff --git a/public/tile/1/tile018.png b/public/tile/1/tile018.png
diff --git a/public/tile/1/tile019.png b/public/tile/1/tile019.png
diff --git a/public/tile/1/tile020.png b/public/tile/1/tile020.png
diff --git a/public/tile/1/tile021.png b/public/tile/1/tile021.png
diff --git a/public/tile/1/tile022.png b/public/tile/1/tile022.png
diff --git a/public/tile/1/tile023.png b/public/tile/1/tile023.png
diff --git a/public/tile/1/tile024.png b/public/tile/1/tile024.png
diff --git a/public/tile/2/tile000.png b/public/tile/2/tile000.png
diff --git a/public/tile/2/tile001.png b/public/tile/2/tile001.png
diff --git a/public/tile/2/tile002.png b/public/tile/2/tile002.png
diff --git a/public/tile/2/tile003.png b/public/tile/2/tile003.png
diff --git a/public/tile/2/tile004.png b/public/tile/2/tile004.png
diff --git a/public/tile/2/tile005.png b/public/tile/2/tile005.png
diff --git a/public/tile/2/tile006.png b/public/tile/2/tile006.png
diff --git a/public/tile/2/tile007.png b/public/tile/2/tile007.png
diff --git a/public/tile/2/tile008.png b/public/tile/2/tile008.png
diff --git a/src/business/map/tile.ts b/src/business/map/tile.ts
@@ -1,17 +1,19 @@
+import { ORIGINAL_MAP_HEIGHT, ORIGINAL_MAP_WIDTH, ORIGINAL_TILE_SIZE } from './constants.ts';
+
 const columnCount: Record<string, number> = {
   '0': 10,
   '1': 5,
   '2': 3,
 };
 
-export const isValidPoint = (x: number, y: number, columnCount: number) => {
-  return x < columnCount && (x + columnCount * y) <= 100;
+export const isValidPoint = (x: number, y: number, scale: number) => {
+  return x * ORIGINAL_TILE_SIZE <= ORIGINAL_MAP_WIDTH * scale && y * ORIGINAL_TILE_SIZE <= ORIGINAL_MAP_HEIGHT * scale;
 };
 
 export const getColumnCount = (level: number) => {
   return columnCount[level.toString()] ?? 0;
 };
 
 export const getFileName = (x: number, y: number, level: number) => {
-  return `/map/tile/${level}/tile${(x + getColumnCount(level) * y).toString().padStart(3, '0')}.png`;
+  return import.meta.env.VITE_IMAGE_URL + `/tile/${level}/tile${(x + getColumnCount(level) * y).toString().padStart(3, '0')}.png`;
 };
diff --git a/src/components/layer/MapTileLayer.tsx b/src/components/layer/MapTileLayer.tsx
@@ -1,10 +1,10 @@
 import { component$ } from '@builder.io/qwik';
 import { ORIGINAL_TILE_SIZE } from '../../business/map/constants.ts';
-import { getTileRange } from '../../business/map/calculator.ts';
+import { getTileRange, getZoomScale } from '../../business/map/calculator.ts';
 import { generatePointListInRange } from '../../util/point.ts';
 import { makeRect } from '../../util/rect.ts';
 import { Point } from '../../type/Point.ts';
-import { getColumnCount, getFileName, isValidPoint } from '../../business/map/tile.ts';
+import { getFileName, isValidPoint } from '../../business/map/tile.ts';
 
 type Props = {
   level: number;
@@ -20,7 +20,7 @@ export const MapTileLayer = component$(({ level, screenLeftTop, mapLeftTop }: Pr
 
   return <div class={'tile_layer'}>
     {tilePoints.map(({ x, y }) =>
-      isValidPoint(x, y, getColumnCount(level)) && <MapTile x={x} y={y} level={level} mapLeftTop={mapLeftTop} />,
+      isValidPoint(x, y, getZoomScale(level)) && <MapTile x={x} y={y} level={level} mapLeftTop={mapLeftTop} />,
     )}
   </div>;
 });

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -1 +1,9 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_IMAGE_URL: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,4 @@ dist-ssr @@
     *.sln
     *.sw?
-    .idea
+    .env