Skip to content

Commit

Permalink
Merge branch 'prettier-config' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tyrasd committed Jan 25, 2022
2 parents 699e106 + 1f58596 commit 7617c45
Show file tree
Hide file tree
Showing 214 changed files with 701 additions and 524 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4

[{data/deprecated.json,data/discarded.json,package.json,.package-lock.json}]
indent_size = 2
13 changes: 13 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: prettier check
on: [push, pull_request]
jobs:
lint:
name: Check for code formatting mistakes
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: npm install
- run: npm run lint
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package.json
package-lock.json
dist/
*.yaml
data/discarded.json
data/deprecated.json
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parser": "json-stringify",
"proseWrap": "never",
"bracketSpacing": true,
"endOfLine": "lf"
}
12 changes: 10 additions & 2 deletions data/fields/access.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"],
"reference": {"key": "access"},
"keys": [
"access",
"foot",
"motor_vehicle",
"bicycle",
"horse"
],
"reference": {
"key": "access"
},
"type": "access",
"label": "Allowed Access",
"placeholder": "Not Specified",
Expand Down
2 changes: 1 addition & 1 deletion data/fields/access_simple.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"no": "None"
}
},
"autoSuggestions" : false,
"autoSuggestions": false,
"terms": [
"permitted",
"private",
Expand Down
2 changes: 1 addition & 1 deletion data/fields/activity.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
"Ski": "Skiing"
}
}
}
}
6 changes: 3 additions & 3 deletions data/fields/addr/interpolation.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"odd": "Odd",
"alphabetic": "Alphabetic"
}
},
"autoSuggestions" : false,
"customValues" : false
},
"autoSuggestions": false,
"customValues": false
}
68 changes: 34 additions & 34 deletions data/fields/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,40 @@
"label": "Address",
"strings": {
"placeholders": {
"block_number": "Block Number",
"block_number!jp": "Block No.",
"city": "City",
"city!cn": "City/Prefecture/League",
"city!jp": "City/Town/Village/Tokyo Special Ward",
"city!vn": "City/Town",
"conscriptionnumber": "123",
"country": "Country",
"county": "County",
"county!jp": "District",
"district": "District",
"district!cn": "District/County/Banner",
"district!vn": "Arrondissement/Town/District",
"floor": "Floor",
"hamlet": "Hamlet",
"housename": "Housename",
"housenumber": "123",
"housenumber!jp": "Building No./Lot No.",
"neighbourhood": "Neighbourhood",
"neighbourhood!jp": "Chōme/Aza/Koaza",
"place": "Place",
"postcode": "Postcode",
"province": "Province",
"province!cn": "Province/Municipality/AR/SAR",
"province!jp": "Prefecture",
"quarter": "Quarter",
"quarter!jp": "Ōaza/Machi",
"state": "State",
"street": "Street",
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward",
"unit": "Unit"
"block_number": "Block Number",
"block_number!jp": "Block No.",
"city": "City",
"city!cn": "City/Prefecture/League",
"city!jp": "City/Town/Village/Tokyo Special Ward",
"city!vn": "City/Town",
"conscriptionnumber": "123",
"country": "Country",
"county": "County",
"county!jp": "District",
"district": "District",
"district!cn": "District/County/Banner",
"district!vn": "Arrondissement/Town/District",
"floor": "Floor",
"hamlet": "Hamlet",
"housename": "Housename",
"housenumber": "123",
"housenumber!jp": "Building No./Lot No.",
"neighbourhood": "Neighbourhood",
"neighbourhood!jp": "Chōme/Aza/Koaza",
"place": "Place",
"postcode": "Postcode",
"province": "Province",
"province!cn": "Province/Municipality/AR/SAR",
"province!jp": "Prefecture",
"quarter": "Quarter",
"quarter!jp": "Ōaza/Machi",
"state": "State",
"street": "Street",
"subdistrict": "Subdistrict",
"subdistrict!vn": "Ward/Commune/Townlet",
"suburb": "Suburb",
"suburb!jp": "Ward",
"unit": "Unit"
}
},
"terms": [
Expand Down
2 changes: 1 addition & 1 deletion data/fields/aerialway.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "aerialway",
"type": "typeCombo",
"label": "Type"
}
}
4 changes: 2 additions & 2 deletions data/fields/aerialway/access.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"both": "Both"
}
},
"autoSuggestions" : false,
"customValues" : false
"autoSuggestions": false,
"customValues": false
}
2 changes: 1 addition & 1 deletion data/fields/aerialway/bubble.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "aerialway:bubble",
"type": "check",
"label": "Bubble"
}
}
2 changes: 1 addition & 1 deletion data/fields/aerialway/heating.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "aerialway:heating",
"type": "check",
"label": "Heated"
}
}
4 changes: 2 additions & 2 deletions data/fields/aerialway/summer/access.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"both": "Both"
}
},
"autoSuggestions" : false,
"customValues" : false
"autoSuggestions": false,
"customValues": false
}
2 changes: 1 addition & 1 deletion data/fields/aeroway.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "aeroway",
"type": "typeCombo",
"label": "Type"
}
}
2 changes: 1 addition & 1 deletion data/fields/amenity.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "amenity",
"type": "typeCombo",
"label": "Type"
}
}
2 changes: 1 addition & 1 deletion data/fields/ascent.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"minValue": 0,
"type": "number",
"label": "Total Ascent",
"terms":[
"terms": [
"ascent",
"climb",
"cumulative elevation gain"
Expand Down
2 changes: 1 addition & 1 deletion data/fields/atm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "atm",
"type": "check",
"label": "ATM"
}
}
2 changes: 1 addition & 1 deletion data/fields/automated.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "automated",
"type": "check",
"label": "Automated"
}
}
4 changes: 2 additions & 2 deletions data/fields/baby_feeding.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"no": "None"
}
},
"autoSuggestions" : false,
"customValues" : false,
"autoSuggestions": false,
"customValues": false,
"terms": [
"baby feeding",
"breastfeeding",
Expand Down
2 changes: 1 addition & 1 deletion data/fields/baby_seat.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "baby",
"type": "check",
"label": "Baby Seat"
}
}
2 changes: 1 addition & 1 deletion data/fields/bar.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "bar",
"type": "check",
"label": "Bar"
}
}
2 changes: 1 addition & 1 deletion data/fields/barrier.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "barrier",
"type": "typeCombo",
"label": "Type"
}
}
6 changes: 3 additions & 3 deletions data/fields/bath/open_air.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"key": "bath:open_air",
"label": "Open Air",
"type": "check"
"key": "bath:open_air",
"label": "Open Air",
"type": "check"
}
6 changes: 3 additions & 3 deletions data/fields/bath/sand_bath.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"key": "bath:sand_bath",
"label": "Sand Bath",
"type": "check"
"key": "bath:sand_bath",
"label": "Sand Bath",
"type": "check"
}
6 changes: 3 additions & 3 deletions data/fields/bath/type.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"key": "bath:type",
"type": "combo",
"label": "Specialty"
"key": "bath:type",
"type": "combo",
"label": "Specialty"
}
2 changes: 1 addition & 1 deletion data/fields/bicycle_parking.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "bicycle_parking",
"type": "combo",
"label": "Type"
}
}
2 changes: 1 addition & 1 deletion data/fields/boundary.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "boundary",
"type": "combo",
"label": "Type"
}
}
2 changes: 1 addition & 1 deletion data/fields/branch_brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "branch",
"type": "text",
"label": "Branch"
}
}
2 changes: 1 addition & 1 deletion data/fields/building.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"terms": [
"structure"
]
}
}
2 changes: 1 addition & 1 deletion data/fields/building/flats.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"minValue": 0,
"label": "Units",
"placeholder": "2, 4, 6, 8..."
}
}
4 changes: 3 additions & 1 deletion data/fields/building_area.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"key": "building",
"type": "combo",
"default": "yes",
"geometry": ["area"],
"geometry": [
"area"
],
"label": "Building"
}
8 changes: 5 additions & 3 deletions data/fields/cai_scale-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
},
"snake_case": false,
"caseSensitive": true,
"autoSuggestions" : false,
"customValues" : false,
"autoSuggestions": false,
"customValues": false,
"locationSet": {
"include": [ "IT" ]
"include": [
"IT"
]
}
}
4 changes: 2 additions & 2 deletions data/fields/camera/type.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"dome": "Dome"
}
},
"autoSuggestions" : false,
"customValues" : false
"autoSuggestions": false,
"customValues": false
}
2 changes: 1 addition & 1 deletion data/fields/capacity.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"minValue": 0,
"label": "Capacity",
"placeholder": "50, 100, 200..."
}
}
2 changes: 1 addition & 1 deletion data/fields/capacity_volume.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"minValue": 0,
"label": "Capacity (Cubic Meters)",
"placeholder": "50, 100, 200..."
}
}
2 changes: 1 addition & 1 deletion data/fields/cash_in.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "cash_in",
"type": "check",
"label": "Cash In"
}
}
2 changes: 1 addition & 1 deletion data/fields/collection_times.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "collection_times",
"type": "text",
"label": "Collection Times"
}
}
2 changes: 1 addition & 1 deletion data/fields/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"key": "construction",
"type": "combo",
"label": "Type"
}
}
Loading

0 comments on commit 7617c45

Please sign in to comment.