Add Mineshaft preset and Resources field

2026-03-30 17:00:35 +02:00 · 2019-03-18 08:56:43 -04:00
parent 2591fb9525
commit f55434acbf
10 changed files with 64 additions and 9 deletions
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -235,6 +235,10 @@
      "old": {"man_made": "well"},
      "replace": {"man_made": "water_well"}
    },
+    {
+      "old": {"mining_resource": "*"},
+      "replace": {"resource": "$1"}
+    },
    {
      "old": {"natural": "marsh"},
      "replace": {"natural": "wetland", "wetland": "marsh"}
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1514,6 +1514,9 @@ en:
      religion:
        # religion=*
        label: Religion
+      resource:
+        # resource=*
+        label: Resources
      restriction:
        # restriction=*
        label: Type
@@ -4900,7 +4903,7 @@ en:
      man_made/adit:
        # man_made=adit
        name: Adit
-        # 'terms: entrance,underground,mine,cave'
+        # 'terms: cave,horizontal mine entrance,tunnel,underground'
        terms: '<translate with synonyms or related terms for ''Adit'', separated by commas>'
      man_made/antenna:
        # man_made=antenna
@@ -4983,6 +4986,11 @@ en:
        name: Television Broadcast Mast
        # 'terms: antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower'
        terms: '<translate with synonyms or related terms for ''Television Broadcast Mast'', separated by commas>'
+      man_made/mineshaft:
+        # man_made=mineshaft
+        name: Mineshaft
+        # 'terms: cave,mine shaft,tunnel,underground,vertical mine entrance'
+        terms: '<translate with synonyms or related terms for ''Mineshaft'', separated by commas>'
      man_made/monitoring_station:
        # man_made=monitoring_station
        name: Monitoring Station
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -268,6 +268,7 @@
    "ref/isil": {"key": "ref:isil", "type": "text", "label": "ISIL Code"},
    "relation": {"key": "type", "type": "combo", "label": "Type"},
    "religion": {"key": "religion", "type": "combo", "label": "Religion"},
+    "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
    "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
    "restrictions": {"type": "restrictions", "geometry": "vertex", "icon": "iD-restrictions", "reference": {"rtype": "restriction"}, "label": "Turn Restrictions"},
    "roof/colour": {"key": "roof:colour", "type": "combo", "label": "Roof Color"},
--- a/data/presets/fields/resource.json
+++ b/data/presets/fields/resource.json
@@ -0,0 +1,5 @@
+{
+    "key": "resource",
+    "type": "semiCombo",
+    "label": "Resources"
+}
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -530,7 +530,7 @@
    "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "removeTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Training Area"},
    "landuse/orchard": {"icon": "maki-park-alt1", "fields": ["name", "operator", "trees"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
    "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-    "landuse/quarry": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+    "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
    "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
    "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
@@ -611,7 +611,7 @@
    "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "addTags": {"leisure": "track", "sport": "running", "highway": "footway"}, "removeTags": {"leisure": "track", "sport": "running", "highway": "footway"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
    "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
    "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1},
-    "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["operator", "direction"], "terms": ["entrance", "underground", "mine", "cave"], "tags": {"man_made": "adit"}, "name": "Adit"},
+    "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
    "man_made/antenna": {"icon": "temaki-antenna", "fields": ["height", "communication_multi"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
    "man_made/breakwater": {"geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
@@ -630,6 +630,7 @@
    "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"},
    "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"},
    "man_made/mast/communication/television": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"},
+    "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
    "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
    "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -3,7 +3,9 @@
        "area"
    ],
    "fields": [
-        "name"
+        "name",
+        "operator",
+        "resource"
    ],
    "moreFields": [
        "address",
--- a/data/presets/presets/man_made/adit.json
+++ b/data/presets/presets/man_made/adit.json
@@ -5,14 +5,16 @@
        "area"
    ],
    "fields": [
+        "name",
        "operator",
+        "resource",
        "direction"
    ],
    "terms": [
-        "entrance",
-        "underground",
-        "mine",
-        "cave"
+        "cave",
+        "horizontal mine entrance",
+        "tunnel",
+        "underground"
    ],
    "tags": {
        "man_made": "adit"
--- a/data/presets/presets/man_made/mineshaft.json
+++ b/data/presets/presets/man_made/mineshaft.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-triangle",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "fields": [
+        "name",
+        "operator",
+        "resource"
+    ],
+    "terms": [
+        "cave",
+        "mine shaft",
+        "tunnel",
+        "underground",
+        "vertical mine entrance"
+    ],
+    "tags": {
+        "man_made": "mineshaft"
+    },
+    "name": "Mineshaft"
+}
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -610,6 +610,7 @@
    {"key": "communication:mobile_phone", "value": "yes", "description": "🄿 Mobile Phone Mast", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"},
    {"key": "communication:radio", "value": "yes", "description": "🄿 Radio Broadcast Mast", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"},
    {"key": "communication:television", "value": "yes", "description": "🄿 Television Broadcast Mast", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"},
+    {"key": "man_made", "value": "mineshaft", "description": "🄿 Mineshaft", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-15.svg?sanitize=true"},
    {"key": "man_made", "value": "monitoring_station", "description": "🄿 Monitoring Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/antenna.svg?sanitize=true"},
    {"key": "man_made", "value": "observatory", "description": "🄿 Observatory", "object_types": ["node", "area"]},
    {"key": "man_made", "value": "petroleum_well", "description": "🄿 Oil Well", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
@@ -1437,6 +1438,7 @@
    {"key": "ref:isil", "description": "🄵 ISIL Code"},
    {"key": "type", "description": "🄵 Type"},
    {"key": "religion", "description": "🄵 Religion"},
+    {"key": "resource", "description": "🄵 Resources"},
    {"key": "restriction", "description": "🄵 Type"},
    {"key": "roof:colour", "description": "🄵 Roof Color"},
    {"key": "rooms", "description": "🄵 Rooms"},
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3398,6 +3398,9 @@
                "religion": {
                    "label": "Religion"
                },
+                "resource": {
+                    "label": "Resources"
+                },
                "restriction": {
                    "label": "Type"
                },
@@ -6382,7 +6385,7 @@
                },
                "man_made/adit": {
                    "name": "Adit",
-                    "terms": "entrance,underground,mine,cave"
+                    "terms": "cave,horizontal mine entrance,tunnel,underground"
                },
                "man_made/antenna": {
                    "name": "Antenna",
@@ -6456,6 +6459,10 @@
                    "name": "Television Broadcast Mast",
                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower"
                },
+                "man_made/mineshaft": {
+                    "name": "Mineshaft",
+                    "terms": "cave,mine shaft,tunnel,underground,vertical mine entrance"
+                },
                "man_made/monitoring_station": {
                    "name": "Monitoring Station",
                    "terms": "weather,earthquake,seismology,air,gps"