Skip to content

Commit

Permalink
Merge branch 'main' into clay-oneway
Browse files Browse the repository at this point in the history
  • Loading branch information
claysmalley committed Jun 17, 2023
2 parents 605a435 + aba811e commit 9c21c00
Show file tree
Hide file tree
Showing 235 changed files with 24,680 additions and 4,352 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[registries.crates-io]
protocol = "sparse"
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
31 changes: 23 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,38 @@ on:
push:
branches:
- main
permissions:
contents: read
pages: write
id-token: write
jobs:
build-and-deploy:
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Checkout 🛎️
uses: actions/checkout@v2.3.1
- name: Use Node.js 17.x
uses: actions/setup-node@v1
uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 17.x
node-version: 18.x
- name: Build Shield Library 🛡️
run: |
cd shieldlib
npm ci --include=dev
npm run build
- name: Install and Build 🔧
run: |
npm ci --include=dev
cp src/configs/config.aws.js src/config.js
npm run build
- name: Deploy 🚀
uses: JamesIves/[email protected]
npm run style
- name: Upload 🏗
uses: actions/upload-pages-artifact@v1
with:
branch: gh-pages # The branch the action should deploy to.
folder: dist/ # The folder the action should deploy.
path: ./dist
- name: Deploy 🚀
id: deployment
uses: actions/deploy-pages@v1
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# Make sure the actual branch is checked out when running on pull requests
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/test-build-mac.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Test Build (MacOS)

on:
pull_request:
branches: [main]

jobs:
build:
runs-on: macos-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Build Shield Library 🛡️
run: |
cd shieldlib
npm ci --include=dev
npm run build
- name: Install and Build 🔧
run: |
npm ci --include=dev
npm run build
npm run style
- name: Test 🧪
run: |
npm test
cd shieldlib
npm test
31 changes: 31 additions & 0 deletions .github/workflows/test-build-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Test Build (Ubuntu)

on:
pull_request:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Build Shield Library 🛡️
run: |
cd shieldlib
npm ci --include=dev
npm run build
- name: Install and Build 🔧
run: |
npm ci --include=dev
npm run build
npm run style
- name: Test 🧪
run: |
npm test
cd shieldlib
npm test
22 changes: 0 additions & 22 deletions .github/workflows/test-build.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
node_modules
sprites
build
rebusurance.zip
.DS_Store
config.js
.parcel-cache
dist/
dist
download
local.config.js
10 changes: 10 additions & 0 deletions .mocharc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
recursive: true
extension:
- ts
spec:
- test/**/*.js
- test/**/*.spec.ts
require: ts-node/register
node-option:
- loader=ts-node/esm
- experimental-specifier-resolution=node
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ build
sprites
js/maplibre-gl.js
dist
.pnp.*
6 changes: 4 additions & 2 deletions ACKNOWLEDGEMENTS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Thanks

- The stylized highway shields are inspired by "rebusurance" by Minh Nguyễn (https://github.com/1ec5/rebusurance)
- Initial layer code is derived from Oliver Wipfli's openmaptiles-starter style: https://github.com/wipfli/openmaptiles-starter
- The stylized highway shields are inspired by "[Rebusurance](https://github.com/1ec5/rebusurance/)" by Minh Nguyễn.
- Initial layer code is derived from Oliver Wipfli's [openmaptiles-starter](https://github.com/wipfli/openmaptiles-starter/) style.
- The font stack was [packaged from Google Fonts](https://fonts.google.com/attribution).
- Support for right-to-left Arabic and Hebrew text is provided by the [mapbox-gl-rtl-text](https://github.com/mapbox/mapbox-gl-rtl-text/) plugin.
3 changes: 3 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Code of Conduct

The OpenStreetMap Americana project has [opted in](https://github.com/ZeLonewolf/openstreetmap-americana/pull/489) to the [OpenStreetMap US Code of Conduct](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/OSM_US_Code_of_Conduct) (CoC) and [Process for Moderation](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/ModerationProcess).
Loading

0 comments on commit 9c21c00

Please sign in to comment.