From a48e897df6a3fb41128476793a55a3570a9fc11d Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 25 Nov 2015 01:50:12 -0500 Subject: [PATCH] Drop matchScore for building presets (closes #2793) Previously matching was too dependant on tag order.. `building=retail + shop=mall` matched `building=retail` preset `shop=mall + building=retail` matched `shop=mall` preset Now iD will prefer the preset that's not the building one. --- data/presets/presets.json | 41 +++++++++++++++++-- data/presets/presets/building.json | 1 + data/presets/presets/building/apartments.json | 1 + data/presets/presets/building/barn.json | 1 + data/presets/presets/building/bunker.json | 1 + data/presets/presets/building/cabin.json | 1 + data/presets/presets/building/cathedral.json | 1 + data/presets/presets/building/chapel.json | 1 + data/presets/presets/building/church.json | 1 + data/presets/presets/building/college.json | 1 + data/presets/presets/building/commercial.json | 1 + .../presets/building/construction.json | 1 + data/presets/presets/building/detached.json | 1 + data/presets/presets/building/dormitory.json | 1 + data/presets/presets/building/garage.json | 5 ++- data/presets/presets/building/garages.json | 1 + data/presets/presets/building/greenhouse.json | 1 + data/presets/presets/building/hospital.json | 1 + data/presets/presets/building/hotel.json | 1 + data/presets/presets/building/house.json | 1 + data/presets/presets/building/hut.json | 1 + data/presets/presets/building/industrial.json | 1 + .../presets/building/kindergarten.json | 1 + data/presets/presets/building/public.json | 1 + .../presets/presets/building/residential.json | 1 + data/presets/presets/building/retail.json | 1 + data/presets/presets/building/roof.json | 1 + data/presets/presets/building/school.json | 1 + .../presets/building/semidetached_house.json | 1 + data/presets/presets/building/shed.json | 1 + data/presets/presets/building/stable.json | 1 + .../presets/building/static_caravan.json | 1 + data/presets/presets/building/terrace.json | 1 + .../presets/building/train_station.json | 1 + data/presets/presets/building/university.json | 1 + data/presets/presets/building/warehouse.json | 3 +- 36 files changed, 76 insertions(+), 6 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 11033ccc2..2ffeb3d54 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -2226,6 +2226,7 @@ "tags": { "building": "*" }, + "matchScore": 0.4, "terms": [], "name": "Building" }, @@ -2241,6 +2242,7 @@ "tags": { "building": "apartments" }, + "matchScore": 0.5, "name": "Apartments" }, "building/barn": { @@ -2255,6 +2257,7 @@ "tags": { "building": "barn" }, + "matchScore": 0.5, "name": "Barn" }, "building/bunker": { @@ -2268,6 +2271,7 @@ "tags": { "building": "bunker" }, + "matchScore": 0.5, "name": "Bunker", "searchable": false }, @@ -2283,6 +2287,7 @@ "tags": { "building": "cabin" }, + "matchScore": 0.5, "name": "Cabin" }, "building/cathedral": { @@ -2297,6 +2302,7 @@ "tags": { "building": "cathedral" }, + "matchScore": 0.5, "name": "Cathedral Building" }, "building/chapel": { @@ -2311,6 +2317,7 @@ "tags": { "building": "chapel" }, + "matchScore": 0.5, "name": "Chapel Building" }, "building/church": { @@ -2325,6 +2332,7 @@ "tags": { "building": "church" }, + "matchScore": 0.5, "name": "Church Building" }, "building/college": { @@ -2342,6 +2350,7 @@ "tags": { "building": "college" }, + "matchScore": 0.5, "name": "College Building" }, "building/commercial": { @@ -2357,6 +2366,7 @@ "tags": { "building": "commercial" }, + "matchScore": 0.5, "name": "Commercial Building" }, "building/construction": { @@ -2371,6 +2381,7 @@ "tags": { "building": "construction" }, + "matchScore": 0.5, "name": "Building Under Construction" }, "building/detached": { @@ -2392,6 +2403,7 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Detached House" }, "building/dormitory": { @@ -2407,6 +2419,7 @@ "tags": { "building": "dormitory" }, + "matchScore": 0.5, "name": "Dormitory" }, "building/entrance": { @@ -2421,6 +2434,7 @@ "searchable": false }, "building/garage": { + "icon": "warehouse", "fields": [ "capacity" ], @@ -2430,8 +2444,8 @@ "tags": { "building": "garage" }, - "name": "Garage", - "icon": "warehouse" + "matchScore": 0.5, + "name": "Garage" }, "building/garages": { "icon": "warehouse", @@ -2444,6 +2458,7 @@ "tags": { "building": "garages" }, + "matchScore": 0.5, "name": "Garages" }, "building/greenhouse": { @@ -2458,6 +2473,7 @@ "tags": { "building": "greenhouse" }, + "matchScore": 0.5, "name": "Greenhouse" }, "building/hospital": { @@ -2472,6 +2488,7 @@ "tags": { "building": "hospital" }, + "matchScore": 0.5, "name": "Hospital Building" }, "building/hotel": { @@ -2487,6 +2504,7 @@ "tags": { "building": "hotel" }, + "matchScore": 0.5, "name": "Hotel Building" }, "building/house": { @@ -2507,6 +2525,7 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "House" }, "building/hut": { @@ -2516,6 +2535,7 @@ "tags": { "building": "hut" }, + "matchScore": 0.5, "name": "Hut" }, "building/industrial": { @@ -2530,6 +2550,7 @@ "tags": { "building": "industrial" }, + "matchScore": 0.5, "name": "Industrial Building" }, "building/kindergarten": { @@ -2548,6 +2569,7 @@ "tags": { "building": "kindergarten" }, + "matchScore": 0.5, "name": "Preschool/Kindergarten Building" }, "building/public": { @@ -2563,6 +2585,7 @@ "tags": { "building": "public" }, + "matchScore": 0.5, "name": "Public Building" }, "building/residential": { @@ -2577,6 +2600,7 @@ "tags": { "building": "residential" }, + "matchScore": 0.5, "name": "Residential Building" }, "building/retail": { @@ -2592,6 +2616,7 @@ "tags": { "building": "retail" }, + "matchScore": 0.5, "name": "Retail Building" }, "building/roof": { @@ -2605,6 +2630,7 @@ "tags": { "building": "roof" }, + "matchScore": 0.5, "name": "Roof" }, "building/school": { @@ -2625,6 +2651,7 @@ "tags": { "building": "school" }, + "matchScore": 0.5, "name": "School Building" }, "building/semidetached_house": { @@ -2648,6 +2675,7 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Semi-Detached House" }, "building/shed": { @@ -2662,6 +2690,7 @@ "tags": { "building": "shed" }, + "matchScore": 0.5, "name": "Shed" }, "building/stable": { @@ -2676,6 +2705,7 @@ "tags": { "building": "stable" }, + "matchScore": 0.5, "name": "Stable" }, "building/static_caravan": { @@ -2690,6 +2720,7 @@ "tags": { "building": "static_caravan" }, + "matchScore": 0.5, "name": "Static Mobile Home" }, "building/terrace": { @@ -2712,6 +2743,7 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Row Houses" }, "building/train_station": { @@ -2728,6 +2760,7 @@ "tags": { "building": "train_station" }, + "matchScore": 0.5, "name": "Train Station", "searchable": false }, @@ -2746,10 +2779,11 @@ "tags": { "building": "university" }, + "matchScore": 0.5, "name": "University Building" }, "building/warehouse": { - "icon": "building", + "icon": "warehouse", "fields": [ "address", "levels" @@ -2760,6 +2794,7 @@ "tags": { "building": "warehouse" }, + "matchScore": 0.5, "name": "Warehouse" }, "craft": { diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index 5a5e9d6b8..983515746 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -12,6 +12,7 @@ "tags": { "building": "*" }, + "matchScore": 0.4, "terms": [], "name": "Building" } diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json index 09a403e92..2a1578ddb 100644 --- a/data/presets/presets/building/apartments.json +++ b/data/presets/presets/building/apartments.json @@ -10,5 +10,6 @@ "tags": { "building": "apartments" }, + "matchScore": 0.5, "name": "Apartments" } diff --git a/data/presets/presets/building/barn.json b/data/presets/presets/building/barn.json index 7f2ccda09..2e98bc0ac 100644 --- a/data/presets/presets/building/barn.json +++ b/data/presets/presets/building/barn.json @@ -10,5 +10,6 @@ "tags": { "building": "barn" }, + "matchScore": 0.5, "name": "Barn" } diff --git a/data/presets/presets/building/bunker.json b/data/presets/presets/building/bunker.json index 48e5db5d4..6810768af 100644 --- a/data/presets/presets/building/bunker.json +++ b/data/presets/presets/building/bunker.json @@ -9,6 +9,7 @@ "tags": { "building": "bunker" }, + "matchScore": 0.5, "name": "Bunker", "searchable": false } diff --git a/data/presets/presets/building/cabin.json b/data/presets/presets/building/cabin.json index 8ed028aaf..be9d69c54 100644 --- a/data/presets/presets/building/cabin.json +++ b/data/presets/presets/building/cabin.json @@ -10,5 +10,6 @@ "tags": { "building": "cabin" }, + "matchScore": 0.5, "name": "Cabin" } diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json index 25b96adce..9e1c3f9cd 100644 --- a/data/presets/presets/building/cathedral.json +++ b/data/presets/presets/building/cathedral.json @@ -10,5 +10,6 @@ "tags": { "building": "cathedral" }, + "matchScore": 0.5, "name": "Cathedral Building" } diff --git a/data/presets/presets/building/chapel.json b/data/presets/presets/building/chapel.json index ce07621b1..854c42afc 100644 --- a/data/presets/presets/building/chapel.json +++ b/data/presets/presets/building/chapel.json @@ -10,5 +10,6 @@ "tags": { "building": "chapel" }, + "matchScore": 0.5, "name": "Chapel Building" } diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json index f63e910bd..a3c225023 100644 --- a/data/presets/presets/building/church.json +++ b/data/presets/presets/building/church.json @@ -10,5 +10,6 @@ "tags": { "building": "church" }, + "matchScore": 0.5, "name": "Church Building" } diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json index 9d6bb4964..2e6f021f2 100644 --- a/data/presets/presets/building/college.json +++ b/data/presets/presets/building/college.json @@ -13,5 +13,6 @@ "tags": { "building": "college" }, + "matchScore": 0.5, "name": "College Building" } diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json index 98f170160..76067d271 100644 --- a/data/presets/presets/building/commercial.json +++ b/data/presets/presets/building/commercial.json @@ -11,5 +11,6 @@ "tags": { "building": "commercial" }, + "matchScore": 0.5, "name": "Commercial Building" } diff --git a/data/presets/presets/building/construction.json b/data/presets/presets/building/construction.json index 77eb525ee..ab1eb7845 100644 --- a/data/presets/presets/building/construction.json +++ b/data/presets/presets/building/construction.json @@ -10,5 +10,6 @@ "tags": { "building": "construction" }, + "matchScore": 0.5, "name": "Building Under Construction" } diff --git a/data/presets/presets/building/detached.json b/data/presets/presets/building/detached.json index e5847da2c..02a57da42 100644 --- a/data/presets/presets/building/detached.json +++ b/data/presets/presets/building/detached.json @@ -17,5 +17,6 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Detached House" } diff --git a/data/presets/presets/building/dormitory.json b/data/presets/presets/building/dormitory.json index 080b5d80c..3d584ac95 100644 --- a/data/presets/presets/building/dormitory.json +++ b/data/presets/presets/building/dormitory.json @@ -11,5 +11,6 @@ "tags": { "building": "dormitory" }, + "matchScore": 0.5, "name": "Dormitory" } diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json index 4e533fdd4..7ffd905d1 100644 --- a/data/presets/presets/building/garage.json +++ b/data/presets/presets/building/garage.json @@ -1,4 +1,5 @@ { + "icon": "warehouse", "fields": [ "capacity" ], @@ -8,6 +9,6 @@ "tags": { "building": "garage" }, - "name": "Garage", - "icon": "warehouse" + "matchScore": 0.5, + "name": "Garage" } diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json index 55793fcf3..3b19c6fea 100644 --- a/data/presets/presets/building/garages.json +++ b/data/presets/presets/building/garages.json @@ -9,5 +9,6 @@ "tags": { "building": "garages" }, + "matchScore": 0.5, "name": "Garages" } diff --git a/data/presets/presets/building/greenhouse.json b/data/presets/presets/building/greenhouse.json index feb3d4492..7de83b785 100644 --- a/data/presets/presets/building/greenhouse.json +++ b/data/presets/presets/building/greenhouse.json @@ -10,5 +10,6 @@ "tags": { "building": "greenhouse" }, + "matchScore": 0.5, "name": "Greenhouse" } diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json index 170b97f36..0f7dadb64 100644 --- a/data/presets/presets/building/hospital.json +++ b/data/presets/presets/building/hospital.json @@ -10,5 +10,6 @@ "tags": { "building": "hospital" }, + "matchScore": 0.5, "name": "Hospital Building" } diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json index b76757f13..eb76a47ca 100644 --- a/data/presets/presets/building/hotel.json +++ b/data/presets/presets/building/hotel.json @@ -11,5 +11,6 @@ "tags": { "building": "hotel" }, + "matchScore": 0.5, "name": "Hotel Building" } diff --git a/data/presets/presets/building/house.json b/data/presets/presets/building/house.json index 5ecfd2f05..8d7290e7d 100644 --- a/data/presets/presets/building/house.json +++ b/data/presets/presets/building/house.json @@ -16,5 +16,6 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "House" } diff --git a/data/presets/presets/building/hut.json b/data/presets/presets/building/hut.json index f3ceca080..0d8f7f574 100644 --- a/data/presets/presets/building/hut.json +++ b/data/presets/presets/building/hut.json @@ -5,5 +5,6 @@ "tags": { "building": "hut" }, + "matchScore": 0.5, "name": "Hut" } diff --git a/data/presets/presets/building/industrial.json b/data/presets/presets/building/industrial.json index 283bd7752..19d8a4e54 100644 --- a/data/presets/presets/building/industrial.json +++ b/data/presets/presets/building/industrial.json @@ -10,5 +10,6 @@ "tags": { "building": "industrial" }, + "matchScore": 0.5, "name": "Industrial Building" } diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json index 9d4eac599..5d168a124 100644 --- a/data/presets/presets/building/kindergarten.json +++ b/data/presets/presets/building/kindergarten.json @@ -14,5 +14,6 @@ "tags": { "building": "kindergarten" }, + "matchScore": 0.5, "name": "Preschool/Kindergarten Building" } diff --git a/data/presets/presets/building/public.json b/data/presets/presets/building/public.json index 5276110ef..40ba7959e 100644 --- a/data/presets/presets/building/public.json +++ b/data/presets/presets/building/public.json @@ -11,5 +11,6 @@ "tags": { "building": "public" }, + "matchScore": 0.5, "name": "Public Building" } diff --git a/data/presets/presets/building/residential.json b/data/presets/presets/building/residential.json index 2015f9e80..25af2be18 100644 --- a/data/presets/presets/building/residential.json +++ b/data/presets/presets/building/residential.json @@ -10,5 +10,6 @@ "tags": { "building": "residential" }, + "matchScore": 0.5, "name": "Residential Building" } diff --git a/data/presets/presets/building/retail.json b/data/presets/presets/building/retail.json index 418e24652..4924c99c2 100644 --- a/data/presets/presets/building/retail.json +++ b/data/presets/presets/building/retail.json @@ -11,5 +11,6 @@ "tags": { "building": "retail" }, + "matchScore": 0.5, "name": "Retail Building" } diff --git a/data/presets/presets/building/roof.json b/data/presets/presets/building/roof.json index d7e9ccfcd..92dc351cc 100644 --- a/data/presets/presets/building/roof.json +++ b/data/presets/presets/building/roof.json @@ -9,5 +9,6 @@ "tags": { "building": "roof" }, + "matchScore": 0.5, "name": "Roof" } diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json index ce4168131..c8427df72 100644 --- a/data/presets/presets/building/school.json +++ b/data/presets/presets/building/school.json @@ -16,5 +16,6 @@ "tags": { "building": "school" }, + "matchScore": 0.5, "name": "School Building" } diff --git a/data/presets/presets/building/semidetached_house.json b/data/presets/presets/building/semidetached_house.json index f074adf2c..4052d2617 100644 --- a/data/presets/presets/building/semidetached_house.json +++ b/data/presets/presets/building/semidetached_house.json @@ -19,5 +19,6 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Semi-Detached House" } diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json index 8935c4397..a715a37e0 100644 --- a/data/presets/presets/building/shed.json +++ b/data/presets/presets/building/shed.json @@ -10,5 +10,6 @@ "tags": { "building": "shed" }, + "matchScore": 0.5, "name": "Shed" } diff --git a/data/presets/presets/building/stable.json b/data/presets/presets/building/stable.json index ba43b6518..38a44aec4 100644 --- a/data/presets/presets/building/stable.json +++ b/data/presets/presets/building/stable.json @@ -10,5 +10,6 @@ "tags": { "building": "stable" }, + "matchScore": 0.5, "name": "Stable" } diff --git a/data/presets/presets/building/static_caravan.json b/data/presets/presets/building/static_caravan.json index f1120daa1..853cce3e7 100644 --- a/data/presets/presets/building/static_caravan.json +++ b/data/presets/presets/building/static_caravan.json @@ -10,5 +10,6 @@ "tags": { "building": "static_caravan" }, + "matchScore": 0.5, "name": "Static Mobile Home" } diff --git a/data/presets/presets/building/terrace.json b/data/presets/presets/building/terrace.json index 90911e4b9..02cd1546e 100644 --- a/data/presets/presets/building/terrace.json +++ b/data/presets/presets/building/terrace.json @@ -18,5 +18,6 @@ "residence", "dwelling" ], + "matchScore": 0.5, "name": "Row Houses" } diff --git a/data/presets/presets/building/train_station.json b/data/presets/presets/building/train_station.json index 53c0e4c08..6a4d04a18 100644 --- a/data/presets/presets/building/train_station.json +++ b/data/presets/presets/building/train_station.json @@ -12,6 +12,7 @@ "tags": { "building": "train_station" }, + "matchScore": 0.5, "name": "Train Station", "searchable":false } diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json index 2a7487fe2..e34385f1d 100644 --- a/data/presets/presets/building/university.json +++ b/data/presets/presets/building/university.json @@ -13,5 +13,6 @@ "tags": { "building": "university" }, + "matchScore": 0.5, "name": "University Building" } diff --git a/data/presets/presets/building/warehouse.json b/data/presets/presets/building/warehouse.json index 84f0ce3e9..3dcba721b 100644 --- a/data/presets/presets/building/warehouse.json +++ b/data/presets/presets/building/warehouse.json @@ -1,5 +1,5 @@ { - "icon": "building", + "icon": "warehouse", "fields": [ "address", "levels" @@ -10,5 +10,6 @@ "tags": { "building": "warehouse" }, + "matchScore": 0.5, "name": "Warehouse" }