Add maki- prefix to all maki icons

(re: #3924)
2026-05-15 05:30:35 +02:00 · 2018-06-05 22:12:33 -04:00
parent d11f7fbc6a
commit da10b6b254
628 changed files with 4766 additions and 4781 deletions
@@ -14,7 +14,6 @@ const path = require('path');
 const shell = require('shelljs');
 const YAML = require('js-yaml');
 const colors = require('colors/safe');
-const maki = require('@mapbox/maki');

 const fieldSchema = require('./data/presets/schema/field.json');
 const presetSchema = require('./data/presets/schema/preset.json');
@@ -346,12 +345,12 @@ function generateTaginfo(presets, fields) {
        }

        // add icon
-        if (/^temaki-/.test(preset.icon)) {
-            tag.icon_url = 'https://raw.githubusercontent.com/bhousel/temaki/master/icons/' +
-                preset.icon + '.svg?sanitize=true';
-        } else if (isMaki(preset.icon)) {
+        if (/^maki-/.test(preset.icon)) {
            tag.icon_url = 'https://raw.githubusercontent.com/mapbox/maki/master/icons/' +
-                preset.icon + '-15.svg?sanitize=true';
+                preset.icon.replace(/^maki-/, '') + '-15.svg?sanitize=true';
+        } else if (/^temaki-/.test(preset.icon)) {
+            tag.icon_url = 'https://raw.githubusercontent.com/bhousel/temaki/master/icons/' +
+                preset.icon.replace(/^temaki-/, '') + '.svg?sanitize=true';
        }

        coalesceTags(taginfo, tag);
@@ -415,10 +414,6 @@ function generateTaginfo(presets, fields) {
        }
    }

-    function isMaki(icon) {
-        var dataFeatureIcons = maki.layouts.all.all;
-        return (icon && dataFeatureIcons.indexOf(icon) !== -1);
-    }

    function setObjectType(tag, input) {
        tag.object_types = [];
@@ -23,9 +23,6 @@ import { defaults } from './presets/defaults.json';
 import { categories } from './presets/categories.json';
 import { fields } from './presets/fields.json';

-import maki from '@mapbox/maki';
-export var dataFeatureIcons = maki.layouts.all.all;
-
 import { geoArea as d3_geoArea } from 'd3-geo';
 import _values from 'lodash-es/values';
 import whichPolygon from 'which-polygon';
@@ -16,7 +16,7 @@ A basic preset is of the form:
 ```javascript
 {
    // The icon in iD which represents this feature.
-    "icon": "park",
+    "icon": "maki-park",
    // An array of field names. See the fields documentation for details of what's valid here.
    "fields": [
        "address"
@@ -1,7 +1,7 @@
 {
    "categories": {
        "category-barrier": {
-            "icon": "roadblock",
+            "icon": "maki-roadblock",
            "geometry": "line",
            "name": "Barrier Features",
            "members": [
@@ -15,7 +15,7 @@
            ]
        },
        "category-building": {
-            "icon": "building",
+            "icon": "maki-building",
            "geometry": "area",
            "name": "Building Features",
            "members": [
@@ -29,7 +29,7 @@
            ]
        },
        "category-golf": {
-            "icon": "golf",
+            "icon": "maki-golf",
            "geometry": "area",
            "name": "Golf Features",
            "members": [
@@ -43,7 +43,7 @@
            ]
        },
        "category-landuse": {
-            "icon": "landuse",
+            "icon": "maki-landuse",
            "geometry": "area",
            "name": "Land Use Features",
            "members": [
@@ -62,7 +62,7 @@
            ]
        },
        "category-natural-area": {
-            "icon": "natural",
+            "icon": "maki-natural",
            "geometry": "area",
            "name": "Natural Features",
            "members": [
@@ -79,7 +79,7 @@
            ]
        },
        "category-natural-line": {
-            "icon": "natural",
+            "icon": "maki-natural",
            "geometry": "line",
            "name": "Natural Features",
            "members": [
@@ -88,7 +88,7 @@
            ]
        },
        "category-natural-point": {
-            "icon": "natural",
+            "icon": "maki-natural",
            "geometry": "point",
            "name": "Natural Features",
            "members": [
@@ -190,7 +190,7 @@
            ]
        },
        "category-water-area": {
-            "icon": "water",
+            "icon": "maki-water",
            "geometry": "area",
            "name": "Water Features",
            "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "maki-roadblock",
    "geometry": "line",
    "name": "Barrier Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "building",
+    "icon": "maki-building",
    "geometry": "area",
    "name": "Building Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "golf",
+    "icon": "maki-golf",
    "geometry": "area",
    "name": "Golf Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "landuse",
+    "icon": "maki-landuse",
    "geometry": "area",
    "name": "Land Use Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "natural",
+    "icon": "maki-natural",
    "geometry": "area",
    "name": "Natural Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "natural",
+    "icon": "maki-natural",
    "geometry": "line",
    "name": "Natural Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "natural",
+    "icon": "maki-natural",
    "geometry": "point",
    "name": "Natural Features",
    "members": [
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "maki-water",
    "geometry": "area",
    "name": "Water Features",
    "members": [
@@ -1481,7 +1481,7 @@
        "phone": {
            "key": "phone",
            "type": "tel",
-            "icon": "telephone",
+            "icon": "maki-telephone",
            "universal": true,
            "label": "Telephone",
            "placeholder": "+31 42 123 4567"
@@ -2320,7 +2320,7 @@
                "limited",
                "no"
            ],
-            "icon": "wheelchair",
+            "icon": "maki-wheelchair",
            "universal": true,
            "label": "Wheelchair Access"
        },
@@ -1,7 +1,7 @@
 {
    "key": "phone",
    "type": "tel",
-    "icon": "telephone",
+    "icon": "maki-telephone",
    "universal": true,
    "label": "Telephone",
    "placeholder": "+31 42 123 4567"
@@ -6,7 +6,7 @@
        "limited",
        "no"
    ],
-    "icon": "wheelchair",
+    "icon": "maki-wheelchair",
    "universal": true,
    "label": "Wheelchair Access"
 }
@@ -1,5 +1,5 @@
 {
-    "icon": "airport",
+    "icon": "maki-airport",
    "fields": [
        "aeroway"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "aerialway",
+    "icon": "maki-aerialway",
    "geometry": [
        "point",
        "vertex",
@@ -1,5 +1,5 @@
 {
-    "icon": "airport",
+    "icon": "maki-airport",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "airport",
+    "icon": "maki-airport",
    "geometry": [
        "area"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "airport",
+    "icon": "maki-airport",
    "geometry": [
        "point"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "heliport",
+    "icon": "maki-heliport",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "airport",
+    "icon": "maki-airport",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "bus",
+    "icon": "maki-bus",
    "fields": [
        "name",
        "building_area",
@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "maki-commercial",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "ferry",
+    "icon": "maki-ferry",
    "fields": [
        "name",
        "network",
@@ -1,5 +1,5 @@
 {
-    "icon": "wheelchair",
+    "icon": "maki-wheelchair",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "town-hall",
+    "icon": "maki-town-hall",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "swimming",
+    "icon": "maki-swimming",
    "geometry": [
        "point",
        "vertex",
@@ -1,5 +1,5 @@
 {
-    "icon": "veterinary",
+    "icon": "maki-veterinary",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "veterinary",
+    "icon": "maki-veterinary",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "veterinary",
+    "icon": "maki-veterinary",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "theatre",
+    "icon": "maki-theatre",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "bank",
+    "icon": "maki-bank",
    "fields": [
        "operator",
        "currency_multi",
@@ -1,5 +1,5 @@
 {
-    "icon": "bank",
+    "icon": "maki-bank",
    "fields": [
 	    "name",
        "atm",
@@ -1,5 +1,5 @@
 {
-    "icon": "bar",
+    "icon": "maki-bar",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "bbq",
+    "icon": "maki-bbq",
    "fields": [
        "covered",
        "fuel"
@@ -1,5 +1,5 @@
 {
-    "icon": "bicycle",
+    "icon": "maki-bicycle",
    "fields": [
        "bicycle_parking",
        "capacity",
@@ -1,5 +1,5 @@
 {
-    "icon": "bicycle",
+    "icon": "maki-bicycle",
    "fields": [
        "capacity",
        "network",
@@ -1,5 +1,5 @@
 {
-    "icon": "bicycle",
+    "icon": "maki-bicycle",
    "fields": [
        "operator",
        "brand",
@@ -1,5 +1,5 @@
 {
-    "icon": "beer",
+    "icon": "maki-beer",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "bank",
+    "icon": "maki-bank",
    "fields": [
        "name",
        "currency_multi",
@@ -1,5 +1,5 @@
 {
-    "icon": "cafe",
+    "icon": "maki-cafe",
    "fields": [
        "name",
        "cuisine",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "address",
        "building_area",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "operator",
        "capacity"
@@ -1,5 +1,5 @@
 {
-    "icon": "school",
+    "icon": "maki-school",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "cinema",
+    "icon": "maki-cinema",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "maki-doctor",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "maki-hospital",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "maki-hospital",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "college",
+    "icon": "maki-college",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "town-hall",
+    "icon": "maki-town-hall",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "geometry": [
        "point",
        "area"
@@ -1,5 +1,5 @@
 {
-    "icon": "town-hall",
+    "icon": "maki-town-hall",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "cemetery",
+    "icon": "maki-cemetery",
    "fields": [
        "name",
        "website",
@@ -1,5 +1,5 @@
 {
-    "icon": "dentist",
+    "icon": "maki-dentist",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "maki-doctor",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "pitch",
+    "icon": "maki-pitch",
    "fields": [
        "name",
        "sport",
@@ -1,5 +1,5 @@
 {
-    "icon": "drinking-water",
+    "icon": "maki-drinking-water",
    "geometry": [
        "point"
    ],
@@ -1,5 +1,5 @@
 {
-    "icon": "car",
+    "icon": "maki-car",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "embassy",
+    "icon": "maki-embassy",
    "fields": [
        "name",
        "country",
@@ -1,5 +1,5 @@
 {
-    "icon": "fast-food",
+    "icon": "maki-fast-food",
    "fields": [
        "name",
        "cuisine",
@@ -1,5 +1,5 @@
 {
-    "icon": "fire-station",
+    "icon": "maki-fire-station",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "restaurant",
+    "icon": "maki-restaurant",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "fuel",
+    "icon": "maki-fuel",
    "fields": [
        "name",
        "brand",
@@ -1,5 +1,5 @@
 {
-    "icon": "cemetery",
+    "icon": "maki-cemetery",
    "fields": [
        "religion",
        "denomination"
@@ -1,5 +1,5 @@
 {
-    "icon": "hospital",
+    "icon": "maki-hospital",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "ice-cream",
+    "icon": "maki-ice-cream",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "school",
+    "icon": "maki-school",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "library",
+    "icon": "maki-library",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "heart",
+    "icon": "maki-heart",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "maki-shop",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "place-of-worship",
+    "icon": "maki-place-of-worship",
    "fields": [
        "name",
        "religion",
@@ -1,5 +1,5 @@
 {
-    "icon": "scooter",
+    "icon": "maki-scooter",
    "fields": [
        "capacity",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "school",
+    "icon": "maki-school",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "bar",
+    "icon": "maki-bar",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "parking",
+    "icon": "maki-parking",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "entrance-alt1",
+    "icon": "maki-entrance-alt1",
    "fields": [
        "access_simple",
        "ref"
@@ -1,5 +1,5 @@
 {
-    "icon": "shelter",
+    "icon": "maki-shelter",
    "fields": [
        "bin",
        "bench"
@@ -1,5 +1,5 @@
 {
-    "icon": "pharmacy",
+    "icon": "maki-pharmacy",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "place-of-worship",
+    "icon": "maki-place-of-worship",
    "fields": [
        "name",
        "religion",
@@ -1,5 +1,5 @@
 {
-    "icon": "buddhism",
+    "icon": "maki-buddhism",
    "fields": [
        "name",
        "denomination",
@@ -1,5 +1,5 @@
 {
-    "icon": "religious-christian",
+    "icon": "maki-religious-christian",
    "fields": [
        "name",
        "denomination",
@@ -1,5 +1,5 @@
 {
-    "icon": "religious-jewish",
+    "icon": "maki-religious-jewish",
    "fields": [
        "name",
        "denomination",
@@ -1,5 +1,5 @@
 {
-    "icon": "religious-muslim",
+    "icon": "maki-religious-muslim",
    "fields": [
        "name",
        "denomination",
@@ -1,5 +1,5 @@
 {
-    "icon": "museum",
+    "icon": "maki-museum",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "police",
+    "icon": "maki-police",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "post",
+    "icon": "maki-post",
    "fields": [
        "operator",
        "collection_times",
@@ -1,5 +1,5 @@
 {
-    "icon": "post",
+    "icon": "maki-post",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "prison",
+    "icon": "maki-prison",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "beer",
+    "icon": "maki-beer",
    "fields": [
        "name",
        "address",
@@ -1,5 +1,5 @@
 {
-    "icon": "water",
+    "icon": "maki-water",
    "fields": [
        "name",
        "bath/type",
@@ -1,5 +1,5 @@
 {
-    "icon": "library",
+    "icon": "maki-library",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "recycling",
+    "icon": "maki-recycling",
    "fields": [
        "recycling_accepts",
        "collection_times"
@@ -1,5 +1,5 @@
 {
-    "icon": "recycling",
+    "icon": "maki-recycling",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "restaurant",
+    "icon": "maki-restaurant",
    "fields": [
        "name",
        "cuisine",
--- a/Show More
+++ b/Show More