Show Telephone and Website fields by default on more POI presets (close

#7877)
openstreetmap · Sep 21, 2020 · f141d1a · f141d1a
1 parent 0226b6f
commit f141d1a
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 40 deletions.
diff --git a/data/presets/presets.json b/data/presets/presets.json
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
@@ -10,7 +10,9 @@
         "outdoor_seating",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -26,12 +28,10 @@
         "min_age",
         "not/name",
         "payment_multi",
-        "phone",
         "ref/vatin",
         "reservation",
         "smoking",
         "takeaway",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
@@ -8,7 +8,9 @@
         "building_area",
         "opening_hours",
         "opening_hours/covid19",
-        "drive_through"
+        "drive_through",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -27,11 +29,9 @@
         "opening_hours/covid19",
         "outdoor_seating",
         "payment_multi",
-        "phone",
         "ref/vatin",
         "smoking",
         "takeaway",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
@@ -8,7 +8,9 @@
         "building_area",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -21,10 +23,8 @@
         "opening_hours/covid19",
         "outdoor_seating",
         "payment_multi",
-        "phone",
         "ref/vatin",
         "smoking",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
@@ -7,7 +7,9 @@
         "address",
         "building_area",
         "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "access_simple",

diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
@@ -7,7 +7,9 @@
         "address",
         "building_area",
         "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -21,10 +23,8 @@
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "phone",
         "product",
         "ref/vatin",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/healthcare.json b/data/presets/presets/healthcare.json
@@ -6,7 +6,9 @@
         "operator",
         "healthcare/speciality",
         "address",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "brand",
@@ -19,8 +21,6 @@
         "opening_hours",
         "opening_hours/covid19",
         "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/polling_station.json b/data/presets/presets/polling_station.json
@@ -7,7 +7,9 @@
         "address",
         "opening_hours",
         "opening_hours/covid19",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -17,8 +19,6 @@
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
@@ -8,7 +8,9 @@
         "building_area",
         "opening_hours",
         "opening_hours/covid19",
-        "payment_multi"
+        "payment_multi",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -25,11 +27,9 @@
         "internet_access/ssid",
         "level",
         "not/name",
-        "phone",
         "ref/vatin",
         "second_hand",
         "stroller",
-        "website",
         "wheelchair"
     ],
     "geometry": [

diff --git a/scripts/build_data.js b/scripts/build_data.js
@@ -683,8 +683,7 @@ function validateCategoryPresets(categories, presets) {
 
 function validatePresetFields(presets, fields) {
   const betweenBracketsRegex = /([^{]*?)(?=\})/;
-  const maxFieldsBeforeError = 12;
-  const maxFieldsBeforeWarning = 8;
+  const maxFieldsBeforeError = 10;
 
   for (let presetID in presets) {
     let preset = presets[presetID];
@@ -734,23 +733,20 @@ function validatePresetFields(presets, fields) {
       // since `moreFields` is available, check that `fields` doesn't get too cluttered
       let fieldCount = preset.fields.length;
 
-      if (fieldCount > maxFieldsBeforeWarning) {
-        // Fields with `prerequisiteTag` probably won't show up initially,
+      if (fieldCount > maxFieldsBeforeError) {
+        // Fields with `prerequisiteTag` or `geometry` may not always be shown,
         // so don't count them against the limits.
-        const fieldsWithoutPrerequisites = preset.fields.filter(fieldID => {
-          if (fields[fieldID] && fields[fieldID].prerequisiteTag) return false;
+        const alwaysShownFields = preset.fields.filter(fieldID => {
+          if (fields[fieldID] && fields[fieldID].prerequisiteTag || fields[fieldID].geometry) return false;
           return true;
         });
-        fieldCount = fieldsWithoutPrerequisites.length;
+        fieldCount = alwaysShownFields.length;
       }
       if (fieldCount > maxFieldsBeforeError) {
         console.error(fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Limit: ' + maxFieldsBeforeError + '. Please move lower-priority fields to "moreFields".');
         console.log('');
         process.exit(1);
       }
-      else if (fieldCount > maxFieldsBeforeWarning) {
-        console.log('Warning: ' + fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Recommended: ' + maxFieldsBeforeWarning + ' or fewer. Consider moving lower-priority fields to "moreFields".');
-      }
     }
   }
 }