Merge pull request #81 from Disfactory/feature/protomap

Support protomaps vector tile service as map layer

.env → .env.example

@@ -1 +1,2 @@
 VUE_APP_BASE_URL=https://staging.disfactory.tw/api
+VUE_APP_PROTOMAP_API_KEY=

.github/workflows/ci.yml

@@ -54,6 +54,8 @@ jobs:
     needs: [lint, typecheck, unit-test]
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]') && github.event_name == 'push' && github.ref == 'refs/heads/master'"
+    env:
+      VUE_APP_PROTOMAP_API_KEY: e6cfbd46818cf623
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js 10.x

.gitignore

@@ -5,6 +5,7 @@ node_modules
 # local env files
 .env.local
 .env.*.local
+.env
 
 # Log files
 npm-debug.log*

README.md

@@ -1,34 +1,42 @@
-# frontend
+# Disfactory frontend
 
 ## Project setup
-```
+
+```bash
+cp .env.example .env
 npm install
 ```
 
 ### Compiles and hot-reloads for development
-```
+
+```bash
 npm run serve
 ```
 
 ### Compiles and minifies for production
-```
+
+```bash
 npm run build
 ```
 
 ### Run your tests
-```
+
+```bash
 npm run test
 ```
 
 ### Lints and fixes files
-```
+
+```bash
 npm run lint
 ```
 
 ### Run your unit tests
-```
+
+```bash
 npm run test:unit
 ```
 
 ### Customize configuration
+
 See [Configuration Reference](https://cli.vuejs.org/config/).

package.json

@@ -49,7 +49,8 @@
     "eslint-plugin-vue": "^6.0.1",
     "fibers": "^4.0.3",
     "lint-staged": "^9.4.3",
-    "ol": "^5.3.3",
+    "ol": "^6.5.0",
+    "ol-mapbox-style": "^6.3.1",
     "sass": "^1.23.7",
     "sass-loader": "^8.0.0",
     "typescript": "^3.9.7",

src/components/SwitchMapModeButton.vue

@@ -55,7 +55,12 @@ export default createComponent({
       }
     })
 
-    const mapModes = [BASE_MAP.SATELITE, BASE_MAP.OSM, BASE_MAP.TAIWAN].map(type => ({
+    const mapModes = [
+      BASE_MAP.SATELITE,
+      BASE_MAP.OSM,
+      BASE_MAP.TAIWAN,
+      BASE_MAP.PROTOMAP
+    ].map(type => ({
       type,
       name: BASE_MAP_NAME[type]
     }))