Skip to content

Commit f6c6e64

Browse files
authored
Merge branch 'main' into kh/website-build-config
2 parents 402333f + 6aecbb7 commit f6c6e64

227 files changed

Lines changed: 58987 additions & 37743 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
node-version: ['^20.10', '22']
19+
node-version: ['22']
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v5
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm install

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
/coverage
2-
node_modules
3-
/dist/javascript
4-
/.parcel-cache
1+
coverage/
2+
dist/javascript/
3+
node_modules/
54

6-
.idea
75
.DS_Store
8-
.cache
6+
.vscode
97
npm-debug.log
8+
lerna-debug.log
9+
package-lock.json
10+
yarn.lock
11+
1012
secrets.json
1113

1214
*.backup
1315
*.bz2
1416
*.osm
1517
*.pbf
1618
*.swp
17-
18-
yarn.lock

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ If you have any questions or want to reach out to a maintainer, ping any of thes
2424
- [archpdx (arch0345)](https://github.com/arch0345)
2525
- [Bryan Housel](https://github.com/bhousel)
2626
- [Cj Malone](https://github.com/Cj-Malone)
27+
- [ilias52730](https://github.com/ilias52730)
2728
- [kjonosm](https://github.com/kjonosm)
2829
- [快乐的老鼠宝宝 (LaoshuBaby)](https://github.com/LaoshuBaby)
2930
- [Minh Nguyễn (1ec5)](https://github.com/1ec5)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ If you have any questions or want to reach out to a maintainer, ping any of thes
6969
- [archpdx (arch0345)](https://github.com/arch0345)
7070
- [Bryan Housel](https://github.com/bhousel)
7171
- [Cj Malone](https://github.com/Cj-Malone)
72+
- [ilias52730](https://github.com/ilias52730)
7273
- [kjonosm](https://github.com/kjonosm)
7374
- [快乐的老鼠宝宝 (LaoshuBaby)](https://github.com/LaoshuBaby)
7475
- [Minh Nguyễn (1ec5)](https://github.com/1ec5)

app/src/CategoryRow.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { useContext } from 'react';
22
import { Link } from 'react-router-dom';
33

44
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
5-
import { faUnlock } from '@fortawesome/free-solid-svg-icons'; // SSL Unlock icon.
6-
import { faLock } from '@fortawesome/free-solid-svg-icons'; // SSL lock icon.
7-
5+
import { faUnlock, faLock } from '@fortawesome/free-solid-svg-icons'; // SSL local and Unlock icon.
86
import { AppContext, getFilterParams, stripDiacritics } from './AppContext';
97
import { CategoryRowSocialLinks} from './CategoryRowSocialLinks';
108

app/src/CategoryRowSocialLinks.jsx

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
2-
import { faFacebookSquare } from '@fortawesome/free-brands-svg-icons';
3-
import { faInstagram } from '@fortawesome/free-brands-svg-icons';
4-
import { faLinkedin } from '@fortawesome/free-brands-svg-icons';
5-
import { faPinterestSquare } from '@fortawesome/free-brands-svg-icons';
6-
import { faSnapchatSquare } from '@fortawesome/free-brands-svg-icons';
7-
import { faTiktok } from '@fortawesome/free-brands-svg-icons';
8-
import { faSquareThreads } from '@fortawesome/free-brands-svg-icons';
9-
import { faSquareXTwitter } from '@fortawesome/free-brands-svg-icons';
10-
import { faVk } from '@fortawesome/free-brands-svg-icons';
11-
import { faWeibo } from '@fortawesome/free-brands-svg-icons';
12-
import { faWeixin } from '@fortawesome/free-brands-svg-icons';
13-
import { faYoutubeSquare } from '@fortawesome/free-brands-svg-icons';
14-
2+
import {
3+
faFacebookSquare,
4+
faInstagram,
5+
faLinkedin,
6+
faPinterestSquare,
7+
faSnapchatSquare,
8+
faTiktok,
9+
faSquareThreads,
10+
faSquareXTwitter,
11+
faVk,
12+
faWeibo,
13+
faWeixin,
14+
faYoutubeSquare,
15+
} from "@fortawesome/free-brands-svg-icons";
1516

1617
export function CategoryRowSocialLinks(props) {
1718
let items = [];

data/brands/amenity/atm.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,22 @@
576576
"operator:wikidata": "Q11330939"
577577
}
578578
},
579+
{
580+
"displayName": "ローソン銀行",
581+
"id": "lawsonbank-52efab",
582+
"locationSet": {"include": ["jp"]},
583+
"matchNames": ["ローソン", "ローソンatm"],
584+
"tags": {
585+
"amenity": "atm",
586+
"brand": "ローソン銀行",
587+
"brand:en": "Lawson Bank",
588+
"brand:ja": "ローソン銀行",
589+
"brand:wikidata": "Q11350963",
590+
"name": "ローソン銀行",
591+
"name:en": "Lawson Bank",
592+
"name:ja": "ローソン銀行"
593+
}
594+
},
579595
{
580596
"displayName": "中華郵政",
581597
"id": "chunghwapost-9a6797",

0 commit comments

Comments
 (0)