Remove leading underscores from preset id parts

Introduced with 0d2f78c, but I don't want to break existing translations
This commit is contained in:
Bryan Housel
2016-08-03 14:47:26 -04:00
parent f7530a0425
commit 24af9e6404
5 changed files with 625 additions and 621 deletions
+6 -2
View File
@@ -62,7 +62,7 @@ function generateFields() {
var fields = {};
glob.sync(__dirname + '/data/presets/fields/**/*.json').forEach(function(file) {
var field = read(file),
id = file.match(/presets\/fields\/([^.]*)\.json/)[1];
id = stripLeadingUnderscores(file.match(/presets\/fields\/([^.]*)\.json/)[1]);
validate(file, field, fieldSchema);
@@ -134,12 +134,16 @@ function suggestionsToPresets(presets) {
return presets;
}
function stripLeadingUnderscores(str) {
return str.split('/').map(function(s) {return s.replace(/^_/,''); }).join('/');
}
function generatePresets() {
var presets = {};
glob.sync(__dirname + '/data/presets/presets/**/*.json').forEach(function(file) {
var preset = read(file),
id = file.match(/presets\/presets\/([^.]*)\.json/)[1];
id = stripLeadingUnderscores(file.match(/presets\/presets\/([^.]*)\.json/)[1]);
validate(file, preset, presetSchema);
+24 -24
View File
@@ -2137,30 +2137,6 @@ en:
# embankment=yes
name: Embankment
terms: '<translate with synonyms or related terms for ''Embankment'', separated by commas>'
emergency/_designated:
# emergency=designated
name: Emergency Access Designated
terms: '<translate with synonyms or related terms for ''Emergency Access Designated'', separated by commas>'
emergency/_destination:
# emergency=destination
name: Emergency Access Destination
terms: '<translate with synonyms or related terms for ''Emergency Access Destination'', separated by commas>'
emergency/_no:
# emergency=no
name: Emergency Access No
terms: '<translate with synonyms or related terms for ''Emergency Access No'', separated by commas>'
emergency/_official:
# emergency=official
name: Emergency Access Official
terms: '<translate with synonyms or related terms for ''Emergency Access Official'', separated by commas>'
emergency/_private:
# emergency=private
name: Emergency Access Private
terms: '<translate with synonyms or related terms for ''Emergency Access Private'', separated by commas>'
emergency/_yes:
# emergency=yes
name: Emergency Access Yes
terms: '<translate with synonyms or related terms for ''Emergency Access Yes'', separated by commas>'
emergency/ambulance_station:
# emergency=ambulance_station
name: Ambulance Station
@@ -2171,14 +2147,38 @@ en:
name: Defibrillator
# 'terms: AED'
terms: '<translate with synonyms or related terms for ''Defibrillator'', separated by commas>'
emergency/designated:
# emergency=designated
name: Emergency Access Designated
terms: '<translate with synonyms or related terms for ''Emergency Access Designated'', separated by commas>'
emergency/destination:
# emergency=destination
name: Emergency Access Destination
terms: '<translate with synonyms or related terms for ''Emergency Access Destination'', separated by commas>'
emergency/fire_hydrant:
# emergency=fire_hydrant
name: Fire Hydrant
terms: '<translate with synonyms or related terms for ''Fire Hydrant'', separated by commas>'
emergency/no:
# emergency=no
name: Emergency Access No
terms: '<translate with synonyms or related terms for ''Emergency Access No'', separated by commas>'
emergency/official:
# emergency=official
name: Emergency Access Official
terms: '<translate with synonyms or related terms for ''Emergency Access Official'', separated by commas>'
emergency/phone:
# emergency=phone
name: Emergency Phone
terms: '<translate with synonyms or related terms for ''Emergency Phone'', separated by commas>'
emergency/private:
# emergency=private
name: Emergency Access Private
terms: '<translate with synonyms or related terms for ''Emergency Access Private'', separated by commas>'
emergency/yes:
# emergency=yes
name: Emergency Access Yes
terms: '<translate with synonyms or related terms for ''Emergency Access Yes'', separated by commas>'
entrance:
# entrance=*
name: Entrance/Exit
+398 -398
View File
File diff suppressed because it is too large Load Diff
+91 -91
View File
@@ -13,10 +13,35 @@
},
"tags": [
{
"key": "addr:housenumber"
"key": "aerialway"
},
{
"key": "aerialway"
"key": "aeroway"
},
{
"key": "amenity"
},
{
"key": "highway"
},
{
"key": "place"
},
{
"key": "power"
},
{
"key": "railway"
},
{
"key": "junction",
"value": "roundabout"
},
{
"key": "waterway"
},
{
"key": "addr:housenumber"
},
{
"key": "aerialway",
@@ -54,9 +79,6 @@
"key": "aerialway",
"value": "t-bar"
},
{
"key": "aeroway"
},
{
"key": "aeroway",
"value": "aerodrome"
@@ -90,7 +112,12 @@
"value": "terminal"
},
{
"key": "amenity"
"key": "amenity",
"value": "register_office"
},
{
"key": "amenity",
"value": "swimming_pool"
},
{
"key": "amenity",
@@ -352,10 +379,6 @@
"key": "amenity",
"value": "recycling"
},
{
"key": "amenity",
"value": "register_office"
},
{
"key": "amenity",
"value": "restaurant"
@@ -392,10 +415,6 @@
"key": "amenity",
"value": "studio"
},
{
"key": "amenity",
"value": "swimming_pool"
},
{
"key": "amenity",
"value": "taxi"
@@ -486,6 +505,10 @@
{
"key": "barrier"
},
{
"key": "barrier",
"value": "entrance"
},
{
"key": "barrier",
"value": "block"
@@ -510,10 +533,6 @@
"key": "barrier",
"value": "ditch"
},
{
"key": "barrier",
"value": "entrance"
},
{
"key": "barrier",
"value": "fence"
@@ -557,6 +576,18 @@
{
"key": "building"
},
{
"key": "building",
"value": "bunker"
},
{
"key": "building",
"value": "entrance"
},
{
"key": "building",
"value": "train_station"
},
{
"key": "building",
"value": "apartments"
@@ -565,10 +596,6 @@
"key": "building",
"value": "barn"
},
{
"key": "building",
"value": "bunker"
},
{
"key": "building",
"value": "cabin"
@@ -605,10 +632,6 @@
"key": "building",
"value": "dormitory"
},
{
"key": "building",
"value": "entrance"
},
{
"key": "building",
"value": "garage"
@@ -685,10 +708,6 @@
"key": "building",
"value": "terrace"
},
{
"key": "building",
"value": "train_station"
},
{
"key": "building",
"value": "university"
@@ -700,6 +719,22 @@
{
"key": "craft"
},
{
"key": "craft",
"value": "jeweler"
},
{
"key": "craft",
"value": "locksmith"
},
{
"key": "craft",
"value": "optician"
},
{
"key": "craft",
"value": "tailor"
},
{
"key": "craft",
"value": "basket_maker"
@@ -772,26 +807,14 @@
"key": "craft",
"value": "insulation"
},
{
"key": "craft",
"value": "jeweler"
},
{
"key": "craft",
"value": "key_cutter"
},
{
"key": "craft",
"value": "locksmith"
},
{
"key": "craft",
"value": "metal_construction"
},
{
"key": "craft",
"value": "optician"
},
{
"key": "craft",
"value": "painter"
@@ -856,10 +879,6 @@
"key": "craft",
"value": "sweep"
},
{
"key": "craft",
"value": "tailor"
},
{
"key": "craft",
"value": "tiler"
@@ -983,9 +1002,6 @@
"key": "healthcare",
"value": "blood_donation"
},
{
"key": "highway"
},
{
"key": "highway",
"value": "bridleway"
@@ -1192,6 +1208,10 @@
{
"key": "landuse"
},
{
"key": "landuse",
"value": "farm"
},
{
"key": "landuse",
"value": "allotments"
@@ -1216,10 +1236,6 @@
"key": "landuse",
"value": "construction"
},
{
"key": "landuse",
"value": "farm"
},
{
"key": "landuse",
"value": "farmland"
@@ -1418,6 +1434,10 @@
{
"key": "man_made"
},
{
"key": "man_made",
"value": "embankment"
},
{
"key": "man_made",
"value": "adit"
@@ -1438,10 +1458,6 @@
"key": "man_made",
"value": "cutline"
},
{
"key": "man_made",
"value": "embankment"
},
{
"key": "man_made",
"value": "flagpole"
@@ -1652,6 +1668,10 @@
{
"key": "office"
},
{
"key": "office",
"value": "travel_agent"
},
{
"key": "office",
"value": "accountant"
@@ -1732,16 +1752,9 @@
"key": "office",
"value": "therapist"
},
{
"key": "office",
"value": "travel_agent"
},
{
"key": "piste:type"
},
{
"key": "place"
},
{
"key": "place",
"value": "city"
@@ -1783,7 +1796,8 @@
"value": "village"
},
{
"key": "power"
"key": "power",
"value": "sub_station"
},
{
"key": "power",
@@ -1801,10 +1815,6 @@
"key": "power",
"value": "pole"
},
{
"key": "power",
"value": "sub_station"
},
{
"key": "power",
"value": "substation"
@@ -1825,9 +1835,6 @@
"key": "public_transport",
"value": "stop_position"
},
{
"key": "railway"
},
{
"key": "railway",
"value": "abandoned"
@@ -1880,10 +1887,6 @@
"key": "railway",
"value": "tram"
},
{
"key": "junction",
"value": "roundabout"
},
{
"key": "route",
"value": "ferry"
@@ -1891,6 +1894,14 @@
{
"key": "shop"
},
{
"key": "shop",
"value": "fishmonger"
},
{
"key": "shop",
"value": "vacant"
},
{
"key": "shop",
"value": "alcohol"
@@ -2067,10 +2078,6 @@
"key": "shop",
"value": "fashion"
},
{
"key": "shop",
"value": "fishmonger"
},
{
"key": "shop",
"value": "florist"
@@ -2303,10 +2310,6 @@
"key": "shop",
"value": "tyres"
},
{
"key": "shop",
"value": "vacant"
},
{
"key": "shop",
"value": "vacuum_cleaner"
@@ -2426,6 +2429,10 @@
"key": "traffic_calming",
"value": "table"
},
{
"key": "type",
"value": "multipolygon"
},
{
"key": "type",
"value": "boundary"
@@ -2434,10 +2441,6 @@
"key": "boundary",
"value": "administrative"
},
{
"key": "type",
"value": "multipolygon"
},
{
"key": "type",
"value": "restriction"
@@ -2530,9 +2533,6 @@
"key": "type",
"value": "site"
},
{
"key": "waterway"
},
{
"key": "waterway",
"value": "boatyard"
+106 -106
View File
@@ -1591,14 +1591,46 @@
}
},
"presets": {
"address": {
"name": "Address",
"terms": ""
},
"aerialway": {
"name": "Aerialway",
"terms": "ski lift,funifor,funitel"
},
"aeroway": {
"name": "Aeroway",
"terms": ""
},
"amenity": {
"name": "Amenity",
"terms": ""
},
"highway": {
"name": "Highway",
"terms": ""
},
"place": {
"name": "Place",
"terms": ""
},
"power": {
"name": "Power",
"terms": ""
},
"railway": {
"name": "Railway",
"terms": ""
},
"roundabout": {
"name": "Roundabout",
"terms": ""
},
"waterway": {
"name": "Waterway",
"terms": ""
},
"address": {
"name": "Address",
"terms": ""
},
"aerialway/cable_car": {
"name": "Cable Car",
"terms": "tramway,ropeway"
@@ -1635,10 +1667,6 @@
"name": "T-bar Lift",
"terms": ""
},
"aeroway": {
"name": "Aeroway",
"terms": ""
},
"aeroway/aerodrome": {
"name": "Airport",
"terms": "airplane,airport,aerodrome"
@@ -1671,8 +1699,12 @@
"name": "Airport terminal",
"terms": "airport,aerodrome"
},
"amenity": {
"name": "Amenity",
"amenity/register_office": {
"name": "Register Office",
"terms": ""
},
"amenity/swimming_pool": {
"name": "Swimming Pool",
"terms": ""
},
"amenity/arts_centre": {
@@ -1935,10 +1967,6 @@
"name": "Recycling",
"terms": "can,bottle,garbage,scrap,trash"
},
"amenity/register_office": {
"name": "Register Office",
"terms": ""
},
"amenity/restaurant": {
"name": "Restaurant",
"terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
@@ -1975,10 +2003,6 @@
"name": "Studio",
"terms": "recording,radio,television"
},
"amenity/swimming_pool": {
"name": "Swimming Pool",
"terms": ""
},
"amenity/taxi": {
"name": "Taxi Stand",
"terms": "cab"
@@ -2071,6 +2095,10 @@
"name": "Barrier",
"terms": ""
},
"barrier/entrance": {
"name": "Entrance",
"terms": ""
},
"barrier/block": {
"name": "Block",
"terms": ""
@@ -2095,10 +2123,6 @@
"name": "Trench",
"terms": ""
},
"barrier/entrance": {
"name": "Entrance",
"terms": ""
},
"barrier/fence": {
"name": "Fence",
"terms": ""
@@ -2143,6 +2167,18 @@
"name": "Building",
"terms": ""
},
"building/bunker": {
"name": "Bunker",
"terms": ""
},
"building/entrance": {
"name": "Entrance/Exit",
"terms": ""
},
"building/train_station": {
"name": "Train Station",
"terms": ""
},
"building/apartments": {
"name": "Apartments",
"terms": ""
@@ -2151,10 +2187,6 @@
"name": "Barn",
"terms": ""
},
"building/bunker": {
"name": "Bunker",
"terms": ""
},
"building/cabin": {
"name": "Cabin",
"terms": ""
@@ -2191,10 +2223,6 @@
"name": "Dormitory",
"terms": ""
},
"building/entrance": {
"name": "Entrance/Exit",
"terms": ""
},
"building/garage": {
"name": "Garage",
"terms": ""
@@ -2271,10 +2299,6 @@
"name": "Row Houses",
"terms": "home,terrace,brownstone,family,residence,dwelling"
},
"building/train_station": {
"name": "Train Station",
"terms": ""
},
"building/university": {
"name": "University Building",
"terms": "college"
@@ -2287,6 +2311,22 @@
"name": "Craft",
"terms": ""
},
"craft/jeweler": {
"name": "Jeweler",
"terms": ""
},
"craft/locksmith": {
"name": "Locksmith",
"terms": ""
},
"craft/optician": {
"name": "Optician",
"terms": ""
},
"craft/tailor": {
"name": "Tailor",
"terms": "clothes,suit"
},
"craft/basket_maker": {
"name": "Basket Maker",
"terms": ""
@@ -2359,26 +2399,14 @@
"name": "Insulator",
"terms": ""
},
"craft/jeweler": {
"name": "Jeweler",
"terms": ""
},
"craft/key_cutter": {
"name": "Key Cutter",
"terms": ""
},
"craft/locksmith": {
"name": "Locksmith",
"terms": ""
},
"craft/metal_construction": {
"name": "Metal Construction",
"terms": ""
},
"craft/optician": {
"name": "Optician",
"terms": ""
},
"craft/painter": {
"name": "Painter",
"terms": ""
@@ -2443,10 +2471,6 @@
"name": "Chimney Sweep",
"terms": ""
},
"craft/tailor": {
"name": "Tailor",
"terms": "clothes,suit"
},
"craft/tiler": {
"name": "Tiler",
"terms": ""
@@ -2475,27 +2499,27 @@
"name": "Embankment",
"terms": ""
},
"emergency/_designated": {
"emergency/designated": {
"name": "Emergency Access Designated",
"terms": ""
},
"emergency/_destination": {
"emergency/destination": {
"name": "Emergency Access Destination",
"terms": ""
},
"emergency/_no": {
"emergency/no": {
"name": "Emergency Access No",
"terms": ""
},
"emergency/_official": {
"emergency/official": {
"name": "Emergency Access Official",
"terms": ""
},
"emergency/_private": {
"emergency/private": {
"name": "Emergency Access Private",
"terms": ""
},
"emergency/_yes": {
"emergency/yes": {
"name": "Emergency Access Yes",
"terms": ""
},
@@ -2571,10 +2595,6 @@
"name": "Blood Donor Center",
"terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
},
"highway": {
"name": "Highway",
"terms": ""
},
"highway/bridleway": {
"name": "Bridle Path",
"terms": "bridleway,equestrian,horse"
@@ -2783,6 +2803,10 @@
"name": "Land Use",
"terms": ""
},
"landuse/farm": {
"name": "Farmland",
"terms": ""
},
"landuse/allotments": {
"name": "Community Garden",
"terms": "allotment,garden"
@@ -2807,10 +2831,6 @@
"name": "Construction",
"terms": ""
},
"landuse/farm": {
"name": "Farmland",
"terms": ""
},
"landuse/farmland": {
"name": "Farmland",
"terms": ""
@@ -3015,6 +3035,10 @@
"name": "Man Made",
"terms": ""
},
"man_made/embankment": {
"name": "Embankment",
"terms": ""
},
"man_made/adit": {
"name": "Adit",
"terms": "entrance,underground,mine,cave"
@@ -3035,10 +3059,6 @@
"name": "Cut line",
"terms": ""
},
"man_made/embankment": {
"name": "Embankment",
"terms": ""
},
"man_made/flagpole": {
"name": "Flagpole",
"terms": ""
@@ -3251,6 +3271,10 @@
"name": "Office",
"terms": ""
},
"office/travel_agent": {
"name": "Travel Agency",
"terms": ""
},
"office/accountant": {
"name": "Accountant",
"terms": ""
@@ -3331,18 +3355,10 @@
"name": "Therapist",
"terms": ""
},
"office/travel_agent": {
"name": "Travel Agency",
"terms": ""
},
"piste": {
"name": "Piste/Ski Trail",
"terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
},
"place": {
"name": "Place",
"terms": ""
},
"place/city": {
"name": "City",
"terms": ""
@@ -3387,8 +3403,8 @@
"name": "Point",
"terms": ""
},
"power": {
"name": "Power",
"power/sub_station": {
"name": "Substation",
"terms": ""
},
"power/generator": {
@@ -3407,10 +3423,6 @@
"name": "Power Pole",
"terms": ""
},
"power/sub_station": {
"name": "Substation",
"terms": ""
},
"power/substation": {
"name": "Substation",
"terms": ""
@@ -3431,10 +3443,6 @@
"name": "Stop Position",
"terms": ""
},
"railway": {
"name": "Railway",
"terms": ""
},
"railway/abandoned": {
"name": "Abandoned Railway",
"terms": ""
@@ -3491,10 +3499,6 @@
"name": "Relation",
"terms": ""
},
"roundabout": {
"name": "Roundabout",
"terms": ""
},
"route/ferry": {
"name": "Ferry Route",
"terms": ""
@@ -3503,6 +3507,14 @@
"name": "Shop",
"terms": ""
},
"shop/fishmonger": {
"name": "Fishmonger",
"terms": ""
},
"shop/vacant": {
"name": "Vacant Shop",
"terms": ""
},
"shop/alcohol": {
"name": "Liquor Store",
"terms": "alcohol,beer,booze,wine"
@@ -3679,10 +3691,6 @@
"name": "Fashion Store",
"terms": ""
},
"shop/fishmonger": {
"name": "Fishmonger",
"terms": ""
},
"shop/florist": {
"name": "Florist",
"terms": "flower"
@@ -3915,10 +3923,6 @@
"name": "Tire Store",
"terms": ""
},
"shop/vacant": {
"name": "Vacant Shop",
"terms": ""
},
"shop/vacuum_cleaner": {
"name": "Vacuum Cleaner Store",
"terms": ""
@@ -4039,6 +4043,10 @@
"name": "Raised Pedestrian Crossing",
"terms": "speed table,flat top hump"
},
"type/multipolygon": {
"name": "Multipolygon",
"terms": ""
},
"type/boundary": {
"name": "Boundary",
"terms": ""
@@ -4047,10 +4055,6 @@
"name": "Administrative Boundary",
"terms": ""
},
"type/multipolygon": {
"name": "Multipolygon",
"terms": ""
},
"type/restriction": {
"name": "Restriction",
"terms": ""
@@ -4147,10 +4151,6 @@
"name": "Other",
"terms": ""
},
"waterway": {
"name": "Waterway",
"terms": ""
},
"waterway/boatyard": {
"name": "Boatyard",
"terms": ""