CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-26 18:07:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Flatten presets match properties

Browse Source
This commit is contained in:
John Firebaugh
2013-03-13 12:35:31 -07:00
parent 73b2d898c8
commit 41e696a2c5
133 changed files with 1444 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets/README.md
+19 -21
View File
@@ -16,27 +16,25 @@ A basic preset is of the form:
```javascript
{
"name": "park",
"match": {
// the geometry types for which this preset is valid.
// options are point, area, line, and vertex.
// vertexes are points that are parts of lines, like the nodes
// in a road
// lines are unclosed ways, and areas are closed ways
"geometry": [
"point", "area"
],
// terms are synonyms for the preset - these are added to fuel
// the search functionality. searching for 'woodland' will bring
// up this 'park' preset
"terms": [
"esplanade",
"village green",
"woodland"
],
// tags that automatically added to the feature when it's selected
"tags": {
"leisure": "park"
}
// the geometry types for which this preset is valid.
// options are point, area, line, and vertex.
// vertexes are points that are parts of lines, like the nodes
// in a road
// lines are unclosed ways, and areas are closed ways
"geometry": [
"point", "area"
],
// terms are synonyms for the preset - these are added to fuel
// the search functionality. searching for 'woodland' will bring
// up this 'park' preset
"terms": [
"esplanade",
"village green",
"woodland"
],
// tags that automatically added to the feature when it's selected
"tags": {
"leisure": "park"
},
// the icon in iD which represents this feature
"icon": "park",
data/presets/categories.json
+1 -3
View File
@@ -1,7 +1,5 @@
[{
"match": {
"geometry": "line"
},
"geometry": "line",
"icon": "highway",
"name": "roads",
"members": [
data/presets/lint.js
-11
View File
@@ -1,11 +0,0 @@
var fs = require('fs');
var p = JSON.parse(fs.readFileSync('presets.json', 'utf8'));
p = p.map(function(preset) {
preset.match.terms = (preset.match.terms || []).map(function(t) {
return t.trim();
});
return preset;
});
fs.writeFileSync('presets.json', JSON.stringify(p, null, 4));
data/presets/presets.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/presets/presets/aeroway.json
+11 -13
View File
@@ -1,17 +1,15 @@
{
"name": "aeroway",
"match": {
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"aeroway": "*"
}
},
"fields": [
"aeroway"
]
}
],
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"aeroway": "*"
}
}
data/presets/presets/aeroway/aerodrome.json
+12 -16
View File
@@ -1,20 +1,16 @@
{
"name": "airport",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"airplane",
"airport",
"aerodrome"
],
"tags": {
"aeroway": "aerodrome"
}
},
"icon": "airport",
"fields": [
]
"geometry": [
"point",
"area"
],
"terms": [
"airplane",
"airport",
"aerodrome"
],
"tags": {
"aeroway": "aerodrome"
}
}
data/presets/presets/aeroway/helipad.json
+12 -16
View File
@@ -1,20 +1,16 @@
{
"name": "helipad",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"helicopter",
"helipad",
"heliport"
],
"tags": {
"aeroway": "helipad"
}
},
"icon": "heliport",
"fields": [
]
"geometry": [
"point",
"area"
],
"terms": [
"helicopter",
"helipad",
"heliport"
],
"tags": {
"aeroway": "helipad"
}
}
data/presets/presets/amenity.json
+9 -11
View File
@@ -1,15 +1,13 @@
{
"name": "amenity",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "*"
}
},
"fields": [
"amenity"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "*"
}
}
data/presets/presets/amenity/bank.json
+31 -33
View File
@@ -1,41 +1,39 @@
{
"name": "bank",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"coffer",
"countinghouse",
"credit union",
"depository",
"exchequer",
"fund",
"hoard",
"investment firm",
"repository",
"reserve",
"reservoir",
"safe",
"savings",
"stock",
"stockpile",
"store",
"storehouse",
"thrift",
"treasury",
"trust company",
"vault"
],
"tags": {
"amenity": "bank"
}
},
"icon": "bank",
"fields": [
"atm",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"coffer",
"countinghouse",
"credit union",
"depository",
"exchequer",
"fund",
"hoard",
"investment firm",
"repository",
"reserve",
"reservoir",
"safe",
"savings",
"stock",
"stockpile",
"store",
"storehouse",
"thrift",
"treasury",
"trust company",
"vault"
],
"tags": {
"amenity": "bank"
}
}
data/presets/presets/amenity/bar.json
+9 -11
View File
@@ -1,18 +1,16 @@
{
"name": "bar",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bar"
},
"terms": []
},
"icon": "bar",
"fields": [
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bar"
},
"terms": []
}
data/presets/presets/amenity/bicycle_parking.json
+8 -10
View File
@@ -1,18 +1,16 @@
{
"name": "bicycle parking",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bicycle_parking"
}
},
"icon": "bicycle",
"fields": [
"bicycle_parking",
"capacity",
"operator"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bicycle_parking"
}
}
data/presets/presets/amenity/bicycle_rental.json
+8 -10
View File
@@ -1,18 +1,16 @@
{
"name": "bicycle rental",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bicycle_rental"
}
},
"icon": "bicycle",
"fields": [
"capacity",
"network",
"operator"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "bicycle_rental"
}
}
data/presets/presets/amenity/cafe.json
+13 -15
View File
@@ -1,24 +1,22 @@
{
"name": "cafe",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"coffee",
"tea",
"coffee shop"
],
"tags": {
"amenity": "cafe"
}
},
"icon": "cafe",
"fields": [
"cuisine",
"internet_access",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"coffee",
"tea",
"coffee shop"
],
"tags": {
"amenity": "cafe"
}
}
data/presets/presets/amenity/cinema.json
+27 -29
View File
@@ -1,36 +1,34 @@
{
"name": "cinema",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"big screen",
"bijou",
"cine",
"drive-in",
"film",
"flicks",
"motion pictures",
"movie house",
"movie theater",
"moving pictures",
"nabes",
"photoplay",
"picture show",
"pictures",
"playhouse",
"show",
"silver screen"
],
"tags": {
"amenity": "cinema"
}
},
"icon": "cinema",
"fields": [
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"big screen",
"bijou",
"cine",
"drive-in",
"film",
"flicks",
"motion pictures",
"movie house",
"movie theater",
"moving pictures",
"nabes",
"photoplay",
"picture show",
"pictures",
"playhouse",
"show",
"silver screen"
],
"tags": {
"amenity": "cinema"
}
}
data/presets/presets/amenity/fast_food.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "fast food",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "fast_food"
},
"terms": []
},
"icon": "fast-food",
"fields": [
"cuisine",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "fast_food"
},
"terms": []
}
data/presets/presets/amenity/fire_station.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "fire station",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "fire_station"
},
"terms": []
},
"icon": "fire-station",
"fields": [
"operator",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "fire_station"
},
"terms": []
}
data/presets/presets/amenity/grave_yard.json
+8 -10
View File
@@ -1,16 +1,14 @@
{
"name": "grave yard",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "grave_yard"
}
},
"icon": "cemetery",
"fields": [
"religion"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "grave_yard"
}
}
data/presets/presets/amenity/hospital.json
+23 -25
View File
@@ -1,33 +1,31 @@
{
"name": "hospital",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"clinic",
"emergency room",
"health service",
"hospice",
"infirmary",
"institution",
"nursing home",
"rest home",
"sanatorium",
"sanitarium",
"sick bay",
"surgery",
"ward"
],
"tags": {
"amenity": "hospital"
}
},
"icon": "hospital",
"fields": [
"emergency",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"clinic",
"emergency room",
"health service",
"hospice",
"infirmary",
"institution",
"nursing home",
"rest home",
"sanatorium",
"sanitarium",
"sick bay",
"surgery",
"ward"
],
"tags": {
"amenity": "hospital"
}
}
data/presets/presets/amenity/library.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "library",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "library"
},
"terms": []
},
"icon": "library",
"fields": [
"operator",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "library"
},
"terms": []
}
data/presets/presets/amenity/parking.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "parking",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "parking"
},
"terms": []
},
"icon": "parking",
"fields": [
"fee",
"access",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "parking"
},
"terms": []
}
data/presets/presets/amenity/pharmacy.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "pharmacy",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "pharmacy"
},
"terms": []
},
"icon": "pharmacy",
"fields": [
"operator",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "pharmacy"
},
"terms": []
}
data/presets/presets/amenity/place_of_worship.json
+33 -35
View File
@@ -1,44 +1,42 @@
{
"name": "place of worship",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"abbey",
"basilica",
"bethel",
"cathedral",
"chancel",
"chantry",
"chapel",
"church",
"fold",
"house of God",
"house of prayer",
"house of worship",
"minster",
"mission",
"mosque",
"oratory",
"parish",
"sacellum",
"sanctuary",
"shrine",
"synagogue",
"tabernacle",
"temple"
],
"tags": {
"amenity": "place_of_worship"
}
},
"icon": "place-of-worship",
"fields": [
"religion",
"denomination",
"building",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"abbey",
"basilica",
"bethel",
"cathedral",
"chancel",
"chantry",
"chapel",
"church",
"fold",
"house of God",
"house of prayer",
"house of worship",
"minster",
"mission",
"mosque",
"oratory",
"parish",
"sacellum",
"sanctuary",
"shrine",
"synagogue",
"tabernacle",
"temple"
],
"tags": {
"amenity": "place_of_worship"
}
}
data/presets/presets/amenity/place_of_worship/christian.json
+33 -35
View File
@@ -1,43 +1,41 @@
{
"name": "church",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"christian",
"abbey",
"basilica",
"bethel",
"cathedral",
"chancel",
"chantry",
"chapel",
"church",
"fold",
"house of God",
"house of prayer",
"house of worship",
"minster",
"mission",
"oratory",
"parish",
"sacellum",
"sanctuary",
"shrine",
"tabernacle",
"temple"
],
"tags": {
"amenity": "place_of_worship",
"religion": "christian"
}
},
"icon": "religious-christian",
"fields": [
"denomination",
"building",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"christian",
"abbey",
"basilica",
"bethel",
"cathedral",
"chancel",
"chantry",
"chapel",
"church",
"fold",
"house of God",
"house of prayer",
"house of worship",
"minster",
"mission",
"oratory",
"parish",
"sacellum",
"sanctuary",
"shrine",
"tabernacle",
"temple"
],
"tags": {
"amenity": "place_of_worship",
"religion": "christian"
}
}
data/presets/presets/amenity/place_of_worship/jewish.json
+13 -15
View File
@@ -1,23 +1,21 @@
{
"name": "synagogue",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"jewish",
"synagogue"
],
"tags": {
"amenity": "place_of_worship",
"religion": "jewish"
}
},
"icon": "religious-jewish",
"fields": [
"denomination",
"building",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"jewish",
"synagogue"
],
"tags": {
"amenity": "place_of_worship",
"religion": "jewish"
}
}
data/presets/presets/amenity/place_of_worship/muslim.json
+13 -15
View File
@@ -1,23 +1,21 @@
{
"name": "mosque",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"muslim",
"mosque"
],
"tags": {
"amenity": "place_of_worship",
"religion": "muslim"
}
},
"icon": "religious-muslim",
"fields": [
"denomination",
"building",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"muslim",
"mosque"
],
"tags": {
"amenity": "place_of_worship",
"religion": "muslim"
}
}
data/presets/presets/amenity/police.json
+38 -40
View File
@@ -1,48 +1,46 @@
{
"name": "police",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"badge",
"bear",
"blue",
"bluecoat",
"bobby",
"boy scout",
"bull",
"constable",
"constabulary",
"cop",
"copper",
"corps",
"county mounty",
"detective",
"fed",
"flatfoot",
"force",
"fuzz",
"gendarme",
"gumshoe",
"heat",
"law",
"law enforcement",
"man",
"narc",
"officers",
"patrolman",
"police"
],
"tags": {
"amenity": "police"
}
},
"icon": "police",
"fields": [
"operator",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"badge",
"bear",
"blue",
"bluecoat",
"bobby",
"boy scout",
"bull",
"constable",
"constabulary",
"cop",
"copper",
"corps",
"county mounty",
"detective",
"fed",
"flatfoot",
"force",
"fuzz",
"gendarme",
"gumshoe",
"heat",
"law",
"law enforcement",
"man",
"narc",
"officers",
"patrolman",
"police"
],
"tags": {
"amenity": "police"
}
}
data/presets/presets/amenity/post_box.json
+14 -16
View File
@@ -1,24 +1,22 @@
{
"name": "post box",
"match": {
"geometry": [
"point"
],
"tags": {
"amenity": "post_box"
},
"terms": [
"letter drop",
"letterbox",
"mail drop",
"mailbox",
"pillar box",
"postbox"
]
},
"icon": "post",
"fields": [
"operator",
"collection_times"
],
"geometry": [
"point"
],
"tags": {
"amenity": "post_box"
},
"terms": [
"letter drop",
"letterbox",
"mail drop",
"mailbox",
"pillar box",
"postbox"
]
}
data/presets/presets/amenity/pub.json
+9 -11
View File
@@ -1,18 +1,16 @@
{
"name": "pub",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "pub"
},
"terms": []
},
"icon": "beer",
"fields": [
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "pub"
},
"terms": []
}
data/presets/presets/amenity/restaurant.json
+41 -43
View File
@@ -1,51 +1,49 @@
{
"name": "restaurant",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"bar",
"cafeteria",
"café",
"canteen",
"chophouse",
"coffee shop",
"diner",
"dining room",
"dive*",
"doughtnut shop",
"drive-in",
"eatery",
"eating house",
"eating place",
"fast-food place",
"greasy spoon",
"grill",
"hamburger stand",
"hashery",
"hideaway",
"hotdog stand",
"inn",
"joint*",
"luncheonette",
"lunchroom",
"night club",
"outlet*",
"pizzeria",
"saloon",
"soda fountain",
"watering hole"
],
"tags": {
"amenity": "restaurant"
}
},
"icon": "restaurant",
"fields": [
"cuisine",
"building_area",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"bar",
"cafeteria",
"café",
"canteen",
"chophouse",
"coffee shop",
"diner",
"dining room",
"dive*",
"doughtnut shop",
"drive-in",
"eatery",
"eating house",
"eating place",
"fast-food place",
"greasy spoon",
"grill",
"hamburger stand",
"hashery",
"hideaway",
"hotdog stand",
"inn",
"joint*",
"luncheonette",
"lunchroom",
"night club",
"outlet*",
"pizzeria",
"saloon",
"soda fountain",
"watering hole"
],
"tags": {
"amenity": "restaurant"
}
}
data/presets/presets/amenity/school.json
+26 -28
View File
@@ -1,36 +1,34 @@
{
"name": "school",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"academy",
"alma mater",
"blackboard",
"college",
"department",
"discipline",
"establishment",
"faculty",
"hall",
"halls of ivy",
"institute",
"institution",
"jail*",
"schoolhouse",
"seminary",
"university"
],
"tags": {
"amenity": "school"
}
},
"icon": "school",
"fields": [
"operator",
"building",
"address"
]
],
"geometry": [
"point",
"area"
],
"terms": [
"academy",
"alma mater",
"blackboard",
"college",
"department",
"discipline",
"establishment",
"faculty",
"hall",
"halls of ivy",
"institute",
"institution",
"jail*",
"schoolhouse",
"seminary",
"university"
],
"tags": {
"amenity": "school"
}
}
data/presets/presets/amenity/toilets.json
+9 -12
View File
@@ -1,18 +1,15 @@
{
"name": "toilets",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
],
"tags": {
"amenity": "toilets"
}
},
"fields": [
"operator",
"building"
]
],
"geometry": [
"point",
"area"
],
"terms": [],
"tags": {
"amenity": "toilets"
}
}
data/presets/presets/amenity/townhall.json
+15 -17
View File
@@ -1,24 +1,22 @@
{
"name": "town hall",
"match": {
"geometry": [
"point",
"areea"
],
"terms": [
"village hall",
"city government",
"courthouse",
"municipal building",
"municipal center"
],
"tags": {
"amenity": "townhall"
}
},
"icon": "town-hall",
"fields": [
"building_area",
"address"
]
],
"geometry": [
"point",
"areea"
],
"terms": [
"village hall",
"city government",
"courthouse",
"municipal building",
"municipal center"
],
"tags": {
"amenity": "townhall"
}
}
data/presets/presets/amenity/university.json
+9 -11
View File
@@ -1,18 +1,16 @@
{
"name": "university",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "university"
},
"terms": []
},
"icon": "college",
"fields": [
"operator",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"amenity": "university"
},
"terms": []
}
data/presets/presets/building.json
+9 -11
View File
@@ -1,14 +1,5 @@
{
"name": "building",
"match": {
"geometry": [
"area"
],
"tags": {
"building": "*"
},
"terms": []
},
"icon": "warehouse",
"fields": [
"building_yes",
@@ -21,5 +12,12 @@
"wikipedia",
"elevation",
"source"
]
}
],
"geometry": [
"area"
],
"tags": {
"building": "*"
},
"terms": []
}
data/presets/presets/highway.json
+11 -13
View File
@@ -1,17 +1,15 @@
{
"name": "highway",
"match": {
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"highway": "*"
}
},
"fields": [
"highway"
]
}
],
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"highway": "*"
}
}
data/presets/presets/highway/bus_stop.json
+8 -10
View File
@@ -1,17 +1,15 @@
{
"name": "bus stop",
"match": {
"geometry": [
"point"
],
"tags": {
"highway": "bus_stop"
},
"terms": []
},
"icon": "bus",
"fields": [
"operator",
"shelter"
]
],
"geometry": [
"point"
],
"tags": {
"highway": "bus_stop"
},
"terms": []
}
data/presets/presets/highway/crossing.json
+10 -12
View File
@@ -1,18 +1,16 @@
{
"name": "crossing",
"match": {
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing"
},
"terms": [
"crosswalk",
"zebra crossing"
]
},
"fields": [
"crossing"
],
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing"
},
"terms": [
"crosswalk",
"zebra crossing"
]
}
data/presets/presets/highway/cycleway.json
+9 -11
View File
@@ -1,19 +1,17 @@
{
"name": "cycle path",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "cycleway"
},
"terms": []
},
"icon": "highway-cycleway",
"fields": [
"oneway",
"roadtype",
"access",
"surface"
]
}
],
"geometry": [
"line"
],
"tags": {
"highway": "cycleway"
},
"terms": []
}
data/presets/presets/highway/footway.json
+33 -35
View File
@@ -1,42 +1,40 @@
{
"name": "foot path",
"match": {
"geometry": [
"line"
],
"terms": [
"beaten path",
"boulevard",
"clearing",
"course",
"cut*",
"drag*",
"footpath",
"highway",
"lane",
"line",
"orbit",
"passage",
"pathway",
"rail",
"rails",
"road",
"roadway",
"route",
"street",
"thoroughfare",
"trackway",
"trail",
"trajectory",
"walk"
],
"tags": {
"highway": "footway"
}
},
"icon": "highway-footway",
"fields": [
"access",
"surface"
]
],
"geometry": [
"line"
],
"terms": [
"beaten path",
"boulevard",
"clearing",
"course",
"cut*",
"drag*",
"footpath",
"highway",
"lane",
"line",
"orbit",
"passage",
"pathway",
"rail",
"rails",
"road",
"roadway",
"route",
"street",
"thoroughfare",
"trackway",
"trail",
"trajectory",
"walk"
],
"tags": {
"highway": "footway"
}
}
data/presets/presets/highway/motorway.json
+9 -11
View File
@@ -1,14 +1,5 @@
{
"name": "motorway",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "motorway"
},
"terms": []
},
"icon": "highway-motorway",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
}
],
"geometry": [
"line"
],
"tags": {
"highway": "motorway"
},
"terms": []
}
data/presets/presets/highway/path.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "path",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "path"
},
"terms": []
},
"icon": "highway-footway",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "path"
},
"terms": []
}
data/presets/presets/highway/primary.json
+9 -11
View File
@@ -1,14 +1,5 @@
{
"name": "primary road",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "primary"
},
"terms": []
},
"icon": "highway-primary",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
}
],
"geometry": [
"line"
],
"tags": {
"highway": "primary"
},
"terms": []
}
data/presets/presets/highway/residential.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "residential road",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "residential"
},
"terms": []
},
"icon": "highway-residential",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "residential"
},
"terms": []
}
data/presets/presets/highway/secondary.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "secondary road",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "secondary"
},
"terms": []
},
"icon": "highway-secondary",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "secondary"
},
"terms": []
}
data/presets/presets/highway/service.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "service road",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "service"
},
"terms": []
},
"icon": "highway-service",
"fields": [
"service",
@@ -17,5 +8,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "service"
},
"terms": []
}
data/presets/presets/highway/steps.json
+10 -12
View File
@@ -1,19 +1,17 @@
{
"name": "steps",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "steps"
},
"terms": [
"stairs",
"staircase"
]
},
"fields": [
"access",
"surface"
],
"geometry": [
"line"
],
"tags": {
"highway": "steps"
},
"terms": [
"stairs",
"staircase"
]
}
data/presets/presets/highway/tertiary.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "tertiary road",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "tertiary"
},
"terms": []
},
"icon": "highway-tertiary",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "tertiary"
},
"terms": []
}
data/presets/presets/highway/track.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "track",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "track"
},
"terms": []
},
"icon": "highway-track",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "track"
},
"terms": []
}
data/presets/presets/highway/trunk.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "trunk highway",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "trunk"
},
"terms": []
},
"icon": "highway-trunk",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "trunk"
},
"terms": []
}
data/presets/presets/highway/turning_circle.json
+7 -9
View File
@@ -1,13 +1,11 @@
{
"name": "turning circle",
"match": {
"geometry": [
"vertex"
],
"tags": {
"highway": "turning_circle"
},
"terms": []
"icon": "circle",
"geometry": [
"vertex"
],
"tags": {
"highway": "turning_circle"
},
"icon": "circle"
"terms": []
}
data/presets/presets/highway/unclassified.json
+8 -10
View File
@@ -1,14 +1,5 @@
{
"name": "unclassified",
"match": {
"geometry": [
"line"
],
"tags": {
"highway": "unclassified"
},
"terms": []
},
"icon": "highway",
"fields": [
"oneway",
@@ -16,5 +7,12 @@
"access",
"maxspeed",
"surface"
]
],
"geometry": [
"line"
],
"tags": {
"highway": "unclassified"
},
"terms": []
}
data/presets/presets/historic.json
+8 -10
View File
@@ -1,15 +1,13 @@
{
"name": "historic",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"historic": "*"
}
},
"fields": [
"historic"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"historic": "*"
}
}
data/presets/presets/historic/monument.json
+8 -10
View File
@@ -1,13 +1,11 @@
{
"name": "monument",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"historic": "monument"
}
},
"icon": "monument"
"icon": "monument",
"geometry": [
"point",
"area"
],
"tags": {
"historic": "monument"
}
}
data/presets/presets/landuse.json
+9 -11
View File
@@ -1,15 +1,13 @@
{
"name": "landuse",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "*"
}
},
"fields": [
"landuse"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "*"
}
}
data/presets/presets/landuse/allotments.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "allotments",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "allotments"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "allotments"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/cemetery.json
+8 -13
View File
@@ -1,17 +1,12 @@
{
"name": "cemetery",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "cemetery"
},
"terms": [
]
},
"fields": [
"icon": "cemetery",
"geometry": [
"point",
"area"
],
"icon": "cemetery"
"tags": {
"landuse": "cemetery"
},
"terms": []
}
data/presets/presets/landuse/commercial.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "commercial",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "commercial"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "commercial"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/construction.json
+9 -12
View File
@@ -1,18 +1,15 @@
{
"name": "construction",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "construction"
},
"terms": [
]
},
"fields": [
"construction",
"operator"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "construction"
},
"terms": []
}
data/presets/presets/landuse/farm.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "farm",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farm"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farm"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/farmyard.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "farmyard",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farmyard"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farmyard"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/forest.json
+9 -11
View File
@@ -1,17 +1,15 @@
{
"name": "forest",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "forest"
},
"terms": []
},
"fields": [
"wood"
],
"icon": "park2"
"icon": "park2",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "forest"
},
"terms": []
}
data/presets/presets/landuse/grass.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "grass",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "grass"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "grass"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/industrial.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "industrial",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "industrial"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "industrial"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/meadow.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "meadow",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "meadow"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "meadow"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/orchard.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "orchard",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "orchard"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "orchard"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/quarry.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "quarry",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "quarry"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "quarry"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/residential.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "residential",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "residential"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "residential"
},
"fields": [
]
"terms": []
}
data/presets/presets/landuse/vineyard.json
+7 -12
View File
@@ -1,16 +1,11 @@
{
"name": "vineyard",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "vineyard"
},
"terms": [
]
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "vineyard"
},
"fields": [
]
"terms": []
}
data/presets/presets/leisure.json
+9 -11
View File
@@ -1,15 +1,13 @@
{
"name": "leisure",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "*"
}
},
"fields": [
"leisure"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "*"
}
}
data/presets/presets/leisure/golf_course.json
+9 -11
View File
@@ -1,18 +1,16 @@
{
"name": "golf course",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "golf_course"
},
"terms": []
},
"icon": "golf",
"fields": [
"operator",
"address"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "golf_course"
},
"terms": []
}
data/presets/presets/leisure/park.json
+30 -32
View File
@@ -1,35 +1,33 @@
{
"name": "park",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
"esplanade",
"estate",
"forest",
"garden",
"grass",
"green",
"grounds",
"lawn",
"lot",
"meadow",
"parkland",
"place",
"playground",
"plaza",
"pleasure garden",
"recreation area",
"square",
"tract",
"village green",
"woodland"
],
"tags": {
"leisure": "park"
}
},
"icon": "park"
"icon": "park",
"geometry": [
"point",
"area"
],
"terms": [
"esplanade",
"estate",
"forest",
"garden",
"grass",
"green",
"grounds",
"lawn",
"lot",
"meadow",
"parkland",
"place",
"playground",
"plaza",
"pleasure garden",
"recreation area",
"square",
"tract",
"village green",
"woodland"
],
"tags": {
"leisure": "park"
}
}
data/presets/presets/leisure/pitch.json
+10 -12
View File
@@ -1,18 +1,16 @@
{
"name": "sport pitch",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch"
},
"terms": []
},
"icon": "pitch",
"fields": [
"sport",
"surface"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch"
},
"terms": []
}
data/presets/presets/leisure/pitch/baseball.json
+10 -12
View File
@@ -1,15 +1,13 @@
{
"name": "baseball diamond",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "baseball"
},
"terms": []
"icon": "baseball",
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "baseball"
},
"icon": "baseball"
}
"terms": []
}
data/presets/presets/leisure/pitch/basketball.json
+11 -13
View File
@@ -1,18 +1,16 @@
{
"name": "basketball court",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "basketball"
},
"terms": []
},
"icon": "basketball",
"fields": [
"surface"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "basketball"
},
"terms": []
}
data/presets/presets/leisure/pitch/soccer.json
+11 -13
View File
@@ -1,18 +1,16 @@
{
"name": "soccer field",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "soccer"
},
"terms": []
},
"icon": "soccer",
"fields": [
"surface"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "soccer"
},
"terms": []
}
data/presets/presets/leisure/pitch/tennis.json
+10 -12
View File
@@ -1,18 +1,16 @@
{
"name": "tennis court",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "tennis"
},
"terms": []
},
"icon": "tennis",
"fields": [
"surface"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "pitch",
"sport": "tennis"
},
"terms": []
}
data/presets/presets/leisure/playground.json
+7 -9
View File
@@ -1,12 +1,10 @@
{
"name": "playground",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "playground"
}
"geometry": [
"point",
"area"
],
"tags": {
"leisure": "playground"
}
}
}
data/presets/presets/man_made.json
+10 -12
View File
@@ -1,17 +1,15 @@
{
"name": "man made",
"match": {
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"man_made": "*"
}
},
"fields": [
"man_made"
]
],
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"man_made": "*"
}
}
data/presets/presets/man_made/lighthouse.json
+6 -8
View File
@@ -1,12 +1,10 @@
{
"name": "lighthouse",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"man_made": "lighthouse"
}
"geometry": [
"point",
"area"
],
"tags": {
"man_made": "lighthouse"
}
}
data/presets/presets/man_made/pier.json
+6 -8
View File
@@ -1,12 +1,10 @@
{
"name": "pier",
"match": {
"geometry": [
"line",
"area"
],
"tags": {
"man_made": "pier"
}
"geometry": [
"line",
"area"
],
"tags": {
"man_made": "pier"
}
}
data/presets/presets/natural.json
+9 -11
View File
@@ -1,15 +1,13 @@
{
"name": "natural",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"natural": "*"
}
},
"fields": [
"natural"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"natural": "*"
}
}
data/presets/presets/natural/bay.json
+7 -10
View File
@@ -1,14 +1,11 @@
{
"name": "bay",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
],
"tags": {
"natural": "bay"
}
"geometry": [
"point",
"area"
],
"terms": [],
"tags": {
"natural": "bay"
}
}
data/presets/presets/natural/beach.json
+9 -12
View File
@@ -1,17 +1,14 @@
{
"name": "beach",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
],
"tags": {
"natural": "beach"
}
},
"fields": [
"surface"
]
],
"geometry": [
"point",
"area"
],
"terms": [],
"tags": {
"natural": "beach"
}
}
data/presets/presets/natural/cliff.json
+9 -12
View File
@@ -1,16 +1,13 @@
{
"name": "cliff",
"match": {
"geometry": [
"point",
"vertex",
"line",
"area"
],
"terms": [
],
"tags": {
"natural": "cliff"
}
"geometry": [
"point",
"vertex",
"line",
"area"
],
"terms": [],
"tags": {
"natural": "cliff"
}
}
data/presets/presets/natural/coastline.json
+8 -10
View File
@@ -1,14 +1,12 @@
{
"name": "coastline",
"match": {
"geometry": [
"line"
],
"terms": [
"shore"
],
"tags": {
"natural": "coastline"
}
"geometry": [
"line"
],
"terms": [
"shore"
],
"tags": {
"natural": "coastline"
}
}
data/presets/presets/natural/glacier.json
+6 -9
View File
@@ -1,13 +1,10 @@
{
"name": "glacier",
"match": {
"geometry": [
"area"
],
"terms": [
],
"tags": {
"natural": "glacier"
}
"geometry": [
"area"
],
"terms": [],
"tags": {
"natural": "glacier"
}
}
data/presets/presets/natural/grassland.json
+7 -10
View File
@@ -1,14 +1,11 @@
{
"name": "grassland",
"match": {
"geometry": [
"point",
"area"
],
"terms": [
],
"tags": {
"natural": "grassland"
}
"geometry": [
"point",
"area"
],
"terms": [],
"tags": {
"natural": "grassland"
}
}
data/presets/presets/natural/heath.json
+6 -9
View File
@@ -1,13 +1,10 @@
{
"name": "heath",
"match": {
"geometry": [
"area"
],
"terms": [
],
"tags": {
"natural": "heath"
}
"geometry": [
"area"
],
"terms": [],
"tags": {
"natural": "heath"
}
}
data/presets/presets/natural/peak.json
+22 -24
View File
@@ -1,31 +1,29 @@
{
"name": "peak",
"match": {
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "peak"
},
"terms": [
"acme",
"aiguille",
"alp",
"climax",
"crest",
"crown",
"hill",
"mount",
"mountain",
"pinnacle",
"summit",
"tip",
"top"
]
},
"icon": "triangle",
"fields": [
"elevation"
],
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "peak"
},
"terms": [
"acme",
"aiguille",
"alp",
"climax",
"crest",
"crown",
"hill",
"mount",
"mountain",
"pinnacle",
"summit",
"tip",
"top"
]
}
data/presets/presets/natural/scrub.json
+7 -9
View File
@@ -1,12 +1,10 @@
{
"name": "scrub",
"match": {
"geometry": [
"area"
],
"tags": {
"natural": "scrub"
},
"terms": []
}
"geometry": [
"area"
],
"tags": {
"natural": "scrub"
},
"terms": []
}
data/presets/presets/natural/spring.json
+7 -10
View File
@@ -1,14 +1,11 @@
{
"name": "spring",
"match": {
"geometry": [
"point",
"vertex"
],
"terms": [
],
"tags": {
"natural": "spring"
}
"geometry": [
"point",
"vertex"
],
"terms": [],
"tags": {
"natural": "spring"
}
}
data/presets/presets/natural/tree.json
+9 -12
View File
@@ -1,18 +1,15 @@
{
"name": "tree",
"match": {
"geometry": [
"point",
"vertex"
],
"terms": [
],
"tags": {
"natural": "tree"
}
},
"fields": [
"denotation"
],
"icon": "park"
"icon": "park",
"geometry": [
"point",
"vertex"
],
"terms": [],
"tags": {
"natural": "tree"
}
}
data/presets/presets/natural/water.json
+8 -10
View File
@@ -1,15 +1,13 @@
{
"name": "water",
"match": {
"geometry": [
"area"
],
"tags": {
"natural": "water"
},
"terms": []
},
"fields": [
"water"
]
],
"geometry": [
"area"
],
"tags": {
"natural": "water"
},
"terms": []
}
data/presets/presets/natural/water/lake.json
+12 -14
View File
@@ -1,17 +1,15 @@
{
"name": "lake",
"match": {
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "lake"
},
"terms": [
"lakelet",
"loch",
"mere"
]
}
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "lake"
},
"terms": [
"lakelet",
"loch",
"mere"
]
}
data/presets/presets/natural/water/pond.json
+14 -16
View File
@@ -1,19 +1,17 @@
{
"name": "pond",
"match": {
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "pond"
},
"terms": [
"lakelet",
"millpond",
"tarn",
"pool",
"mere"
]
}
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "pond"
},
"terms": [
"lakelet",
"millpond",
"tarn",
"pool",
"mere"
]
}
data/presets/presets/natural/water/reservoir.json
+8 -11
View File
@@ -1,14 +1,11 @@
{
"name": "reservoir",
"match": {
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "reservoir"
},
"terms": [
]
}
"geometry": [
"area"
],
"tags": {
"natural": "water",
"water": "reservoir"
},
"terms": []
}
data/presets/presets/natural/wetland.json
+9 -11
View File
@@ -1,16 +1,14 @@
{
"name": "wetland",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"natural": "wetland"
},
"terms": []
},
"fields": [
"wetland"
]
],
"geometry": [
"point",
"area"
],
"tags": {
"natural": "wetland"
},
"terms": []
}
data/presets/presets/natural/wood.json
+9 -11
View File
@@ -1,17 +1,15 @@
{
"name": "wood",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"natural": "wood"
},
"terms": []
},
"fields": [
"wood"
],
"icon": "park2"
"icon": "park2",
"geometry": [
"point",
"area"
],
"tags": {
"natural": "wood"
},
"terms": []
}
data/presets/presets/office.json
+10 -12
View File
@@ -1,19 +1,17 @@
{
"name": "office",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"office": "*"
},
"terms": []
},
"icon": "commercial",
"fields": [
"office",
"address",
"opening_hours"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"office": "*"
},
"terms": []
}
data/presets/presets/place.json
+9 -11
View File
@@ -1,15 +1,13 @@
{
"name": "place",
"match": {
"geometry": [
"point",
"area"
],
"tags": {
"place": "*"
}
},
"fields": [
"place"
]
}
],
"geometry": [
"point",
"area"
],
"tags": {
"place": "*"
}
}

Some files were not shown because too many files have changed in this diff Show More