diff --git a/build_data.js b/build_data.js index 986a579c5..9c9b1cbfe 100644 --- a/build_data.js +++ b/build_data.js @@ -70,7 +70,7 @@ module.exports = function buildData() { 'data/presets.yaml', 'data/taginfo.json', 'dist/locales/en.json', - 'svg/fontawesome/*', + 'svg/fontawesome/*.svg', ]); var categories = generateCategories(tstrings, faIcons); @@ -382,6 +382,9 @@ function generateTaginfo(presets, fields) { } else if (/^fa[srb]-/.test(preset.icon)) { tag.icon_url = 'https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/' + preset.icon + '.svg?sanitize=true'; + } else if (/^iD-/.test(preset.icon)) { + tag.icon_url = 'https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/' + + preset.icon.replace(/^iD-/, '') + '.svg?sanitize=true'; } coalesceTags(taginfo, tag); diff --git a/data/presets/categories.json b/data/presets/categories.json index 3a35d2d2a..a17f09f0f 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -99,7 +99,7 @@ ] }, "category-path": { - "icon": "category-path", + "icon": "iD-category-path", "geometry": "line", "name": "Path Features", "members": [ @@ -114,7 +114,7 @@ ] }, "category-rail": { - "icon": "category-rail", + "icon": "iD-category-rail", "geometry": "line", "name": "Rail Features", "members": [ @@ -127,7 +127,7 @@ ] }, "category-restriction": { - "icon": "restriction", + "icon": "iD-restriction", "geometry": "relation", "name": "Restriction Features", "members": [ @@ -143,7 +143,7 @@ ] }, "category-road": { - "icon": "category-roads", + "icon": "iD-category-roads", "geometry": "line", "name": "Road Features", "members": [ @@ -166,7 +166,7 @@ ] }, "category-route": { - "icon": "route", + "icon": "iD-route", "geometry": "relation", "name": "Route Features", "members": [ @@ -201,7 +201,7 @@ ] }, "category-water-line": { - "icon": "category-water", + "icon": "iD-category-water", "geometry": "line", "name": "Water Features", "members": [ diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json index b675a430e..53756b194 100644 --- a/data/presets/categories/path.json +++ b/data/presets/categories/path.json @@ -1,5 +1,5 @@ { - "icon": "category-path", + "icon": "iD-category-path", "geometry": "line", "name": "Path Features", "members": [ diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json index 6fc9f0b78..f7489a689 100644 --- a/data/presets/categories/rail.json +++ b/data/presets/categories/rail.json @@ -1,5 +1,5 @@ { - "icon": "category-rail", + "icon": "iD-category-rail", "geometry": "line", "name": "Rail Features", "members": [ diff --git a/data/presets/categories/restriction.json b/data/presets/categories/restriction.json index aeb6ce6e1..bf5bb5d06 100644 --- a/data/presets/categories/restriction.json +++ b/data/presets/categories/restriction.json @@ -1,5 +1,5 @@ { - "icon": "restriction", + "icon": "iD-restriction", "geometry": "relation", "name": "Restriction Features", "members": [ diff --git a/data/presets/categories/road.json b/data/presets/categories/road.json index ed3b1bb80..eaabdf505 100644 --- a/data/presets/categories/road.json +++ b/data/presets/categories/road.json @@ -1,5 +1,5 @@ { - "icon": "category-roads", + "icon": "iD-category-roads", "geometry": "line", "name": "Road Features", "members": [ diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json index f60c0d34b..6c05b0b03 100644 --- a/data/presets/categories/route.json +++ b/data/presets/categories/route.json @@ -1,5 +1,5 @@ { - "icon": "route", + "icon": "iD-route", "geometry": "relation", "name": "Route Features", "members": [ diff --git a/data/presets/categories/water-line.json b/data/presets/categories/water-line.json index 03bf6045a..7a7c8c3ff 100644 --- a/data/presets/categories/water-line.json +++ b/data/presets/categories/water-line.json @@ -1,5 +1,5 @@ { - "icon": "category-water", + "icon": "iD-category-water", "geometry": "line", "name": "Water Features", "members": [ diff --git a/data/presets/fields.json b/data/presets/fields.json index 5b191773e..02b917650 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1704,7 +1704,7 @@ "restrictions": { "type": "restrictions", "geometry": "vertex", - "icon": "restrictions", + "icon": "iD-restrictions", "reference": { "rtype": "restriction" }, diff --git a/data/presets/fields/restrictions.json b/data/presets/fields/restrictions.json index 4873601f9..ce3889a5d 100644 --- a/data/presets/fields/restrictions.json +++ b/data/presets/fields/restrictions.json @@ -1,7 +1,7 @@ { "type": "restrictions", "geometry": "vertex", - "icon": "restrictions", + "icon": "iD-restrictions", "reference": { "rtype": "restriction" }, diff --git a/data/presets/presets.json b/data/presets/presets.json index ef4914a59..7677d2c49 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6670,7 +6670,7 @@ "name": "Street Crossing" }, "footway/crosswalk-raised": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "crossing", "access", @@ -6701,7 +6701,7 @@ "name": "Raised Pedestrian Crosswalk" }, "footway/crosswalk": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "crossing", "access", @@ -6727,7 +6727,7 @@ "name": "Pedestrian Crosswalk" }, "footway/sidewalk": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "surface", "lit", @@ -7384,7 +7384,7 @@ "structure", "access" ], - "icon": "highway-bridleway", + "icon": "iD-highway-bridleway", "geometry": [ "line" ], @@ -7399,7 +7399,7 @@ "name": "Bridle Path" }, "highway/bus_guideway": { - "icon": "highway-bus_guideway", + "icon": "iD-highway-bus_guideway", "fields": [ "name", "operator", @@ -7425,7 +7425,7 @@ "name": "Bus Guideway" }, "highway/corridor": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "width", @@ -7544,7 +7544,7 @@ "name": "Pedestrian Crosswalk" }, "highway/cycleway": { - "icon": "highway-cycleway", + "icon": "iD-highway-cycleway", "fields": [ "name", "oneway", @@ -7585,7 +7585,7 @@ "name": "Elevator" }, "highway/footway": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "surface", @@ -7628,7 +7628,7 @@ "name": "Yield Sign" }, "highway/living_street": { - "icon": "highway-living-street", + "icon": "iD-highway-living-street", "fields": [ "name", "oneway", @@ -7675,7 +7675,7 @@ "name": "Motorway Junction / Exit" }, "highway/motorway_link": { - "icon": "highway-motorway-link", + "icon": "iD-highway-motorway-link", "fields": [ "name", "ref_road_number", @@ -7710,7 +7710,7 @@ "name": "Motorway Link" }, "highway/motorway": { - "icon": "highway-motorway", + "icon": "iD-highway-motorway", "fields": [ "name", "ref_road_number", @@ -7755,7 +7755,7 @@ "name": "Passing Place" }, "highway/path": { - "icon": "highway-path", + "icon": "iD-highway-path", "fields": [ "name", "surface", @@ -7814,7 +7814,7 @@ "name": "Pedestrian Area" }, "highway/pedestrian_line": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "surface", @@ -7841,7 +7841,7 @@ "name": "Pedestrian Street" }, "highway/primary_link": { - "icon": "highway-primary-link", + "icon": "iD-highway-primary-link", "fields": [ "name", "oneway", @@ -7869,7 +7869,7 @@ "name": "Primary Link" }, "highway/primary": { - "icon": "highway-primary", + "icon": "iD-highway-primary", "fields": [ "name", "oneway", @@ -7892,7 +7892,7 @@ "name": "Primary Road" }, "highway/raceway": { - "icon": "highway-unclassified", + "icon": "iD-highway-unclassified", "fields": [ "name", "oneway", @@ -7927,7 +7927,7 @@ "name": "Racetrack (Motorsport)" }, "highway/residential": { - "icon": "highway-residential", + "icon": "iD-highway-residential", "fields": [ "name", "oneway", @@ -7967,7 +7967,7 @@ "name": "Rest Area" }, "highway/road": { - "icon": "highway-road", + "icon": "iD-highway-road", "fields": [ "name", "oneway", @@ -7988,7 +7988,7 @@ "name": "Unknown Road" }, "highway/secondary_link": { - "icon": "highway-secondary-link", + "icon": "iD-highway-secondary-link", "fields": [ "name", "oneway", @@ -8016,7 +8016,7 @@ "name": "Secondary Link" }, "highway/secondary": { - "icon": "highway-secondary", + "icon": "iD-highway-secondary", "fields": [ "name", "oneway", @@ -8039,7 +8039,7 @@ "name": "Secondary Road" }, "highway/service": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "service", @@ -8060,7 +8060,7 @@ "name": "Service Road" }, "highway/service/alley": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", @@ -8084,7 +8084,7 @@ "name": "Alley" }, "highway/service/drive-through": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", @@ -8109,7 +8109,7 @@ "name": "Drive-Through" }, "highway/service/driveway": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", @@ -8133,7 +8133,7 @@ "name": "Driveway" }, "highway/service/emergency_access": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", @@ -8157,7 +8157,7 @@ "name": "Emergency Access" }, "highway/service/parking_aisle": { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", @@ -8217,7 +8217,7 @@ "name": "Speed Camera" }, "highway/steps": { - "icon": "highway-steps", + "icon": "iD-highway-steps", "fields": [ "surface", "lit", @@ -8281,7 +8281,7 @@ "name": "Street Lamp" }, "highway/tertiary_link": { - "icon": "highway-tertiary-link", + "icon": "iD-highway-tertiary-link", "fields": [ "name", "oneway", @@ -8309,7 +8309,7 @@ "name": "Tertiary Link" }, "highway/tertiary": { - "icon": "highway-tertiary", + "icon": "iD-highway-tertiary", "fields": [ "name", "oneway", @@ -8332,7 +8332,7 @@ "name": "Tertiary Road" }, "highway/track": { - "icon": "highway-track", + "icon": "iD-highway-track", "fields": [ "name", "tracktype", @@ -8421,7 +8421,7 @@ "name": "Traffic Signals" }, "highway/trunk_link": { - "icon": "highway-trunk-link", + "icon": "iD-highway-trunk-link", "fields": [ "name", "ref_road_number", @@ -8448,7 +8448,7 @@ "name": "Trunk Link" }, "highway/trunk": { - "icon": "highway-trunk", + "icon": "iD-highway-trunk", "fields": [ "name", "ref_road_number", @@ -8497,7 +8497,7 @@ "name": "Turning Loop (Island)" }, "highway/unclassified": { - "icon": "highway-unclassified", + "icon": "iD-highway-unclassified", "fields": [ "name", "oneway", @@ -11266,7 +11266,7 @@ "name": "Swimming Pool" }, "leisure/track": { - "icon": "highway-road", + "icon": "iD-highway-road", "fields": [ "surface", "sport_racing_nonmotor", @@ -11638,7 +11638,7 @@ "name": "Pier" }, "man_made/pipeline": { - "icon": "pipeline-line", + "icon": "iD-pipeline-line", "fields": [ "location", "operator", @@ -13911,7 +13911,7 @@ "name": "Wind Turbine" }, "power/line": { - "icon": "power-line", + "icon": "iD-power-line", "fields": [ "name", "operator", @@ -13927,7 +13927,7 @@ "name": "Power Line" }, "power/minor_line": { - "icon": "power-line", + "icon": "iD-power-line", "fields": [ "name", "operator", @@ -14066,7 +14066,7 @@ "name": "Transformer" }, "public_transport/linear_platform_aerialway": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14100,7 +14100,7 @@ "name": "Aerialway Stop / Platform" }, "public_transport/linear_platform_bus": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14143,7 +14143,7 @@ "name": "Bus Stop / Platform" }, "public_transport/linear_platform_ferry": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14179,7 +14179,7 @@ "name": "Ferry Stop / Platform" }, "public_transport/linear_platform_light_rail": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14227,7 +14227,7 @@ "name": "Light Rail Stop / Platform" }, "public_transport/linear_platform_monorail": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14271,7 +14271,7 @@ "name": "Monorail Stop / Platform" }, "public_transport/linear_platform_subway": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14318,7 +14318,7 @@ "name": "Subway Stop / Platform" }, "public_transport/linear_platform_train": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14363,7 +14363,7 @@ "name": "Train Stop / Platform" }, "public_transport/linear_platform_tram": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14412,7 +14412,7 @@ "name": "Tram Stop / Platform" }, "public_transport/linear_platform_trolleybus": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -14460,7 +14460,7 @@ "name": "Trolleybus Stop / Platform" }, "public_transport/linear_platform": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -15809,7 +15809,7 @@ "searchable": false }, "railway/platform": { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", @@ -15877,7 +15877,7 @@ "searchable": false }, "railway/abandoned": { - "icon": "railway-abandoned", + "icon": "iD-railway-abandoned", "fields": [ "name", "structure", @@ -15941,7 +15941,7 @@ "name": "Railway Derailer" }, "railway/disused": { - "icon": "railway-disused", + "icon": "iD-railway-disused", "fields": [ "structure", "service_rail", @@ -15957,7 +15957,7 @@ "name": "Disused Railway" }, "railway/funicular": { - "icon": "railway-rail", + "icon": "iD-railway-rail", "geometry": [ "line" ], @@ -15997,7 +15997,7 @@ "name": "Railway Crossing (Road)" }, "railway/light_rail": { - "icon": "railway-light-rail", + "icon": "iD-railway-light-rail", "fields": [ "name", "structure", @@ -16040,7 +16040,7 @@ "name": "Railway Milestone" }, "railway/miniature": { - "icon": "railway-rail", + "icon": "iD-railway-rail", "geometry": [ "line" ], @@ -16062,7 +16062,7 @@ "name": "Miniature Railway" }, "railway/monorail": { - "icon": "railway-monorail", + "icon": "iD-railway-monorail", "fields": [ "name", "structure", @@ -16082,7 +16082,7 @@ "name": "Monorail" }, "railway/narrow_gauge": { - "icon": "railway-rail", + "icon": "iD-railway-rail", "fields": [ "name", "structure", @@ -16106,7 +16106,7 @@ "name": "Narrow Gauge Rail" }, "railway/rail": { - "icon": "railway-rail", + "icon": "iD-railway-rail", "fields": [ "name", "structure", @@ -16166,7 +16166,7 @@ "name": "Subway Entrance" }, "railway/subway": { - "icon": "railway-subway", + "icon": "iD-railway-subway", "fields": [ "name", "structure", @@ -16224,7 +16224,7 @@ "name": "Train Wash" }, "railway/tram": { - "icon": "railway-light-rail", + "icon": "iD-railway-light-rail", "fields": [ "name", "structure", @@ -16250,7 +16250,7 @@ "name": "Tram" }, "relation": { - "icon": "relation", + "icon": "iD-relation", "fields": [ "name", "relation" @@ -16262,7 +16262,7 @@ "name": "Relation" }, "route/ferry": { - "icon": "ferry-line", + "icon": "iD-ferry-line", "geometry": [ "line" ], @@ -19811,7 +19811,7 @@ "name": "Speed Table" }, "type/multipolygon": { - "icon": "multipolygon", + "icon": "iD-multipolygon", "geometry": [ "area", "relation" @@ -19825,7 +19825,7 @@ "matchScore": 0.1 }, "type/boundary": { - "icon": "boundary", + "icon": "iD-boundary", "fields": [ "name", "boundary" @@ -19858,7 +19858,7 @@ "name": "Administrative Boundary" }, "type/restriction": { - "icon": "restriction", + "icon": "iD-restriction", "fields": [ "name", "restriction", @@ -19873,7 +19873,7 @@ "name": "Restriction" }, "type/restriction/no_left_turn": { - "icon": "restriction-no-left-turn", + "icon": "iD-restriction-no-left-turn", "fields": [ "except" ], @@ -19887,7 +19887,7 @@ "name": "No Left Turn" }, "type/restriction/no_right_turn": { - "icon": "restriction-no-right-turn", + "icon": "iD-restriction-no-right-turn", "fields": [ "except" ], @@ -19901,7 +19901,7 @@ "name": "No Right Turn" }, "type/restriction/no_straight_on": { - "icon": "restriction-no-straight-on", + "icon": "iD-restriction-no-straight-on", "fields": [ "except" ], @@ -19915,7 +19915,7 @@ "name": "No Straight On" }, "type/restriction/no_u_turn": { - "icon": "restriction-no-u-turn", + "icon": "iD-restriction-no-u-turn", "fields": [ "except" ], @@ -19929,7 +19929,7 @@ "name": "No U-turn" }, "type/restriction/only_left_turn": { - "icon": "restriction-only-left-turn", + "icon": "iD-restriction-only-left-turn", "fields": [ "except" ], @@ -19943,7 +19943,7 @@ "name": "Only Left Turn" }, "type/restriction/only_right_turn": { - "icon": "restriction-only-right-turn", + "icon": "iD-restriction-only-right-turn", "fields": [ "except" ], @@ -19957,7 +19957,7 @@ "name": "Only Right Turn" }, "type/restriction/only_straight_on": { - "icon": "restriction-only-straight-on", + "icon": "iD-restriction-only-straight-on", "fields": [ "except" ], @@ -19971,7 +19971,7 @@ "name": "Only Straight On" }, "type/restriction/only_u_turn": { - "icon": "restriction-only-u-turn", + "icon": "iD-restriction-only-u-turn", "fields": [ "except" ], @@ -19985,7 +19985,7 @@ "name": "Only U-turn" }, "type/route_master": { - "icon": "route-master", + "icon": "iD-route-master", "fields": [ "name", "route_master", @@ -20002,7 +20002,7 @@ "name": "Route Master" }, "type/route": { - "icon": "route", + "icon": "iD-route", "fields": [ "name", "route", @@ -20019,7 +20019,7 @@ "name": "Route" }, "type/route/bicycle": { - "icon": "route-bicycle", + "icon": "iD-route-bicycle", "fields": [ "name", "ref_route", @@ -20036,7 +20036,7 @@ "name": "Cycle Route" }, "type/route/bus": { - "icon": "route-bus", + "icon": "iD-route-bus", "fields": [ "name", "ref_route", @@ -20053,7 +20053,7 @@ "name": "Bus Route" }, "type/route/detour": { - "icon": "route-detour", + "icon": "iD-route-detour", "fields": [ "name", "ref_route" @@ -20068,7 +20068,7 @@ "name": "Detour Route" }, "type/route/ferry": { - "icon": "route-ferry", + "icon": "iD-route-ferry", "fields": [ "name", "ref_route", @@ -20085,7 +20085,7 @@ "name": "Ferry Route" }, "type/route/foot": { - "icon": "route-foot", + "icon": "iD-route-foot", "fields": [ "name", "ref_route", @@ -20102,7 +20102,7 @@ "name": "Foot Route" }, "type/route/hiking": { - "icon": "route-foot", + "icon": "iD-route-foot", "fields": [ "name", "ref_route", @@ -20121,7 +20121,7 @@ "name": "Hiking Route" }, "type/route/horse": { - "icon": "route-horse", + "icon": "iD-route-horse", "fields": [ "name", "ref_route", @@ -20140,7 +20140,7 @@ "name": "Riding Route" }, "type/route/light_rail": { - "icon": "route-light-rail", + "icon": "iD-route-light-rail", "fields": [ "name", "ref_route", @@ -20157,7 +20157,7 @@ "name": "Light Rail Route" }, "type/route/pipeline": { - "icon": "route-pipeline", + "icon": "iD-route-pipeline", "fields": [ "name", "ref_route", @@ -20173,7 +20173,7 @@ "name": "Pipeline Route" }, "type/route/piste": { - "icon": "route-piste", + "icon": "iD-route-piste", "fields": [ "name", "ref_route", @@ -20190,7 +20190,7 @@ "name": "Piste/Ski Route" }, "type/route/power": { - "icon": "route-power", + "icon": "iD-route-power", "fields": [ "name", "ref_route", @@ -20206,7 +20206,7 @@ "name": "Power Route" }, "type/route/road": { - "icon": "route-road", + "icon": "iD-route-road", "fields": [ "name", "ref_route", @@ -20222,7 +20222,7 @@ "name": "Road Route" }, "type/route/subway": { - "icon": "route-subway", + "icon": "iD-route-subway", "fields": [ "name", "ref_route", @@ -20239,7 +20239,7 @@ "name": "Subway Route" }, "type/route/train": { - "icon": "route-train", + "icon": "iD-route-train", "fields": [ "name", "ref_route", @@ -20256,7 +20256,7 @@ "name": "Train Route" }, "type/route/tram": { - "icon": "route-tram", + "icon": "iD-route-tram", "fields": [ "name", "ref_route", @@ -20273,7 +20273,7 @@ "name": "Tram Route" }, "type/site": { - "icon": "relation", + "icon": "iD-relation", "fields": [ "name", "site" @@ -20287,7 +20287,7 @@ "name": "Site" }, "type/waterway": { - "icon": "route-water", + "icon": "iD-route-water", "fields": [ "name", "waterway", @@ -20329,7 +20329,7 @@ "name": "Boatyard" }, "waterway/canal": { - "icon": "waterway-canal", + "icon": "iD-waterway-canal", "fields": [ "name", "width", @@ -20360,7 +20360,7 @@ "name": "Dam" }, "waterway/ditch": { - "icon": "waterway-ditch", + "icon": "iD-waterway-ditch", "fields": [ "structure_waterway", "intermittent" @@ -20397,7 +20397,7 @@ "name": "Wet Dock / Dry Dock" }, "waterway/drain": { - "icon": "waterway-ditch", + "icon": "iD-waterway-ditch", "fields": [ "structure_waterway", "intermittent" @@ -20435,7 +20435,7 @@ "name": "Marine Fuel Station" }, "waterway/river": { - "icon": "waterway-river", + "icon": "iD-waterway-river", "fields": [ "name", "structure_waterway", @@ -20507,7 +20507,7 @@ "name": "Marine Toilet Disposal" }, "waterway/stream_intermittent": { - "icon": "waterway-stream", + "icon": "iD-waterway-stream", "fields": [ "name", "structure_waterway", @@ -20550,7 +20550,7 @@ "name": "Intermittent Stream" }, "waterway/stream": { - "icon": "waterway-stream", + "icon": "iD-waterway-stream", "fields": [ "name", "structure_waterway", diff --git a/data/presets/presets/footway/crosswalk-raised.json b/data/presets/presets/footway/crosswalk-raised.json index 7d337fb37..f4da4f255 100644 --- a/data/presets/presets/footway/crosswalk-raised.json +++ b/data/presets/presets/footway/crosswalk-raised.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "crossing", "access", diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json index 61cffbad7..a73153777 100644 --- a/data/presets/presets/footway/crosswalk.json +++ b/data/presets/presets/footway/crosswalk.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "crossing", "access", diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json index f51b44cf9..ed2074fab 100644 --- a/data/presets/presets/footway/sidewalk.json +++ b/data/presets/presets/footway/sidewalk.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "surface", "lit", diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json index 1d71f10e1..c701c6098 100644 --- a/data/presets/presets/highway/bridleway.json +++ b/data/presets/presets/highway/bridleway.json @@ -6,7 +6,7 @@ "structure", "access" ], - "icon": "highway-bridleway", + "icon": "iD-highway-bridleway", "geometry": [ "line" ], diff --git a/data/presets/presets/highway/bus_guideway.json b/data/presets/presets/highway/bus_guideway.json index f781c848e..5aec8fb0a 100644 --- a/data/presets/presets/highway/bus_guideway.json +++ b/data/presets/presets/highway/bus_guideway.json @@ -1,5 +1,5 @@ { - "icon": "highway-bus_guideway", + "icon": "iD-highway-bus_guideway", "fields": [ "name", "operator", diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json index 400744430..bbb551230 100644 --- a/data/presets/presets/highway/corridor.json +++ b/data/presets/presets/highway/corridor.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "width", diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 1c45567d1..9f8ecc875 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -1,5 +1,5 @@ { - "icon": "highway-cycleway", + "icon": "iD-highway-cycleway", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index 1e26b1d7f..2715da8db 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "surface", diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index 52f78ce74..22c54a9eb 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -1,5 +1,5 @@ { - "icon": "highway-living-street", + "icon": "iD-highway-living-street", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index f8ec07908..b15afb2b3 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -1,5 +1,5 @@ { - "icon": "highway-motorway", + "icon": "iD-highway-motorway", "fields": [ "name", "ref_road_number", diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json index 5ff746552..4dc91b42c 100644 --- a/data/presets/presets/highway/motorway_link.json +++ b/data/presets/presets/highway/motorway_link.json @@ -1,5 +1,5 @@ { - "icon": "highway-motorway-link", + "icon": "iD-highway-motorway-link", "fields": [ "name", "ref_road_number", diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json index d8af52105..a5f01c3a0 100644 --- a/data/presets/presets/highway/path.json +++ b/data/presets/presets/highway/path.json @@ -1,5 +1,5 @@ { - "icon": "highway-path", + "icon": "iD-highway-path", "fields": [ "name", "surface", diff --git a/data/presets/presets/highway/pedestrian_line.json b/data/presets/presets/highway/pedestrian_line.json index 1f98db37f..4b8fabd47 100644 --- a/data/presets/presets/highway/pedestrian_line.json +++ b/data/presets/presets/highway/pedestrian_line.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "surface", diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index be3d7112f..61f4e8e32 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -1,5 +1,5 @@ { - "icon": "highway-primary", + "icon": "iD-highway-primary", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json index 029f1e522..306e203ed 100644 --- a/data/presets/presets/highway/primary_link.json +++ b/data/presets/presets/highway/primary_link.json @@ -1,5 +1,5 @@ { - "icon": "highway-primary-link", + "icon": "iD-highway-primary-link", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json index 090995803..1edf34525 100644 --- a/data/presets/presets/highway/raceway.json +++ b/data/presets/presets/highway/raceway.json @@ -1,5 +1,5 @@ { - "icon": "highway-unclassified", + "icon": "iD-highway-unclassified", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index 416577327..0e06ed151 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -1,5 +1,5 @@ { - "icon": "highway-residential", + "icon": "iD-highway-residential", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index d9b1230db..adfb6a0b9 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -1,5 +1,5 @@ { - "icon": "highway-road", + "icon": "iD-highway-road", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index eb4b623b9..d5c9db230 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -1,5 +1,5 @@ { - "icon": "highway-secondary", + "icon": "iD-highway-secondary", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json index 6573a1fae..029ace65b 100644 --- a/data/presets/presets/highway/secondary_link.json +++ b/data/presets/presets/highway/secondary_link.json @@ -1,5 +1,5 @@ { - "icon": "highway-secondary-link", + "icon": "iD-highway-secondary-link", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 1fd17ff6e..6e7ec4dca 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "service", diff --git a/data/presets/presets/highway/service/alley.json b/data/presets/presets/highway/service/alley.json index a6d10ce80..23297a00c 100644 --- a/data/presets/presets/highway/service/alley.json +++ b/data/presets/presets/highway/service/alley.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json index 8dd62232b..f55cf5c43 100644 --- a/data/presets/presets/highway/service/drive-through.json +++ b/data/presets/presets/highway/service/drive-through.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/service/driveway.json b/data/presets/presets/highway/service/driveway.json index 8bc00df10..3614bcea8 100644 --- a/data/presets/presets/highway/service/driveway.json +++ b/data/presets/presets/highway/service/driveway.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/service/emergency_access.json b/data/presets/presets/highway/service/emergency_access.json index 8c9e750f9..97d795e4c 100644 --- a/data/presets/presets/highway/service/emergency_access.json +++ b/data/presets/presets/highway/service/emergency_access.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/service/parking_aisle.json b/data/presets/presets/highway/service/parking_aisle.json index 1e6d54c1d..a733d3c7b 100644 --- a/data/presets/presets/highway/service/parking_aisle.json +++ b/data/presets/presets/highway/service/parking_aisle.json @@ -1,5 +1,5 @@ { - "icon": "highway-service", + "icon": "iD-highway-service", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json index dd30b5778..03f3a61fe 100644 --- a/data/presets/presets/highway/steps.json +++ b/data/presets/presets/highway/steps.json @@ -1,5 +1,5 @@ { - "icon": "highway-steps", + "icon": "iD-highway-steps", "fields": [ "surface", "lit", diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index 751b3a1c8..aef7a8467 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -1,5 +1,5 @@ { - "icon": "highway-tertiary", + "icon": "iD-highway-tertiary", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json index 54261bccc..12ed9bf1a 100644 --- a/data/presets/presets/highway/tertiary_link.json +++ b/data/presets/presets/highway/tertiary_link.json @@ -1,5 +1,5 @@ { - "icon": "highway-tertiary-link", + "icon": "iD-highway-tertiary-link", "fields": [ "name", "oneway", diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index 1ea0dc579..016f458ca 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -1,5 +1,5 @@ { - "icon": "highway-track", + "icon": "iD-highway-track", "fields": [ "name", "tracktype", diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index c18b48e2a..c315fe3ca 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -1,5 +1,5 @@ { - "icon": "highway-trunk", + "icon": "iD-highway-trunk", "fields": [ "name", "ref_road_number", diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json index 8c767f369..69972a4ef 100644 --- a/data/presets/presets/highway/trunk_link.json +++ b/data/presets/presets/highway/trunk_link.json @@ -1,5 +1,5 @@ { - "icon": "highway-trunk-link", + "icon": "iD-highway-trunk-link", "fields": [ "name", "ref_road_number", diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 4418b9ccc..592c17f5b 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -1,5 +1,5 @@ { - "icon": "highway-unclassified", + "icon": "iD-highway-unclassified", "fields": [ "name", "oneway", diff --git a/data/presets/presets/leisure/track.json b/data/presets/presets/leisure/track.json index 8f6a6a0ff..b3e037f63 100644 --- a/data/presets/presets/leisure/track.json +++ b/data/presets/presets/leisure/track.json @@ -1,5 +1,5 @@ { - "icon": "highway-road", + "icon": "iD-highway-road", "fields": [ "surface", "sport_racing_nonmotor", diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json index e5cae8b85..2106ac717 100644 --- a/data/presets/presets/man_made/pipeline.json +++ b/data/presets/presets/man_made/pipeline.json @@ -1,5 +1,5 @@ { - "icon": "pipeline-line", + "icon": "iD-pipeline-line", "fields": [ "location", "operator", diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json index eded63610..aabbea1e4 100644 --- a/data/presets/presets/power/line.json +++ b/data/presets/presets/power/line.json @@ -1,5 +1,5 @@ { - "icon": "power-line", + "icon": "iD-power-line", "fields": [ "name", "operator", diff --git a/data/presets/presets/power/minor_line.json b/data/presets/presets/power/minor_line.json index bcf793508..d935459de 100644 --- a/data/presets/presets/power/minor_line.json +++ b/data/presets/presets/power/minor_line.json @@ -1,5 +1,5 @@ { - "icon": "power-line", + "icon": "iD-power-line", "fields": [ "name", "operator", diff --git a/data/presets/presets/public_transport/linear_platform.json b/data/presets/presets/public_transport/linear_platform.json index 3c148919f..7eb4126e1 100644 --- a/data/presets/presets/public_transport/linear_platform.json +++ b/data/presets/presets/public_transport/linear_platform.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_aerialway.json b/data/presets/presets/public_transport/linear_platform_aerialway.json index cf2a7ffaa..404ac9750 100644 --- a/data/presets/presets/public_transport/linear_platform_aerialway.json +++ b/data/presets/presets/public_transport/linear_platform_aerialway.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_bus.json b/data/presets/presets/public_transport/linear_platform_bus.json index ab9db4a70..02fddd9e3 100644 --- a/data/presets/presets/public_transport/linear_platform_bus.json +++ b/data/presets/presets/public_transport/linear_platform_bus.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_ferry.json b/data/presets/presets/public_transport/linear_platform_ferry.json index c10fafb67..10dcb3d12 100644 --- a/data/presets/presets/public_transport/linear_platform_ferry.json +++ b/data/presets/presets/public_transport/linear_platform_ferry.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_light_rail.json b/data/presets/presets/public_transport/linear_platform_light_rail.json index b131b51dd..5907ec68d 100644 --- a/data/presets/presets/public_transport/linear_platform_light_rail.json +++ b/data/presets/presets/public_transport/linear_platform_light_rail.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_monorail.json b/data/presets/presets/public_transport/linear_platform_monorail.json index de25f2e75..b39ce3489 100644 --- a/data/presets/presets/public_transport/linear_platform_monorail.json +++ b/data/presets/presets/public_transport/linear_platform_monorail.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_subway.json b/data/presets/presets/public_transport/linear_platform_subway.json index dfd7121f6..89364b043 100644 --- a/data/presets/presets/public_transport/linear_platform_subway.json +++ b/data/presets/presets/public_transport/linear_platform_subway.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_train.json b/data/presets/presets/public_transport/linear_platform_train.json index a88238117..2837918f0 100644 --- a/data/presets/presets/public_transport/linear_platform_train.json +++ b/data/presets/presets/public_transport/linear_platform_train.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_tram.json b/data/presets/presets/public_transport/linear_platform_tram.json index aa9bb7119..e60adbef0 100644 --- a/data/presets/presets/public_transport/linear_platform_tram.json +++ b/data/presets/presets/public_transport/linear_platform_tram.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/public_transport/linear_platform_trolleybus.json b/data/presets/presets/public_transport/linear_platform_trolleybus.json index 4ecd1ca57..17f0a5ff7 100644 --- a/data/presets/presets/public_transport/linear_platform_trolleybus.json +++ b/data/presets/presets/public_transport/linear_platform_trolleybus.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/railway/_platform.json b/data/presets/presets/railway/_platform.json index 77aae430a..6d1cb6a28 100644 --- a/data/presets/presets/railway/_platform.json +++ b/data/presets/presets/railway/_platform.json @@ -1,5 +1,5 @@ { - "icon": "highway-footway", + "icon": "iD-highway-footway", "fields": [ "name", "ref_platform", diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json index e452daf3a..de78e95dd 100644 --- a/data/presets/presets/railway/abandoned.json +++ b/data/presets/presets/railway/abandoned.json @@ -1,5 +1,5 @@ { - "icon": "railway-abandoned", + "icon": "iD-railway-abandoned", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json index 60c1491ea..816b6df4f 100644 --- a/data/presets/presets/railway/disused.json +++ b/data/presets/presets/railway/disused.json @@ -1,5 +1,5 @@ { - "icon": "railway-disused", + "icon": "iD-railway-disused", "fields": [ "structure", "service_rail", diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json index 392320523..b060b9d46 100644 --- a/data/presets/presets/railway/funicular.json +++ b/data/presets/presets/railway/funicular.json @@ -1,5 +1,5 @@ { - "icon": "railway-rail", + "icon": "iD-railway-rail", "geometry": [ "line" ], diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json index c990b43c5..8d6c390eb 100644 --- a/data/presets/presets/railway/light_rail.json +++ b/data/presets/presets/railway/light_rail.json @@ -1,5 +1,5 @@ { - "icon": "railway-light-rail", + "icon": "iD-railway-light-rail", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json index cabbc299e..d8757b5a8 100644 --- a/data/presets/presets/railway/miniature.json +++ b/data/presets/presets/railway/miniature.json @@ -1,5 +1,5 @@ { - "icon": "railway-rail", + "icon": "iD-railway-rail", "geometry": [ "line" ], diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json index 0034d2ce7..3c02f7db0 100644 --- a/data/presets/presets/railway/monorail.json +++ b/data/presets/presets/railway/monorail.json @@ -1,5 +1,5 @@ { - "icon": "railway-monorail", + "icon": "iD-railway-monorail", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json index 9b3708ddf..d9bfe70fd 100644 --- a/data/presets/presets/railway/narrow_gauge.json +++ b/data/presets/presets/railway/narrow_gauge.json @@ -1,5 +1,5 @@ { - "icon": "railway-rail", + "icon": "iD-railway-rail", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index d50f322e6..9382cb77c 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -1,5 +1,5 @@ { - "icon": "railway-rail", + "icon": "iD-railway-rail", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json index ba1e1b800..155029d62 100644 --- a/data/presets/presets/railway/subway.json +++ b/data/presets/presets/railway/subway.json @@ -1,5 +1,5 @@ { - "icon": "railway-subway", + "icon": "iD-railway-subway", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json index 449a75709..58a770794 100644 --- a/data/presets/presets/railway/tram.json +++ b/data/presets/presets/railway/tram.json @@ -1,5 +1,5 @@ { - "icon": "railway-light-rail", + "icon": "iD-railway-light-rail", "fields": [ "name", "structure", diff --git a/data/presets/presets/relation.json b/data/presets/presets/relation.json index f3fee68c6..65f477ca7 100644 --- a/data/presets/presets/relation.json +++ b/data/presets/presets/relation.json @@ -1,5 +1,5 @@ { - "icon": "relation", + "icon": "iD-relation", "fields": [ "name", "relation" diff --git a/data/presets/presets/route/ferry.json b/data/presets/presets/route/ferry.json index df152dcf0..4a33de905 100644 --- a/data/presets/presets/route/ferry.json +++ b/data/presets/presets/route/ferry.json @@ -1,5 +1,5 @@ { - "icon": "ferry-line", + "icon": "iD-ferry-line", "geometry": [ "line" ], diff --git a/data/presets/presets/type/_multipolygon.json b/data/presets/presets/type/_multipolygon.json index db6cc93c0..68038b797 100644 --- a/data/presets/presets/type/_multipolygon.json +++ b/data/presets/presets/type/_multipolygon.json @@ -1,5 +1,5 @@ { - "icon": "multipolygon", + "icon": "iD-multipolygon", "geometry": [ "area", "relation" diff --git a/data/presets/presets/type/boundary.json b/data/presets/presets/type/boundary.json index da0f19b96..6786b604a 100644 --- a/data/presets/presets/type/boundary.json +++ b/data/presets/presets/type/boundary.json @@ -1,5 +1,5 @@ { - "icon": "boundary", + "icon": "iD-boundary", "fields": [ "name", "boundary" diff --git a/data/presets/presets/type/restriction.json b/data/presets/presets/type/restriction.json index 47a8bf117..dd54ccfc4 100644 --- a/data/presets/presets/type/restriction.json +++ b/data/presets/presets/type/restriction.json @@ -1,5 +1,5 @@ { - "icon": "restriction", + "icon": "iD-restriction", "fields": [ "name", "restriction", diff --git a/data/presets/presets/type/restriction/no_left_turn.json b/data/presets/presets/type/restriction/no_left_turn.json index 66b231d6c..eab504c9b 100644 --- a/data/presets/presets/type/restriction/no_left_turn.json +++ b/data/presets/presets/type/restriction/no_left_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-no-left-turn", + "icon": "iD-restriction-no-left-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/no_right_turn.json b/data/presets/presets/type/restriction/no_right_turn.json index c0e2bd4fb..736a21c12 100644 --- a/data/presets/presets/type/restriction/no_right_turn.json +++ b/data/presets/presets/type/restriction/no_right_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-no-right-turn", + "icon": "iD-restriction-no-right-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/no_straight_on.json b/data/presets/presets/type/restriction/no_straight_on.json index e5c813e0e..749063009 100644 --- a/data/presets/presets/type/restriction/no_straight_on.json +++ b/data/presets/presets/type/restriction/no_straight_on.json @@ -1,5 +1,5 @@ { - "icon": "restriction-no-straight-on", + "icon": "iD-restriction-no-straight-on", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/no_u_turn.json b/data/presets/presets/type/restriction/no_u_turn.json index f4b0ed7dd..41cb1b7d7 100644 --- a/data/presets/presets/type/restriction/no_u_turn.json +++ b/data/presets/presets/type/restriction/no_u_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-no-u-turn", + "icon": "iD-restriction-no-u-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/only_left_turn.json b/data/presets/presets/type/restriction/only_left_turn.json index 4b33e52c6..e2130624d 100644 --- a/data/presets/presets/type/restriction/only_left_turn.json +++ b/data/presets/presets/type/restriction/only_left_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-only-left-turn", + "icon": "iD-restriction-only-left-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/only_right_turn.json b/data/presets/presets/type/restriction/only_right_turn.json index c34bdf2b3..f387106fb 100644 --- a/data/presets/presets/type/restriction/only_right_turn.json +++ b/data/presets/presets/type/restriction/only_right_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-only-right-turn", + "icon": "iD-restriction-only-right-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/only_straight_on.json b/data/presets/presets/type/restriction/only_straight_on.json index 0568acee2..154d57efe 100644 --- a/data/presets/presets/type/restriction/only_straight_on.json +++ b/data/presets/presets/type/restriction/only_straight_on.json @@ -1,5 +1,5 @@ { - "icon": "restriction-only-straight-on", + "icon": "iD-restriction-only-straight-on", "fields": [ "except" ], diff --git a/data/presets/presets/type/restriction/only_u_turn.json b/data/presets/presets/type/restriction/only_u_turn.json index f04e46361..94aac9b43 100644 --- a/data/presets/presets/type/restriction/only_u_turn.json +++ b/data/presets/presets/type/restriction/only_u_turn.json @@ -1,5 +1,5 @@ { - "icon": "restriction-only-u-turn", + "icon": "iD-restriction-only-u-turn", "fields": [ "except" ], diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json index 37463d61f..b6ef80bbc 100644 --- a/data/presets/presets/type/route.json +++ b/data/presets/presets/type/route.json @@ -1,5 +1,5 @@ { - "icon": "route", + "icon": "iD-route", "fields": [ "name", "route", diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json index 871c3d6e1..6efc659a5 100644 --- a/data/presets/presets/type/route/bicycle.json +++ b/data/presets/presets/type/route/bicycle.json @@ -1,5 +1,5 @@ { - "icon": "route-bicycle", + "icon": "iD-route-bicycle", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json index ad3a696a6..b62cc5fc1 100644 --- a/data/presets/presets/type/route/bus.json +++ b/data/presets/presets/type/route/bus.json @@ -1,5 +1,5 @@ { - "icon": "route-bus", + "icon": "iD-route-bus", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json index 31013590e..879ada780 100644 --- a/data/presets/presets/type/route/detour.json +++ b/data/presets/presets/type/route/detour.json @@ -1,5 +1,5 @@ { - "icon": "route-detour", + "icon": "iD-route-detour", "fields": [ "name", "ref_route" diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json index 407aaa5e6..eacec19d8 100644 --- a/data/presets/presets/type/route/ferry.json +++ b/data/presets/presets/type/route/ferry.json @@ -1,5 +1,5 @@ { - "icon": "route-ferry", + "icon": "iD-route-ferry", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json index 5a71ab61e..91c5706be 100644 --- a/data/presets/presets/type/route/foot.json +++ b/data/presets/presets/type/route/foot.json @@ -1,5 +1,5 @@ { - "icon": "route-foot", + "icon": "iD-route-foot", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json index 7a84fbfe5..db0c04889 100644 --- a/data/presets/presets/type/route/hiking.json +++ b/data/presets/presets/type/route/hiking.json @@ -1,5 +1,5 @@ { - "icon": "route-foot", + "icon": "iD-route-foot", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json index 06e903933..a524346d8 100644 --- a/data/presets/presets/type/route/horse.json +++ b/data/presets/presets/type/route/horse.json @@ -1,5 +1,5 @@ { - "icon": "route-horse", + "icon": "iD-route-horse", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json index ba5bf2de0..8bf10a7ad 100644 --- a/data/presets/presets/type/route/light_rail.json +++ b/data/presets/presets/type/route/light_rail.json @@ -1,5 +1,5 @@ { - "icon": "route-light-rail", + "icon": "iD-route-light-rail", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json index 75413ae16..5f6cadbdc 100644 --- a/data/presets/presets/type/route/pipeline.json +++ b/data/presets/presets/type/route/pipeline.json @@ -1,5 +1,5 @@ { - "icon": "route-pipeline", + "icon": "iD-route-pipeline", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/piste.json b/data/presets/presets/type/route/piste.json index bb180f302..d670b77b3 100644 --- a/data/presets/presets/type/route/piste.json +++ b/data/presets/presets/type/route/piste.json @@ -1,5 +1,5 @@ { - "icon": "route-piste", + "icon": "iD-route-piste", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json index 232846eea..d3f4d1865 100644 --- a/data/presets/presets/type/route/power.json +++ b/data/presets/presets/type/route/power.json @@ -1,5 +1,5 @@ { - "icon": "route-power", + "icon": "iD-route-power", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json index 5ea1994ce..875c1d57c 100644 --- a/data/presets/presets/type/route/road.json +++ b/data/presets/presets/type/route/road.json @@ -1,5 +1,5 @@ { - "icon": "route-road", + "icon": "iD-route-road", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json index c9258a8c9..013bd804c 100644 --- a/data/presets/presets/type/route/subway.json +++ b/data/presets/presets/type/route/subway.json @@ -1,5 +1,5 @@ { - "icon": "route-subway", + "icon": "iD-route-subway", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index f1767eb98..64d740478 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -1,5 +1,5 @@ { - "icon": "route-train", + "icon": "iD-route-train", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json index 2c45840f4..0706d2b68 100644 --- a/data/presets/presets/type/route/tram.json +++ b/data/presets/presets/type/route/tram.json @@ -1,5 +1,5 @@ { - "icon": "route-tram", + "icon": "iD-route-tram", "fields": [ "name", "ref_route", diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json index 9a29ce9a4..1a350bbd4 100644 --- a/data/presets/presets/type/route_master.json +++ b/data/presets/presets/type/route_master.json @@ -1,5 +1,5 @@ { - "icon": "route-master", + "icon": "iD-route-master", "fields": [ "name", "route_master", diff --git a/data/presets/presets/type/site.json b/data/presets/presets/type/site.json index 7d7413c69..a234a7bdc 100644 --- a/data/presets/presets/type/site.json +++ b/data/presets/presets/type/site.json @@ -1,5 +1,5 @@ { - "icon": "relation", + "icon": "iD-relation", "fields": [ "name", "site" diff --git a/data/presets/presets/type/waterway.json b/data/presets/presets/type/waterway.json index ef9e0fe08..be2fed808 100644 --- a/data/presets/presets/type/waterway.json +++ b/data/presets/presets/type/waterway.json @@ -1,5 +1,5 @@ { - "icon": "route-water", + "icon": "iD-route-water", "fields": [ "name", "waterway", diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json index 2b22b0f57..5c170eb74 100644 --- a/data/presets/presets/waterway/canal.json +++ b/data/presets/presets/waterway/canal.json @@ -1,5 +1,5 @@ { - "icon": "waterway-canal", + "icon": "iD-waterway-canal", "fields": [ "name", "width", diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json index 496a4ec72..69f0f7d5a 100644 --- a/data/presets/presets/waterway/ditch.json +++ b/data/presets/presets/waterway/ditch.json @@ -1,5 +1,5 @@ { - "icon": "waterway-ditch", + "icon": "iD-waterway-ditch", "fields": [ "structure_waterway", "intermittent" diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json index 5ac9b9ea5..7fe3347ea 100644 --- a/data/presets/presets/waterway/drain.json +++ b/data/presets/presets/waterway/drain.json @@ -1,5 +1,5 @@ { - "icon": "waterway-ditch", + "icon": "iD-waterway-ditch", "fields": [ "structure_waterway", "intermittent" diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json index 50c2c91ee..95c4407c4 100644 --- a/data/presets/presets/waterway/river.json +++ b/data/presets/presets/waterway/river.json @@ -1,5 +1,5 @@ { - "icon": "waterway-river", + "icon": "iD-waterway-river", "fields": [ "name", "structure_waterway", diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json index 966a808ec..acb793eff 100644 --- a/data/presets/presets/waterway/stream.json +++ b/data/presets/presets/waterway/stream.json @@ -1,5 +1,5 @@ { - "icon": "waterway-stream", + "icon": "iD-waterway-stream", "fields": [ "name", "structure_waterway", diff --git a/data/presets/presets/waterway/stream_intermittent.json b/data/presets/presets/waterway/stream_intermittent.json index d74f62532..3df8d65e1 100644 --- a/data/presets/presets/waterway/stream_intermittent.json +++ b/data/presets/presets/waterway/stream_intermittent.json @@ -1,5 +1,5 @@ { - "icon": "waterway-stream", + "icon": "iD-waterway-stream", "fields": [ "name", "structure_waterway", diff --git a/data/taginfo.json b/data/taginfo.json index 566e0a1bc..9c530fc53 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3024,7 +3024,8 @@ "description": "Pedestrian Crosswalk", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "footway", @@ -3032,7 +3033,8 @@ "description": "Sidewalk", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "ford", @@ -3279,7 +3281,8 @@ "description": "Bridle Path", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-bridleway.svg?sanitize=true" }, { "key": "highway", @@ -3287,7 +3290,8 @@ "description": "Bus Guideway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-bus_guideway.svg?sanitize=true" }, { "key": "highway", @@ -3295,7 +3299,8 @@ "description": "Indoor Corridor", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "highway", @@ -3311,7 +3316,8 @@ "description": "Cycle Path", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-cycleway.svg?sanitize=true" }, { "key": "highway", @@ -3328,7 +3334,8 @@ "description": "Foot Path", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "highway", @@ -3345,7 +3352,8 @@ "description": "Living Street", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-living-street.svg?sanitize=true" }, { "key": "highway", @@ -3371,7 +3379,8 @@ "description": "Motorway Link", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-motorway-link.svg?sanitize=true" }, { "key": "highway", @@ -3379,7 +3388,8 @@ "description": "Motorway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-motorway.svg?sanitize=true" }, { "key": "highway", @@ -3396,7 +3406,8 @@ "description": "Path", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-path.svg?sanitize=true" }, { "key": "highway", @@ -3404,7 +3415,8 @@ "description": "Pedestrian Street", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "highway", @@ -3412,7 +3424,8 @@ "description": "Primary Link", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-primary-link.svg?sanitize=true" }, { "key": "highway", @@ -3420,7 +3433,8 @@ "description": "Primary Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-primary.svg?sanitize=true" }, { "key": "highway", @@ -3430,7 +3444,8 @@ "node", "way", "area" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-unclassified.svg?sanitize=true" }, { "key": "highway", @@ -3438,7 +3453,8 @@ "description": "Residential Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-residential.svg?sanitize=true" }, { "key": "highway", @@ -3456,7 +3472,8 @@ "description": "Unknown Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-road.svg?sanitize=true" }, { "key": "highway", @@ -3464,7 +3481,8 @@ "description": "Secondary Link", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-secondary-link.svg?sanitize=true" }, { "key": "highway", @@ -3472,7 +3490,8 @@ "description": "Secondary Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-secondary.svg?sanitize=true" }, { "key": "highway", @@ -3480,7 +3499,8 @@ "description": "Service Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "service", @@ -3488,7 +3508,8 @@ "description": "Alley", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "service", @@ -3496,7 +3517,8 @@ "description": "Drive-Through", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "service", @@ -3504,7 +3526,8 @@ "description": "Driveway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "service", @@ -3512,7 +3535,8 @@ "description": "Emergency Access", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "service", @@ -3520,7 +3544,8 @@ "description": "Parking Aisle", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-service.svg?sanitize=true" }, { "key": "highway", @@ -3547,7 +3572,8 @@ "description": "Steps", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-steps.svg?sanitize=true" }, { "key": "highway", @@ -3573,7 +3599,8 @@ "description": "Tertiary Link", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-tertiary-link.svg?sanitize=true" }, { "key": "highway", @@ -3581,7 +3608,8 @@ "description": "Tertiary Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-tertiary.svg?sanitize=true" }, { "key": "highway", @@ -3589,7 +3617,8 @@ "description": "Unmaintained Track Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-track.svg?sanitize=true" }, { "key": "highway", @@ -3614,7 +3643,8 @@ "description": "Trunk Link", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-trunk-link.svg?sanitize=true" }, { "key": "highway", @@ -3622,7 +3652,8 @@ "description": "Trunk Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-trunk.svg?sanitize=true" }, { "key": "highway", @@ -3648,7 +3679,8 @@ "description": "Minor/Unclassified Road", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-unclassified.svg?sanitize=true" }, { "key": "historic", @@ -4769,7 +4801,8 @@ "node", "way", "area" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-road.svg?sanitize=true" }, { "key": "leisure", @@ -4973,7 +5006,8 @@ "description": "Pipeline", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true" }, { "key": "man_made", @@ -6116,7 +6150,8 @@ "description": "Power Line", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true" }, { "key": "power", @@ -6124,7 +6159,8 @@ "description": "Minor Power Line", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true" }, { "key": "power", @@ -6187,7 +6223,8 @@ "description": "Aerialway Stop / Platform, Aerialway Station, Aerialway Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "bus", @@ -6195,7 +6232,8 @@ "description": "Bus Stop / Platform, Bus Station / Terminal, Bus Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "ferry", @@ -6203,7 +6241,8 @@ "description": "Ferry Stop / Platform, Ferry Station / Terminal, Ferry Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "light_rail", @@ -6211,7 +6250,8 @@ "description": "Light Rail Stop / Platform, Light Rail Station, Light Rail Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "monorail", @@ -6219,7 +6259,8 @@ "description": "Monorail Stop / Platform, Monorail Station, Monorail Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "subway", @@ -6227,7 +6268,8 @@ "description": "Subway Stop / Platform, Subway Station, Subway Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "train", @@ -6235,7 +6277,8 @@ "description": "Train Stop / Platform, Train Station, Train Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "tram", @@ -6243,7 +6286,8 @@ "description": "Tram Stop / Platform, Tram Station, Tram Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "trolleybus", @@ -6251,7 +6295,8 @@ "description": "Trolleybus Stop / Platform, Trolleybus Station / Terminal, Trolleybus Stopping Location", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "public_transport", @@ -6259,7 +6304,8 @@ "description": "Transit Stop / Platform", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "railway", @@ -6306,7 +6352,8 @@ "object_types": [ "way", "area" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, { "key": "railway", @@ -6333,7 +6380,8 @@ "description": "Abandoned Railway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-abandoned.svg?sanitize=true" }, { "key": "railway", @@ -6368,7 +6416,8 @@ "description": "Disused Railway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-disused.svg?sanitize=true" }, { "key": "railway", @@ -6376,7 +6425,8 @@ "description": "Funicular", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true" }, { "key": "railway", @@ -6393,7 +6443,8 @@ "description": "Light Rail", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-light-rail.svg?sanitize=true" }, { "key": "railway", @@ -6410,7 +6461,8 @@ "description": "Miniature Railway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true" }, { "key": "railway", @@ -6418,7 +6470,8 @@ "description": "Monorail", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-monorail.svg?sanitize=true" }, { "key": "railway", @@ -6426,7 +6479,8 @@ "description": "Narrow Gauge Rail", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true" }, { "key": "railway", @@ -6434,7 +6488,8 @@ "description": "Rail", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-rail.svg?sanitize=true" }, { "key": "railway", @@ -6460,7 +6515,8 @@ "description": "Subway", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-subway.svg?sanitize=true" }, { "key": "railway", @@ -6487,7 +6543,8 @@ "description": "Tram", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/railway-light-rail.svg?sanitize=true" }, { "key": "route", @@ -6495,7 +6552,8 @@ "description": "Ferry Route", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/ferry-line.svg?sanitize=true" }, { "key": "shop", @@ -8126,7 +8184,8 @@ "object_types": [ "area", "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/multipolygon.svg?sanitize=true" }, { "key": "type", @@ -8134,7 +8193,8 @@ "description": "Boundary", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/boundary.svg?sanitize=true" }, { "key": "type", @@ -8142,7 +8202,8 @@ "description": "Restriction", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction.svg?sanitize=true" }, { "key": "restriction", @@ -8150,7 +8211,8 @@ "description": "No Left Turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-left-turn.svg?sanitize=true" }, { "key": "restriction", @@ -8158,7 +8220,8 @@ "description": "No Right Turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-right-turn.svg?sanitize=true" }, { "key": "restriction", @@ -8166,7 +8229,8 @@ "description": "No Straight On", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-straight-on.svg?sanitize=true" }, { "key": "restriction", @@ -8174,7 +8238,8 @@ "description": "No U-turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-u-turn.svg?sanitize=true" }, { "key": "restriction", @@ -8182,7 +8247,8 @@ "description": "Only Left Turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-only-left-turn.svg?sanitize=true" }, { "key": "restriction", @@ -8190,7 +8256,8 @@ "description": "Only Right Turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-only-right-turn.svg?sanitize=true" }, { "key": "restriction", @@ -8198,7 +8265,8 @@ "description": "Only Straight On", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-only-straight-on.svg?sanitize=true" }, { "key": "restriction", @@ -8206,7 +8274,8 @@ "description": "Only U-turn", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-only-u-turn.svg?sanitize=true" }, { "key": "type", @@ -8214,7 +8283,8 @@ "description": "Route Master", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-master.svg?sanitize=true" }, { "key": "type", @@ -8222,7 +8292,8 @@ "description": "Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route.svg?sanitize=true" }, { "key": "route", @@ -8230,7 +8301,8 @@ "description": "Cycle Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-bicycle.svg?sanitize=true" }, { "key": "route", @@ -8238,7 +8310,8 @@ "description": "Bus Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-bus.svg?sanitize=true" }, { "key": "route", @@ -8246,7 +8319,8 @@ "description": "Detour Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-detour.svg?sanitize=true" }, { "key": "route", @@ -8254,7 +8328,8 @@ "description": "Foot Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-foot.svg?sanitize=true" }, { "key": "route", @@ -8262,7 +8337,8 @@ "description": "Hiking Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-foot.svg?sanitize=true" }, { "key": "route", @@ -8270,7 +8346,8 @@ "description": "Riding Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-horse.svg?sanitize=true" }, { "key": "route", @@ -8278,7 +8355,8 @@ "description": "Light Rail Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-light-rail.svg?sanitize=true" }, { "key": "route", @@ -8286,7 +8364,8 @@ "description": "Pipeline Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-pipeline.svg?sanitize=true" }, { "key": "route", @@ -8294,7 +8373,8 @@ "description": "Piste/Ski Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-piste.svg?sanitize=true" }, { "key": "route", @@ -8302,7 +8382,8 @@ "description": "Power Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-power.svg?sanitize=true" }, { "key": "route", @@ -8310,7 +8391,8 @@ "description": "Road Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-road.svg?sanitize=true" }, { "key": "route", @@ -8318,7 +8400,8 @@ "description": "Subway Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-subway.svg?sanitize=true" }, { "key": "route", @@ -8326,7 +8409,8 @@ "description": "Train Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-train.svg?sanitize=true" }, { "key": "route", @@ -8334,7 +8418,8 @@ "description": "Tram Route", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-tram.svg?sanitize=true" }, { "key": "type", @@ -8342,7 +8427,8 @@ "description": "Site", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true" }, { "key": "type", @@ -8350,7 +8436,8 @@ "description": "Waterway", "object_types": [ "relation" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-water.svg?sanitize=true" }, { "key": "waterway", @@ -8368,7 +8455,8 @@ "description": "Canal", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true" }, { "key": "waterway", @@ -8387,7 +8475,8 @@ "description": "Ditch", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true" }, { "key": "waterway", @@ -8405,7 +8494,8 @@ "description": "Drain", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true" }, { "key": "waterway", @@ -8423,7 +8513,8 @@ "description": "River", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true" }, { "key": "waterway", @@ -8450,7 +8541,8 @@ "description": "Intermittent Stream", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-stream.svg?sanitize=true" }, { "key": "waterway", @@ -8458,7 +8550,8 @@ "description": "Stream", "object_types": [ "way" - ] + ], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-stream.svg?sanitize=true" }, { "key": "waterway", diff --git a/modules/behavior/operation.js b/modules/behavior/operation.js index 88bc96e8b..61a62eb78 100644 --- a/modules/behavior/operation.js +++ b/modules/behavior/operation.js @@ -22,7 +22,7 @@ export function behaviorOperation() { if (disabled) { flash = uiFlash() .duration(4000) - .iconName('#operation-' + _operation.id) + .iconName('#iD-operation-' + _operation.id) .iconClass('operation disabled') .text(_operation.tooltip); @@ -31,7 +31,7 @@ export function behaviorOperation() { } else { flash = uiFlash() .duration(2000) - .iconName('#operation-' + _operation.id) + .iconName('#iD-operation-' + _operation.id) .iconClass('operation') .text(_operation.annotation() || _operation.title); diff --git a/modules/svg/turns.js b/modules/svg/turns.js index 007733afc..2d3ace24c 100644 --- a/modules/svg/turns.js +++ b/modules/svg/turns.js @@ -7,9 +7,9 @@ export function svgTurns(projection) { function icon(turn) { var u = turn.u ? '-u' : ''; - if (turn.no) return '#turn-no' + u; - if (turn.only) return '#turn-only' + u; - return '#turn-yes' + u; + if (turn.no) return '#iD-turn-no' + u; + if (turn.only) return '#iD-turn-only' + u; + return '#iD-turn-yes' + u; } var layer = selection.selectAll('.data-layer-osm').selectAll('.layer-turns') diff --git a/modules/ui/account.js b/modules/ui/account.js index adbd8990a..da45f3986 100644 --- a/modules/ui/account.js +++ b/modules/ui/account.js @@ -41,7 +41,7 @@ export function uiAccount(context) { .attr('src', details.image_url); } else { userLink - .call(svgIcon('#icon-avatar', 'pre-text light')); + .call(svgIcon('#iD-icon-avatar', 'pre-text light')); } // Add user name diff --git a/modules/ui/background.js b/modules/ui/background.js index 579108dc1..4dac81036 100644 --- a/modules/ui/background.js +++ b/modules/ui/background.js @@ -151,7 +151,7 @@ export function uiBackground(context) { .placement((textDirection === 'rtl') ? 'right' : 'left') ) .on('click', editCustom) - .call(svgIcon('#icon-edit')); + .call(svgIcon('#iD-icon-edit')); enter.filter(function(d) { return d.best(); }) .append('div') @@ -245,7 +245,7 @@ export function uiBackground(context) { .append('a') .attr('target', '_blank') .attr('tabindex', -1) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .attr('href', 'https://github.com/openstreetmap/iD/blob/master/FAQ.md#how-can-i-report-an-issue-with-background-imagery') .append('span') .text(t('background.imagery_source_faq')); @@ -347,7 +347,7 @@ export function uiBackground(context) { .append('button') .attr('tabindex', -1) .on('click', togglePane) - .call(svgIcon('#icon-layers', 'light')) + .call(svgIcon('#iD-icon-layers', 'light')) .call(paneTooltip); @@ -362,7 +362,7 @@ export function uiBackground(context) { heading .append('button') .on('click', function() { uiBackground.hidePane(); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); var content = pane diff --git a/modules/ui/background_display_options.js b/modules/ui/background_display_options.js index ba4a9113e..be3c27c30 100644 --- a/modules/ui/background_display_options.js +++ b/modules/ui/background_display_options.js @@ -94,7 +94,7 @@ export function uiBackgroundDisplayOptions(context) { if (d3_event.button !== 0) return; updateValue(d, 1); }) - .call(svgIcon('#icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'))); + .call(svgIcon('#iD-icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'))); // update diff --git a/modules/ui/background_offset.js b/modules/ui/background_offset.js index 295557de2..7a765591e 100644 --- a/modules/ui/background_offset.js +++ b/modules/ui/background_offset.js @@ -175,7 +175,7 @@ export function uiBackgroundOffset(context) { if (d3_event.button !== 0) return; resetOffset(); }) - .call(svgIcon('#icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'))); + .call(svgIcon('#iD-icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'))); updateValue(); } diff --git a/modules/ui/changeset_editor.js b/modules/ui/changeset_editor.js index 1552fedd6..fd40ae7ce 100644 --- a/modules/ui/changeset_editor.js +++ b/modules/ui/changeset_editor.js @@ -109,7 +109,7 @@ export function uiChangesetEditor(context) { .append('a') .attr('target', '_blank') .attr('tabindex', -1) - .call(svgIcon('#icon-alert', 'inline')) + .call(svgIcon('#iD-icon-alert', 'inline')) .attr('href', t('commit.google_warning_link')) .append('span') .text(t('commit.google_warning')); diff --git a/modules/ui/commit_changes.js b/modules/ui/commit_changes.js index 9d4f3effe..7ae906963 100644 --- a/modules/ui/commit_changes.js +++ b/modules/ui/commit_changes.js @@ -52,7 +52,7 @@ export function uiCommitChanges(context) { itemsEnter .each(function(d) { d3_select(this) - .call(svgIcon('#icon-' + d.entity.geometry(d.graph), 'pre-text ' + d.changeType)); + .call(svgIcon('#iD-icon-' + d.entity.geometry(d.graph), 'pre-text ' + d.changeType)); }); itemsEnter @@ -124,7 +124,7 @@ export function uiCommitChanges(context) { } linkEnter - .call(svgIcon('#icon-load', 'inline')) + .call(svgIcon('#iD-icon-load', 'inline')) .append('span') .text(t('commit.download_changes')); diff --git a/modules/ui/commit_warnings.js b/modules/ui/commit_warnings.js index 1dfba52cb..0c83cfbf5 100644 --- a/modules/ui/commit_warnings.js +++ b/modules/ui/commit_warnings.js @@ -45,7 +45,7 @@ export function uiCommitWarnings(context) { .attr('class', 'warning-item'); itemsEnter - .call(svgIcon('#icon-alert', 'pre-text')); + .call(svgIcon('#iD-icon-alert', 'pre-text')); itemsEnter .append('strong') diff --git a/modules/ui/conflicts.js b/modules/ui/conflicts.js index 885b05479..1c23289de 100644 --- a/modules/ui/conflicts.js +++ b/modules/ui/conflicts.js @@ -62,7 +62,7 @@ export function uiConflicts(context) { .append('button') .attr('class', 'fr') .on('click', cancel) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); headerEnter .append('h3') @@ -108,7 +108,7 @@ export function uiConflicts(context) { } linkEnter - .call(svgIcon('#icon-load', 'inline')) + .call(svgIcon('#iD-icon-load', 'inline')) .append('span') .text(t('save.conflict.download_changes')); diff --git a/modules/ui/contributors.js b/modules/ui/contributors.js index 9aa00ea96..3f07c2fe2 100644 --- a/modules/ui/contributors.js +++ b/modules/ui/contributors.js @@ -28,7 +28,7 @@ export function uiContributors(context) { subset = u.slice(0, u.length > limit ? limit - 1 : limit); wrap.html('') - .call(svgIcon('#icon-nearby', 'pre-text light')); + .call(svgIcon('#iD-icon-nearby', 'pre-text light')); var userList = d3_select(document.createElement('span')); diff --git a/modules/ui/disclosure.js b/modules/ui/disclosure.js index 6c56e37c6..f50ef2bfa 100644 --- a/modules/ui/disclosure.js +++ b/modules/ui/disclosure.js @@ -8,12 +8,12 @@ import { textDirection } from '../util/locale'; export function uiDisclosure(context, key, expandedDefault) { - var dispatch = d3_dispatch('toggled'), - _preference = (context.storage('disclosure.' + key + '.expanded')), - _expanded = (_preference === null ? !!expandedDefault : (_preference === 'true')), - _title, - _updatePreference = true, - _content = function () {}; + var dispatch = d3_dispatch('toggled'); + var _preference = (context.storage('disclosure.' + key + '.expanded')); + var _expanded = (_preference === null ? !!expandedDefault : (_preference === 'true')); + var _title; + var _updatePreference = true; + var _content = function () {}; var disclosure = function(selection) { @@ -43,8 +43,8 @@ export function uiDisclosure(context, key, expandedDefault) { .text(_title); hideToggle.selectAll('.hide-toggle-icon') - .attr('xlink:href', _expanded ? '#icon-down' - : (textDirection === 'rtl') ? '#icon-backward' : '#icon-forward' + .attr('xlink:href', _expanded ? '#iD-icon-down' + : (textDirection === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward' ); @@ -74,8 +74,8 @@ export function uiDisclosure(context, key, expandedDefault) { .classed('expanded', _expanded); hideToggle.selectAll('.hide-toggle-icon') - .attr('xlink:href', _expanded ? '#icon-down' - : (textDirection === 'rtl') ? '#icon-backward' : '#icon-forward' + .attr('xlink:href', _expanded ? '#iD-icon-down' + : (textDirection === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward' ); wrap diff --git a/modules/ui/edit_menu.js b/modules/ui/edit_menu.js index f29503bec..8c99a45b2 100644 --- a/modules/ui/edit_menu.js +++ b/modules/ui/edit_menu.js @@ -9,23 +9,23 @@ import { uiTooltipHtml } from './tooltipHtml'; export function uiEditMenu(context, operations) { - var menu, - center = [0, 0], - offset = [0, 0], - tooltip; + var menu; + var center = [0, 0]; + var offset = [0, 0]; + var tooltip; - var p = 8, // top padding - m = 4, // top margin - h = 15, // height of icon - vpBottomMargin = 45, // viewport bottom margin - vpSideMargin = 35, // viewport side margin - buttonWidth = 44, - buttonHeight = (2 * p + h), - menuWidth = buttonWidth, - menuHeight = (2 * m) + operations.length * buttonHeight, - menuSideMargin = 10, - tooltipWidth = 200, - tooltipHeight = 200; // a reasonable guess, real height depends on tooltip contents + var p = 8; // top padding + var m = 4; // top margin + var h = 15; // height of icon + var vpBottomMargin = 45; // viewport bottom margin + var vpSideMargin = 35; // viewport side margin + var buttonWidth = 44; + var buttonHeight = (2 * p + h); + var menuWidth = buttonWidth; + var menuHeight = (2 * m) + operations.length * buttonHeight; + var menuSideMargin = 10; + var tooltipWidth = 200; + var tooltipHeight = 200; // a reasonable guess, real height depends on tooltip contents var editMenu = function (selection) { @@ -33,8 +33,8 @@ export function uiEditMenu(context, operations) { selection.node().parentNode.focus(); - var isRTL = textDirection === 'rtl', - viewport = context.surfaceRect(); + var isRTL = textDirection === 'rtl'; + var viewport = context.surfaceRect(); if (!isRTL && (center[0] + menuSideMargin + menuWidth) > (viewport.width - vpSideMargin)) { // menu is going left-to-right and near right viewport edge, go left instead @@ -101,10 +101,8 @@ export function uiEditMenu(context, operations) { .append('use') .attr('width', '20') .attr('height', '20') - .attr('transform', function () { - return 'translate(' + [2 * p, 5] + ')'; - }) - .attr('xlink:href', function (d) { return '#operation-' + d.id; }); + .attr('transform', function () { return 'translate(' + [2 * p, 5] + ')'; }) + .attr('xlink:href', function (d) { return '#iD-operation-' + d.id; }); tooltip = d3_select(document.body) .append('div') diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js index 1ea29f0ba..7d6c8c1c7 100644 --- a/modules/ui/entity_editor.js +++ b/modules/ui/entity_editor.js @@ -55,13 +55,13 @@ export function uiEntityEditor(context) { enter .append('button') .attr('class', 'fl preset-reset preset-choose') - .call(svgIcon((textDirection === 'rtl') ? '#icon-forward' : '#icon-backward')); + .call(svgIcon((textDirection === 'rtl') ? '#iD-icon-forward' : '#iD-icon-backward')); enter .append('button') .attr('class', 'fr preset-close') .on('click', function() { context.enter(modeBrowse(context)); }) - .call(svgIcon(_modified ? '#icon-apply' : '#icon-close')); + .call(svgIcon(_modified ? '#iD-icon-apply' : '#iD-icon-close')); enter .append('h3') @@ -247,7 +247,7 @@ export function uiEntityEditor(context) { if (!arguments.length) return _modified; _modified = _; d3_selectAll('button.preset-close use') - .attr('xlink:href', (_modified ? '#icon-apply' : '#icon-close')); + .attr('xlink:href', (_modified ? '#iD-icon-apply' : '#iD-icon-close')); return entityEditor; }; diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js index 5cb1bd5a0..c7ba4a233 100644 --- a/modules/ui/feature_list.js +++ b/modules/ui/feature_list.js @@ -52,7 +52,7 @@ export function uiFeatureList(context) { .on('input', inputevent); searchWrap - .call(svgIcon('#icon-search', 'pre-text')); + .call(svgIcon('#iD-icon-search', 'pre-text')); var listWrap = selection .append('div') @@ -231,7 +231,7 @@ export function uiFeatureList(context) { .append('button') .property('disabled', true) .attr('class', 'no-results-item') - .call(svgIcon('#icon-alert', 'pre-text')); + .call(svgIcon('#iD-icon-alert', 'pre-text')); resultsIndicator.append('span') .attr('class', 'entity-name'); @@ -280,7 +280,7 @@ export function uiFeatureList(context) { label .each(function(d) { d3_select(this) - .call(svgIcon('#icon-' + d.geometry, 'pre-text')); + .call(svgIcon('#iD-icon-' + d.geometry, 'pre-text')); }); label diff --git a/modules/ui/field.js b/modules/ui/field.js index 47533b572..a430c2f97 100644 --- a/modules/ui/field.js +++ b/modules/ui/field.js @@ -117,7 +117,7 @@ export function uiField(context, presetField, entity, options) { .attr('class', 'remove-icon') .attr('title', t('icons.remove')) .attr('tabindex', -1) - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); } if (options.revert) { @@ -126,9 +126,7 @@ export function uiField(context, presetField, entity, options) { .attr('class', 'modified-icon') .attr('title', t('icons.undo')) .attr('tabindex', -1) - .call( - (textDirection === 'rtl') ? svgIcon('#icon-redo') : svgIcon('#icon-undo') - ); + .call(svgIcon((textDirection === 'rtl') ? '#iD-icon-redo' : '#iD-icon-undo')); } } diff --git a/modules/ui/field_help.js b/modules/ui/field_help.js index 49f4874a3..e39954522 100644 --- a/modules/ui/field_help.js +++ b/modules/ui/field_help.js @@ -57,13 +57,13 @@ export function uiFieldHelp(context, fieldName) { var replacements = { distField: t('restriction.controls.distance'), viaField: t('restriction.controls.via'), - fromShadow: icon('#turn-shadow', 'pre-text shadow from'), - allowShadow: icon('#turn-shadow', 'pre-text shadow allow'), - restrictShadow: icon('#turn-shadow', 'pre-text shadow restrict'), - onlyShadow: icon('#turn-shadow', 'pre-text shadow only'), - allowTurn: icon('#turn-yes', 'pre-text turn'), - restrictTurn: icon('#turn-no', 'pre-text turn'), - onlyTurn: icon('#turn-only', 'pre-text turn') + fromShadow: icon('#iD-turn-shadow', 'pre-text shadow from'), + allowShadow: icon('#iD-turn-shadow', 'pre-text shadow allow'), + restrictShadow: icon('#iD-turn-shadow', 'pre-text shadow restrict'), + onlyShadow: icon('#iD-turn-shadow', 'pre-text shadow only'), + allowTurn: icon('#iD-turn-yes', 'pre-text turn'), + restrictTurn: icon('#iD-turn-no', 'pre-text turn'), + onlyTurn: icon('#iD-turn-only', 'pre-text turn') }; @@ -150,7 +150,7 @@ export function uiFieldHelp(context, fieldName) { .append('button') .attr('class', 'field-help-button') .attr('tabindex', -1) - .call(svgIcon('#icon-help')) + .call(svgIcon('#iD-icon-help')) .merge(button) .on('click', function () { d3_event.stopPropagation(); @@ -208,7 +208,7 @@ export function uiFieldHelp(context, fieldName) { d3_event.preventDefault(); hide(); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); var navEnter = enter .append('div') diff --git a/modules/ui/fields/check.js b/modules/ui/fields/check.js index 945085aa0..85a65de5e 100644 --- a/modules/ui/fields/check.js +++ b/modules/ui/fields/check.js @@ -78,7 +78,7 @@ export function uiFieldCheck(field, context) { var first = entity.first(); var last = entity.isClosed() ? entity.nodes[entity.nodes.length - 2] : entity.last(); var pseudoDirection = first < last; - var icon = pseudoDirection ? '#icon-forward' : '#icon-backward'; + var icon = pseudoDirection ? '#iD-icon-forward' : '#iD-icon-backward'; selection.selectAll('.reverser-span') .text(t('inspector.check.reverser')) diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 5688a17e8..fdc57b5a7 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -67,7 +67,7 @@ export function uiFieldLocalized(field, context) { .append('button') .attr('class', 'button-input-action localized-add minor') .attr('tabindex', -1) - .call(svgIcon('#icon-plus')) + .call(svgIcon('#iD-icon-plus')) .call(tooltip() .title(t('translate.translate')) .placement('left')) @@ -208,7 +208,7 @@ export function uiFieldLocalized(field, context) { .style('max-height','0px') .remove(); }) - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); wrap .append('input') diff --git a/modules/ui/fields/wikipedia.js b/modules/ui/fields/wikipedia.js index da2a8b83e..3b065c72a 100644 --- a/modules/ui/fields/wikipedia.js +++ b/modules/ui/fields/wikipedia.js @@ -108,7 +108,7 @@ export function uiFieldWikipedia(field, context) { .append('button') .attr('class', 'button-input-action wiki-link minor') .attr('tabindex', -1) - .call(svgIcon('#icon-out-link')) + .call(svgIcon('#iD-icon-out-link')) .merge(link); link diff --git a/modules/ui/flash.js b/modules/ui/flash.js index 8540c706a..3a21e66ef 100644 --- a/modules/ui/flash.js +++ b/modules/ui/flash.js @@ -6,7 +6,7 @@ var _flashTimer; export function uiFlash() { var _duration = 2000; - var _iconName = '#icon-no'; + var _iconName = '#iD-icon-no'; var _iconClass = 'disabled'; var _text = ''; var _textClass; diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js index 7faeca2d4..e0efe190d 100644 --- a/modules/ui/geolocate.js +++ b/modules/ui/geolocate.js @@ -54,7 +54,7 @@ export function uiGeolocate(context) { .attr('tabindex', -1) .attr('title', t('geolocate.title')) .on('click', click) - .call(svgIcon('#icon-geolocate', 'light')) + .call(svgIcon('#iD-icon-geolocate', 'light')) .call(tooltip() .placement((textDirection === 'rtl') ? 'right' : 'left')); }; diff --git a/modules/ui/help.js b/modules/ui/help.js index ea5ca2696..5b5c71993 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -217,25 +217,25 @@ export function uiHelp(context) { }; var replacements = { - point: icon('#icon-point', 'pre-text'), - line: icon('#icon-line', 'pre-text'), - area: icon('#icon-area', 'pre-text'), - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text'), - orthogonalize: icon('#operation-orthogonalize', 'pre-text'), - disconnect: icon('#operation-disconnect', 'pre-text'), - layers: icon('#icon-layers', 'pre-text'), - data: icon('#icon-data', 'pre-text'), - inspect: icon('#icon-inspect', 'pre-text'), - move: icon('#operation-move', 'pre-text'), - merge: icon('#operation-merge', 'pre-text'), - delete: icon('#operation-delete', 'pre-text'), - close: icon('#icon-close', 'pre-text'), - undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo', 'pre-text'), - redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo', 'pre-text'), - save: icon('#icon-save', 'pre-text'), - leftclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'left'), - rightclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'right'), + point: icon('#iD-icon-point', 'pre-text'), + line: icon('#iD-icon-line', 'pre-text'), + area: icon('#iD-icon-area', 'pre-text'), + plus: icon('#iD-icon-plus', 'pre-text'), + minus: icon('#iD-icon-minus', 'pre-text'), + orthogonalize: icon('#iD-operation-orthogonalize', 'pre-text'), + disconnect: icon('#iD-operation-disconnect', 'pre-text'), + layers: icon('#iD-icon-layers', 'pre-text'), + data: icon('#iD-icon-data', 'pre-text'), + inspect: icon('#iD-icon-inspect', 'pre-text'), + move: icon('#iD-operation-move', 'pre-text'), + merge: icon('#iD-operation-merge', 'pre-text'), + delete: icon('#iD-operation-delete', 'pre-text'), + close: icon('#iD-icon-close', 'pre-text'), + undo: icon(textDirection === 'rtl' ? '#iD-icon-redo' : '#iD-icon-undo', 'pre-text'), + redo: icon(textDirection === 'rtl' ? '#iD-icon-undo' : '#iD-icon-redo', 'pre-text'), + save: icon('#iD-icon-save', 'pre-text'), + leftclick: icon('#iD-walkthrough-mouse', 'pre-text mouseclick', 'left'), + rightclick: icon('#iD-walkthrough-mouse', 'pre-text mouseclick', 'right'), shift: uiCmd.display('⇧'), alt: uiCmd.display('⌥'), return: uiCmd.display('↵'), @@ -333,7 +333,7 @@ export function uiHelp(context) { nextLink .append('span') .text(docs[i + 1].title) - .call(svgIcon((rtl ? '#icon-backward' : '#icon-forward'), 'inline')); + .call(svgIcon((rtl ? '#iD-icon-backward' : '#iD-icon-forward'), 'inline')); } } @@ -348,7 +348,7 @@ export function uiHelp(context) { }); prevLink - .call(svgIcon((rtl ? '#icon-forward' : '#icon-backward'), 'inline')) + .call(svgIcon((rtl ? '#iD-icon-forward' : '#iD-icon-backward'), 'inline')) .append('span') .text(docs[i - 1].title); } @@ -379,7 +379,7 @@ export function uiHelp(context) { var button = selection.append('button') .attr('tabindex', -1) .on('click', togglePane) - .call(svgIcon('#icon-help', 'light')) + .call(svgIcon('#iD-icon-help', 'light')) .call(tooltipBehavior); var shown = false; @@ -396,7 +396,7 @@ export function uiHelp(context) { heading .append('button') .on('click', function() { uiHelp.hidePane(); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); var content = pane @@ -440,7 +440,7 @@ export function uiHelp(context) { .append('svg') .attr('class', 'logo logo-walkthrough') .append('use') - .attr('xlink:href', '#logo-walkthrough'); + .attr('xlink:href', '#iD-logo-walkthrough'); walkthrough .append('div') diff --git a/modules/ui/info.js b/modules/ui/info.js index 22824c36f..e6130bcdb 100644 --- a/modules/ui/info.js +++ b/modules/ui/info.js @@ -67,7 +67,7 @@ export function uiInfo(context) { .append('button') .attr('class', 'close') .on('click', function (d) { toggle(d); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); enter .append('div') diff --git a/modules/ui/init.js b/modules/ui/init.js index adeb376fb..dda07d46a 100644 --- a/modules/ui/init.js +++ b/modules/ui/init.js @@ -215,7 +215,7 @@ export function uiInit(context) { .attr('target', '_blank') .attr('tabindex', -1) .attr('href', 'https://github.com/openstreetmap/iD/issues') - .call(svgIcon('#icon-bug', 'light')) + .call(svgIcon('#iD-icon-bug', 'light')) .call(tooltip().title(t('report_a_bug')).placement('top')); issueLinks @@ -223,7 +223,7 @@ export function uiInit(context) { .attr('target', '_blank') .attr('tabindex', -1) .attr('href', 'https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating') - .call(svgIcon('#icon-translate', 'light')) + .call(svgIcon('#iD-icon-translate', 'light')) .call(tooltip().title(t('help_translate')).placement('top')); aboutList @@ -253,7 +253,7 @@ export function uiInit(context) { if (services.openstreetcam) { services.openstreetcam.hideViewer(); } }) .append('div') - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); window.onbeforeunload = function() { diff --git a/modules/ui/intro/area.js b/modules/ui/intro/area.js index 9af3dd077..70ff8e95f 100644 --- a/modules/ui/intro/area.js +++ b/modules/ui/intro/area.js @@ -59,13 +59,13 @@ export function uiIntroArea(context, reveal) { timeout(function() { var tooltip = reveal('button.add-area', - t('intro.areas.add_playground', { button: icon('#icon-area', 'pre-text') })); + t('intro.areas.add_playground', { button: icon('#iD-icon-area', 'pre-text') })); tooltip.selectAll('.tooltip-inner') .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#landuse-images'); + .attr('xlink:href', '#iD-graphic-areas'); context.on('enter.intro', function(mode) { if (mode.id !== 'add-area') return; @@ -420,7 +420,7 @@ export function uiIntroArea(context, reveal) { }); reveal('.entity-editor-pane', - t('intro.areas.describe_playground', { button: icon('#icon-apply', 'pre-text') }), + t('intro.areas.describe_playground', { button: icon('#iD-icon-apply', 'pre-text') }), { duration: 300 } ); diff --git a/modules/ui/intro/building.js b/modules/ui/intro/building.js index e416db806..c0fea7e75 100644 --- a/modules/ui/intro/building.js +++ b/modules/ui/intro/building.js @@ -84,13 +84,13 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { var tooltip = reveal('button.add-area', - t('intro.buildings.add_building', { button: icon('#icon-area', 'pre-text') })); + t('intro.buildings.add_building', { button: icon('#iD-icon-area', 'pre-text') })); tooltip.selectAll('.tooltip-inner') .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#building-images'); + .attr('xlink:href', '#iD-graphic-buildings'); context.on('enter.intro', function(mode) { if (mode.id !== 'add-area') return; @@ -313,7 +313,7 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - t('intro.buildings.close', { button: icon('#icon-apply', 'pre-text') }) + t('intro.buildings.close', { button: icon('#iD-icon-apply', 'pre-text') }) ); }, 500); @@ -378,7 +378,7 @@ export function uiIntroBuilding(context, reveal) { var menuCoords = context.map().mouseCoordinates(); revealEditMenu(menuCoords, - t('intro.buildings.square_building', { button: icon('#operation-orthogonalize', 'pre-text') }) + t('intro.buildings.square_building', { button: icon('#iD-operation-orthogonalize', 'pre-text') }) ); context.on('enter.intro', function(mode) { @@ -394,7 +394,7 @@ export function uiIntroBuilding(context, reveal) { if (!wasChanged && !node) { return continueTo(rightClickHouse); } revealEditMenu(menuCoords, - t('intro.buildings.square_building', { button: icon('#operation-orthogonalize', 'pre-text') }), + t('intro.buildings.square_building', { button: icon('#iD-operation-orthogonalize', 'pre-text') }), { duration: 0 } ); }); @@ -461,7 +461,7 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { reveal('button.add-area', - t('intro.buildings.add_tank', { button: icon('#icon-area', 'pre-text') }) + t('intro.buildings.add_tank', { button: icon('#iD-icon-area', 'pre-text') }) ); context.on('enter.intro', function(mode) { @@ -636,7 +636,7 @@ export function uiIntroBuilding(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - t('intro.buildings.close', { button: icon('#icon-apply', 'pre-text') }) + t('intro.buildings.close', { button: icon('#iD-icon-apply', 'pre-text') }) ); }, 500); @@ -700,7 +700,7 @@ export function uiIntroBuilding(context, reveal) { var menuCoords = context.map().mouseCoordinates(); revealEditMenu(menuCoords, - t('intro.buildings.circle_tank', { button: icon('#operation-circularize', 'pre-text') }) + t('intro.buildings.circle_tank', { button: icon('#iD-operation-circularize', 'pre-text') }) ); context.on('enter.intro', function(mode) { @@ -716,7 +716,7 @@ export function uiIntroBuilding(context, reveal) { if (!wasChanged && !node) { return continueTo(rightClickTank); } revealEditMenu(menuCoords, - t('intro.buildings.circle_tank', { button: icon('#operation-circularize', 'pre-text') }), + t('intro.buildings.circle_tank', { button: icon('#iD-operation-circularize', 'pre-text') }), { duration: 0 } ); }); diff --git a/modules/ui/intro/intro.js b/modules/ui/intro/intro.js index 678625d7a..7ce28c8b3 100644 --- a/modules/ui/intro/intro.js +++ b/modules/ui/intro/intro.js @@ -166,7 +166,7 @@ export function uiIntro(context) { .append('svg') .attr('class', 'intro-nav-wrap-logo') .append('use') - .attr('xlink:href', '#logo-walkthrough'); + .attr('xlink:href', '#iD-logo-walkthrough'); var buttonwrap = navwrap .append('div') @@ -187,7 +187,7 @@ export function uiIntro(context) { buttons .append('span') .attr('class', 'status') - .call(svgIcon((textDirection === 'rtl' ? '#icon-backward' : '#icon-forward'), 'inline')); + .call(svgIcon((textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward'), 'inline')); enterChapter(chapters[0]); diff --git a/modules/ui/intro/line.js b/modules/ui/intro/line.js index 9d8a656b1..986f21351 100644 --- a/modules/ui/intro/line.js +++ b/modules/ui/intro/line.js @@ -84,13 +84,13 @@ export function uiIntroLine(context, reveal) { timeout(function() { var tooltip = reveal('button.add-line', - t('intro.lines.add_line', { button: icon('#icon-line', 'pre-text') })); + t('intro.lines.add_line', { button: icon('#iD-icon-line', 'pre-text') })); tooltip.selectAll('.tooltip-inner') .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#feature-images'); + .attr('xlink:href', '#iD-graphic-lines'); context.on('enter.intro', function(mode) { if (mode.id !== 'add-line') return; @@ -360,7 +360,7 @@ export function uiIntroLine(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - t('intro.lines.name_road', { button: icon('#icon-apply', 'pre-text') }), + t('intro.lines.name_road', { button: icon('#iD-icon-apply', 'pre-text') }), { tooltipClass: 'intro-lines-name_road' } ); }, 500); @@ -724,7 +724,7 @@ export function uiIntroLine(context, reveal) { washingtonSegmentId = null; revealEditMenu(menuCoords, t('intro.lines.split_intersection', - { button: icon('#operation-split', 'pre-text'), street: t('intro.graph.name.washington-street') }) + { button: icon('#iD-operation-split', 'pre-text'), street: t('intro.graph.name.washington-street') }) ); context.map().on('move.intro drawn.intro', function() { @@ -732,7 +732,7 @@ export function uiIntroLine(context, reveal) { if (!wasChanged && !node) { return continueTo(rightClickIntersection); } revealEditMenu(menuCoords, t('intro.lines.split_intersection', - { button: icon('#operation-split', 'pre-text'), street: t('intro.graph.name.washington-street') }), + { button: icon('#iD-operation-split', 'pre-text'), street: t('intro.graph.name.washington-street') }), { duration: 0 } ); }); @@ -999,12 +999,12 @@ export function uiIntroLine(context, reveal) { var menuCoords = context.map().mouseCoordinates(); revealEditMenu(menuCoords, - t('intro.lines.multi_delete', { button: icon('#operation-delete', 'pre-text') }) + t('intro.lines.multi_delete', { button: icon('#iD-operation-delete', 'pre-text') }) ); context.map().on('move.intro drawn.intro', function() { revealEditMenu(menuCoords, - t('intro.lines.multi_delete', { button: icon('#operation-delete', 'pre-text') }), + t('intro.lines.multi_delete', { button: icon('#iD-operation-delete', 'pre-text') }), { duration: 0 } ); }); diff --git a/modules/ui/intro/navigation.js b/modules/ui/intro/navigation.js index 2a24df925..0b93bbe73 100644 --- a/modules/ui/intro/navigation.js +++ b/modules/ui/intro/navigation.js @@ -83,16 +83,16 @@ export function uiIntroNavigation(context, reveal) { reveal('#surface', t('intro.navigation.zoom', { - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text') + plus: icon('#iD-icon-plus', 'pre-text'), + minus: icon('#iD-icon-minus', 'pre-text') }) ); context.map().on('drawn.intro', function() { reveal('#surface', t('intro.navigation.zoom', { - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text') + plus: icon('#iD-icon-plus', 'pre-text'), + minus: icon('#iD-icon-minus', 'pre-text') }), { duration: 0 } ); }); @@ -360,7 +360,7 @@ export function uiIntroNavigation(context, reveal) { if (!isTownHallSelected()) return clickTownHall(); var selector = '.entity-editor-pane button.preset-close svg use'; - var href = d3_select(selector).attr('href') || '#icon-close'; + var href = d3_select(selector).attr('href') || '#iD-icon-close'; reveal('.entity-editor-pane', t('intro.navigation.close_townhall', { button: icon(href, 'pre-text') }) @@ -373,7 +373,7 @@ export function uiIntroNavigation(context, reveal) { context.history().on('change.intro', function() { // update the close icon in the tooltip if the user edits something. var selector = '.entity-editor-pane button.preset-close svg use'; - var href = d3_select(selector).attr('href') || '#icon-close'; + var href = d3_select(selector).attr('href') || '#iD-icon-close'; reveal('.entity-editor-pane', t('intro.navigation.close_townhall', { button: icon(href, 'pre-text') }), @@ -496,7 +496,7 @@ export function uiIntroNavigation(context, reveal) { function editorStreet() { var selector = '.entity-editor-pane button.preset-close svg use'; - var href = d3_select(selector).attr('href') || '#icon-close'; + var href = d3_select(selector).attr('href') || '#iD-icon-close'; reveal('.entity-editor-pane', t('intro.navigation.editor_street', { @@ -513,7 +513,7 @@ export function uiIntroNavigation(context, reveal) { context.history().on('change.intro', function() { // update the close icon in the tooltip if the user edits something. var selector = '.entity-editor-pane button.preset-close svg use'; - var href = d3_select(selector).attr('href') || '#icon-close'; + var href = d3_select(selector).attr('href') || '#iD-icon-close'; reveal('.entity-editor-pane', t('intro.navigation.editor_street', { diff --git a/modules/ui/intro/point.js b/modules/ui/intro/point.js index 0d46fd2a2..8f6ce0af6 100644 --- a/modules/ui/intro/point.js +++ b/modules/ui/intro/point.js @@ -64,7 +64,7 @@ export function uiIntroPoint(context, reveal) { timeout(function() { var tooltip = reveal('button.add-point', - t('intro.points.add_point', { button: icon('#icon-point', 'pre-text') })); + t('intro.points.add_point', { button: icon('#iD-icon-point', 'pre-text') })); pointId = null; @@ -72,7 +72,7 @@ export function uiIntroPoint(context, reveal) { .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#poi-images'); + .attr('xlink:href', '#iD-graphic-points'); context.on('enter.intro', function(mode) { if (mode.id !== 'add-point') return; @@ -260,7 +260,7 @@ export function uiIntroPoint(context, reveal) { d3_select('.inspector-wrap .panewrap').style('right', '0%'); var selector = '.entity-editor-pane button.preset-close svg use'; - var href = d3_select(selector).attr('href') || '#icon-close'; + var href = d3_select(selector).attr('href') || '#iD-icon-close'; context.on('exit.intro', function() { continueTo(reselectPoint); @@ -364,7 +364,7 @@ export function uiIntroPoint(context, reveal) { timeout(function() { reveal('.entity-editor-pane', - t('intro.points.update_close', { button: icon('#icon-apply', 'pre-text') }) + t('intro.points.update_close', { button: icon('#iD-icon-apply', 'pre-text') }) ); }, 500); @@ -423,13 +423,13 @@ export function uiIntroPoint(context, reveal) { if (!node) { return continueTo(rightClickPoint); } revealEditMenu(entity.loc, - t('intro.points.delete', { button: icon('#operation-delete', 'pre-text') }) + t('intro.points.delete', { button: icon('#iD-operation-delete', 'pre-text') }) ); timeout(function() { context.map().on('move.intro drawn.intro', function() { revealEditMenu(entity.loc, - t('intro.points.delete', { button: icon('#operation-delete', 'pre-text') }), + t('intro.points.delete', { button: icon('#iD-operation-delete', 'pre-text') }), { duration: 0} ); }); @@ -461,7 +461,7 @@ export function uiIntroPoint(context, reveal) { continueTo(play); }); - var iconName = '#icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'); + var iconName = '#iD-icon-' + (textDirection === 'rtl' ? 'redo' : 'undo'); reveal('#bar button.undo-button', t('intro.points.undo', { button: icon(iconName, 'pre-text') }) ); diff --git a/modules/ui/intro/start_editing.js b/modules/ui/intro/start_editing.js index 6bd5c397f..d01510301 100644 --- a/modules/ui/intro/start_editing.js +++ b/modules/ui/intro/start_editing.js @@ -11,8 +11,8 @@ import { utilRebind } from '../../util/rebind'; export function uiIntroStartEditing(context, reveal) { - var dispatch = d3_dispatch('done', 'startEditing'), - modalSelection = d3_select(null); + var dispatch = d3_dispatch('done', 'startEditing'); + var modalSelection = d3_select(null); var chapter = { @@ -21,7 +21,7 @@ export function uiIntroStartEditing(context, reveal) { function showHelp() { reveal('.map-control.help-control', - t('intro.startediting.help', { button: icon('#icon-help', 'pre-text'), key: t('help.key') }), { + t('intro.startediting.help', { button: icon('#iD-icon-help', 'pre-text'), key: t('help.key') }), { buttonText: t('intro.ok'), buttonCallback: function() { shortcuts(); } } @@ -69,7 +69,7 @@ export function uiIntroStartEditing(context, reveal) { .append('svg') .attr('class', 'illustration') .append('use') - .attr('xlink:href', '#logo-walkthrough'); + .attr('xlink:href', '#iD-logo-walkthrough'); startbutton .append('h2') diff --git a/modules/ui/intro/welcome.js b/modules/ui/intro/welcome.js index 81e1f9b09..a33de0e25 100644 --- a/modules/ui/intro/welcome.js +++ b/modules/ui/intro/welcome.js @@ -61,7 +61,7 @@ export function uiIntroWelcome(context, reveal) { .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#walkthrough-mouse'); + .attr('xlink:href', '#iD-walkthrough-mouse'); tooltip .append('div') @@ -102,7 +102,7 @@ export function uiIntroWelcome(context, reveal) { .insert('svg', 'span') .attr('class', 'tooltip-illustration') .append('use') - .attr('xlink:href', '#walkthrough-mouse'); + .attr('xlink:href', '#iD-walkthrough-mouse'); tooltip .append('div') diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js index e22681a0a..74bb393ee 100644 --- a/modules/ui/map_data.js +++ b/modules/ui/map_data.js @@ -229,7 +229,7 @@ export function uiMapData(context) { d3_event.stopPropagation(); gpx.fitZoom(); }) - .call(svgIcon('#icon-search')); + .call(svgIcon('#iD-icon-search')); liEnter .append('button') @@ -246,7 +246,7 @@ export function uiMapData(context) { }) .node().click(); }) - .call(svgIcon('#icon-geolocate')); + .call(svgIcon('#iD-icon-geolocate')); var labelEnter = liEnter .append('label') @@ -453,7 +453,7 @@ export function uiMapData(context) { .append('button') .attr('tabindex', -1) .on('click', togglePane) - .call(svgIcon('#icon-data', 'light')) + .call(svgIcon('#iD-icon-data', 'light')) .call(paneTooltip); @@ -468,7 +468,7 @@ export function uiMapData(context) { heading .append('button') .on('click', function() { uiMapData.hidePane(); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); var content = pane diff --git a/modules/ui/modal.js b/modules/ui/modal.js index ee13f02f6..4a1aafc19 100644 --- a/modules/ui/modal.js +++ b/modules/ui/modal.js @@ -53,7 +53,7 @@ export function uiModal(selection, blocking) { modal.append('button') .attr('class', 'close') .on('click', shaded.close) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); keybinding .on('⌫', shaded.close) diff --git a/modules/ui/modes.js b/modules/ui/modes.js index acb5f8af9..eb86e30c3 100644 --- a/modules/ui/modes.js +++ b/modules/ui/modes.js @@ -59,7 +59,7 @@ export function uiModes(context) { buttons .each(function(d) { d3_select(this) - .call(svgIcon('#icon-' + d.button, 'pre-text')); + .call(svgIcon('#iD-icon-' + d.button, 'pre-text')); }); buttons diff --git a/modules/ui/notice.js b/modules/ui/notice.js index 9e35a610f..d8cf15589 100644 --- a/modules/ui/notice.js +++ b/modules/ui/notice.js @@ -25,7 +25,7 @@ export function uiNotice(context) { }); button - .call(svgIcon('#icon-plus', 'pre-text')) + .call(svgIcon('#iD-icon-plus', 'pre-text')) .append('span') .attr('class', 'label') .text(t('zoom_in_edit')); diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js index 710cfa8b1..fef7c8804 100644 --- a/modules/ui/panels/history.js +++ b/modules/ui/panels/history.js @@ -151,7 +151,7 @@ export function uiPanelHistory(context) { .attr('target', '_blank') .attr('tabindex', -1) .attr('href', osm.historyURL(entity)) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .append('span') .text(t('info_panels.history.link_text')); } diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js index 2a9d92e33..c1d2c91dc 100644 --- a/modules/ui/preset_icon.js +++ b/modules/ui/preset_icon.js @@ -17,7 +17,7 @@ export function uiPresetIcon() { if (p.icon) return p.icon; else if (geom === 'line') - return 'other-line'; + return 'iD-other-line'; else if (geom === 'vertex') return p.isFallback() ? '' : 'temaki-vertex'; else @@ -71,7 +71,7 @@ export function uiPresetIcon() { areaFrame = areaFrame.enter() .append('div') .attr('class', 'preset-icon-frame') - .call(svgIcon('#preset-icon-frame')); + .call(svgIcon('#iD-preset-icon-frame')); var icon = selection.selectAll('.preset-icon') diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js index b1326b281..3360aeb8c 100644 --- a/modules/ui/preset_list.js +++ b/modules/ui/preset_list.js @@ -50,7 +50,7 @@ export function uiPresetList(context) { .append('button') .attr('class', 'preset-choose') .on('click', function() { dispatch.call('choose', this, currentPreset); }) - .call(svgIcon((textDirection === 'rtl') ? '#icon-backward' : '#icon-forward')); + .call(svgIcon((textDirection === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward')); } else { messagewrap .append('button') @@ -58,7 +58,7 @@ export function uiPresetList(context) { .on('click', function() { context.enter(modeBrowse(context)); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); } function keydown() { @@ -119,7 +119,7 @@ export function uiPresetList(context) { .on('input', inputevent); searchWrap - .call(svgIcon('#icon-search', 'pre-text')); + .call(svgIcon('#iD-icon-search', 'pre-text')); if (autofocus) { search.node().focus(); @@ -177,7 +177,7 @@ export function uiPresetList(context) { .on('click', function() { var isExpanded = d3_select(this).classed('expanded'); var iconName = isExpanded ? - (textDirection === 'rtl' ? '#icon-backward' : '#icon-forward') : '#icon-down'; + (textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward') : '#iD-icon-down'; d3_select(this) .classed('expanded', !isExpanded); d3_select(this).selectAll('div.label svg.icon use') @@ -190,7 +190,7 @@ export function uiPresetList(context) { .attr('class', 'label'); label - .call(svgIcon((textDirection === 'rtl' ? '#icon-backward' : '#icon-forward'), 'inline')) + .call(svgIcon((textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward'), 'inline')) .append('span') .html(function() { return preset.name() + '…'; }); diff --git a/modules/ui/radial_menu.js b/modules/ui/radial_menu.js index 3afd4f738..ab174f79b 100644 --- a/modules/ui/radial_menu.js +++ b/modules/ui/radial_menu.js @@ -8,9 +8,9 @@ import { uiTooltipHtml } from './tooltipHtml'; export function uiRadialMenu(context, operations) { - var menu, - center = [0, 0], - tooltip; + var menu; + var center = [0, 0]; + var tooltip; var radialMenu = function(selection) { @@ -35,10 +35,10 @@ export function uiRadialMenu(context, operations) { .transition() .attr('opacity', 1); - var r = 50, - a = Math.PI / 4, - a0 = -Math.PI / 4, - a1 = a0 + (operations.length - 1) * a; + var r = 50; + var a = Math.PI / 4; + var a0 = -Math.PI / 4; + var a1 = a0 + (operations.length - 1) * a; menu .append('path') @@ -76,7 +76,7 @@ export function uiRadialMenu(context, operations) { .attr('transform', 'translate(-10,-10)') .attr('width', '20') .attr('height', '20') - .attr('xlink:href', function(d) { return '#operation-' + d.id; }); + .attr('xlink:href', function(d) { return '#iD-operation-' + d.id; }); tooltip = d3_select(document.body) .append('div') @@ -87,12 +87,12 @@ export function uiRadialMenu(context, operations) { } function mouseover(d, i) { - var rect = context.surfaceRect(), - angle = a0 + i * a, - top = rect.top + (r + 25) * Math.cos(angle) + center[1] + 'px', - left = rect.left + (r + 25) * Math.sin(angle) + center[0] + 'px', - bottom = rect.height - (r + 25) * Math.cos(angle) - center[1] + 'px', - right = rect.width - (r + 25) * Math.sin(angle) - center[0] + 'px'; + var rect = context.surfaceRect(); + var angle = a0 + i * a; + var top = rect.top + (r + 25) * Math.cos(angle) + center[1] + 'px'; + var left = rect.left + (r + 25) * Math.sin(angle) + center[0] + 'px'; + var bottom = rect.height - (r + 25) * Math.cos(angle) - center[1] + 'px'; + var right = rect.width - (r + 25) * Math.sin(angle) - center[0] + 'px'; tooltip .style('top', null) diff --git a/modules/ui/raw_member_editor.js b/modules/ui/raw_member_editor.js index e8e47b058..3d61148ab 100644 --- a/modules/ui/raw_member_editor.js +++ b/modules/ui/raw_member_editor.js @@ -146,7 +146,7 @@ export function uiRawMemberEditor(context) { .attr('tabindex', -1) .attr('class', 'remove button-input-action member-delete minor') .on('click', deleteMember) - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); if (taginfo) { enter.each(bindTypeahead); diff --git a/modules/ui/raw_membership_editor.js b/modules/ui/raw_membership_editor.js index e74f0b84b..0fadc1b7b 100644 --- a/modules/ui/raw_membership_editor.js +++ b/modules/ui/raw_membership_editor.js @@ -208,7 +208,7 @@ export function uiRawMembershipEditor(context) { .attr('tabindex', -1) .attr('class', 'remove button-input-action member-delete minor') .on('click', deleteMembership) - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); if (taginfo) { enter.each(bindTypeahead); @@ -245,7 +245,7 @@ export function uiRawMembershipEditor(context) { .attr('tabindex', -1) .attr('class', 'remove button-input-action member-delete minor') .on('click', deleteMembership) - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); newrow = newrow .merge(enter); @@ -268,7 +268,7 @@ export function uiRawMembershipEditor(context) { .merge(addrel); addrel - .call(svgIcon('#icon-plus', 'light')) + .call(svgIcon('#iD-icon-plus', 'light')) .on('click', function() { _showBlank = true; content(wrap); diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js index 77dab2e18..d8c7e1344 100644 --- a/modules/ui/raw_tag_editor.js +++ b/modules/ui/raw_tag_editor.js @@ -88,7 +88,7 @@ export function uiRawTagEditor(context) { .append('button') .attr('class', 'add-tag') .on('click', addTag) - .call(svgIcon('#icon-plus', 'light')); + .call(svgIcon('#iD-icon-plus', 'light')); var items = list.selectAll('.tag-row') @@ -132,7 +132,7 @@ export function uiRawTagEditor(context) { .append('button') .attr('tabindex', -1) .attr('class', 'remove minor') - .call(svgIcon('#operation-delete')); + .call(svgIcon('#iD-operation-delete')); // Update diff --git a/modules/ui/restore.js b/modules/ui/restore.js index 43da523de..316842fce 100644 --- a/modules/ui/restore.js +++ b/modules/ui/restore.js @@ -46,7 +46,7 @@ export function uiRestore(context) { .append('svg') .attr('class', 'logo logo-restore') .append('use') - .attr('xlink:href', '#logo-restore'); + .attr('xlink:href', '#iD-logo-restore'); restore .append('div') @@ -64,7 +64,7 @@ export function uiRestore(context) { .append('svg') .attr('class', 'logo logo-reset') .append('use') - .attr('xlink:href', '#logo-reset'); + .attr('xlink:href', '#iD-logo-reset'); reset .append('div') diff --git a/modules/ui/save.js b/modules/ui/save.js index 0cb807195..d515b57f8 100644 --- a/modules/ui/save.js +++ b/modules/ui/save.js @@ -88,7 +88,7 @@ export function uiSave(context) { .call(tooltipBehavior); button - .call(svgIcon('#icon-save', 'pre-text')) + .call(svgIcon('#iD-icon-save', 'pre-text')) .append('span') .attr('class', 'label') .text(t('save.title')); diff --git a/modules/ui/selection_list.js b/modules/ui/selection_list.js index 5fbd9e534..150974962 100644 --- a/modules/ui/selection_list.js +++ b/modules/ui/selection_list.js @@ -72,7 +72,7 @@ export function uiSelectionList(context, selectedIDs) { .append('button') .attr('class', 'close') .on('click', deselectEntity) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); label .append('span') @@ -93,7 +93,7 @@ export function uiSelectionList(context, selectedIDs) { items.selectAll('.entity-geom-icon use') .attr('href', function() { var entity = this.parentNode.parentNode.__data__; - return '#icon-' + context.geometry(entity.id); + return '#iD-icon-' + context.geometry(entity.id); }); items.selectAll('.entity-type') diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js index 89647ca3f..882e54738 100644 --- a/modules/ui/shortcuts.js +++ b/modules/ui/shortcuts.js @@ -199,7 +199,7 @@ export function uiShortcuts() { if (click && click[1]) { selection - .call(svgIcon('#walkthrough-mouse', 'mouseclick', click[1])); + .call(svgIcon('#iD-walkthrough-mouse', 'mouseclick', click[1])); } else { selection .append('kbd') diff --git a/modules/ui/splash.js b/modules/ui/splash.js index c383b73b0..91bb05bbe 100644 --- a/modules/ui/splash.js +++ b/modules/ui/splash.js @@ -51,7 +51,7 @@ export function uiSplash(context) { .append('svg') .attr('class', 'logo logo-walkthrough') .append('use') - .attr('xlink:href', '#logo-walkthrough'); + .attr('xlink:href', '#iD-logo-walkthrough'); walkthrough .append('div') @@ -66,7 +66,7 @@ export function uiSplash(context) { .append('svg') .attr('class', 'logo logo-features') .append('use') - .attr('xlink:href', '#logo-features'); + .attr('xlink:href', '#iD-logo-features'); startEditing .append('div') diff --git a/modules/ui/status.js b/modules/ui/status.js index 0dc62b4c2..767e0e1b8 100644 --- a/modules/ui/status.js +++ b/modules/ui/status.js @@ -27,7 +27,7 @@ export function uiStatus(context) { .append('a') .attr('class', 'api-status-login') .attr('target', '_blank') - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .append('span') .text(t('login')) .on('click.login', function() { diff --git a/modules/ui/success.js b/modules/ui/success.js index 6949fb2e2..276a7152d 100644 --- a/modules/ui/success.js +++ b/modules/ui/success.js @@ -57,7 +57,7 @@ export function uiSuccess(context) { .append('button') .attr('class', 'fr') .on('click', function() { dispatch.call('cancel'); }) - .call(svgIcon('#icon-close')); + .call(svgIcon('#iD-icon-close')); header .append('h3') @@ -83,7 +83,7 @@ export function uiSuccess(context) { .attr('target', '_blank') .attr('tabindex', -1) .attr('href', t('success.help_link_url')) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .append('span') .text(t('success.help_link_text')); @@ -109,7 +109,7 @@ export function uiSuccess(context) { .append('svg') .attr('class', 'logo-small') .append('use') - .attr('xlink:href', '#logo-osm'); + .attr('xlink:href', '#iD-logo-osm'); var summaryDetail = row .append('td') @@ -206,7 +206,7 @@ export function uiSuccess(context) { .attr('class', 'link-out') .attr('target', '_blank') .attr('tabindex', -1) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .attr('href', 'https://github.com/osmlab/osm-community-index/issues') .append('span') .text(t('success.tell_us')); diff --git a/modules/ui/tag_reference.js b/modules/ui/tag_reference.js index ddfd3fb77..390f2d7d9 100644 --- a/modules/ui/tag_reference.js +++ b/modules/ui/tag_reference.js @@ -99,7 +99,7 @@ export function uiTagReference(tag) { .attr('target', '_blank') .attr('tabindex', -1) .attr('href', 'https://wiki.openstreetmap.org/wiki/' + docs.title) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .append('span') .text(t('inspector.reference')); @@ -110,7 +110,7 @@ export function uiTagReference(tag) { .attr('class', 'tag-reference-comment-link') .attr('target', '_blank') .attr('tabindex', -1) - .call(svgIcon('#icon-out-link', 'inline')) + .call(svgIcon('#iD-icon-out-link', 'inline')) .attr('href', t('commit.about_changeset_comments_link')) .append('span') .text(t('commit.about_changeset_comments')); @@ -159,7 +159,7 @@ export function uiTagReference(tag) { .attr('class', 'tag-reference-button') .attr('title', t('icons.information')) .attr('tabindex', -1) - .call(svgIcon('#icon-inspect')) + .call(svgIcon('#iD-icon-inspect')) .merge(_button); _button diff --git a/modules/ui/undo_redo.js b/modules/ui/undo_redo.js index 7ec94ae56..159f74c9a 100644 --- a/modules/ui/undo_redo.js +++ b/modules/ui/undo_redo.js @@ -62,7 +62,7 @@ export function uiUndoRedo(context) { } } d3_select(this) - .call(svgIcon('#icon-' + iconName)); + .call(svgIcon('#iD-icon-' + iconName)); }); var keybinding = d3_keybinding('undo') diff --git a/modules/ui/view_on_osm.js b/modules/ui/view_on_osm.js index 17ff0e0b6..146c95d4d 100644 --- a/modules/ui/view_on_osm.js +++ b/modules/ui/view_on_osm.js @@ -17,7 +17,7 @@ export function uiViewOnOSM(context) { .append('a') .attr('class', 'view-on-osm') .attr('target', '_blank') - .call(svgIcon('#icon-out-link', 'inline')); + .call(svgIcon('#iD-icon-out-link', 'inline')); enter .append('span') diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js index 3e874ff49..48d28d783 100644 --- a/modules/ui/zoom.js +++ b/modules/ui/zoom.js @@ -70,7 +70,7 @@ export function uiZoom(context) { button.each(function(d) { d3_select(this) - .call(svgIcon('#icon-' + d.icon, 'light')); + .call(svgIcon('#iD-icon-' + d.icon, 'light')); }); var keybinding = d3_keybinding('zoom'); diff --git a/package.json b/package.json index 59c7ded36..1b1b750f9 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "dist": "npm-run-all -p dist:**", "dist:mapillary": "shx mkdir -p dist/mapillary-js && shx cp -R node_modules/mapillary-js/dist/* dist/mapillary-js/", "dist:min": "uglifyjs dist/iD.js -c warnings=false -m -o dist/iD.min.js", - "dist:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg", + "old:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg", + "dist:svg:id": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"iD-%s\" --symbol-sprite dist/img/iD-sprite.svg 'svg/iD-sprite/**/*.svg'", "dist:svg:community": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"community-%s\" --symbol-sprite dist/img/community-sprite.svg node_modules/osm-community-index/dist/img/*.svg", "dist:svg:fa": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/fa-sprite.svg svg/fontawesome/*.svg", "dist:svg:maki": "svg-sprite --symbol --symbol-dest . --shape-id-generator \"maki-%s\" --symbol-sprite dist/img/maki-sprite.svg node_modules/@mapbox/maki/icons/*.svg", diff --git a/svg/fontawesome/README.md b/svg/fontawesome/README.md new file mode 100644 index 000000000..381ee180f --- /dev/null +++ b/svg/fontawesome/README.md @@ -0,0 +1,4 @@ +Do not edit the files in this folder. + +This folder contains Font Awesome icons which are used by the presets. +The icons are generated automatically by the `build_data.js` script. diff --git a/svg/iD-sprite/README.md b/svg/iD-sprite/README.md new file mode 100644 index 000000000..4c86ee453 --- /dev/null +++ b/svg/iD-sprite/README.md @@ -0,0 +1,45 @@ +These folders contain graphics used by iD. + +### Overview + +To add a graphic, create a `.svg` file and save it anywhere under here. + +Some guidelines: +* `icons/`: 20x20px solid fill-only, used throughout iD +* `operations/`: 20x20px solid fill-only, used as commands +* `presets/`: 60x60px large preset icons +* `turns/`: various sizes, graphics for turn restrictions +* `graphics/`: miscellaneous stuff + + +### Controlling colors with CSS + +We often use CSS to override the fill colors of the graphics. +In your SVG graphics, you can allow up to two override-able colors by using the following magic color values: + +* `fill="currentColor"` +* `fill="inherit"` + +For example, in `operation-reflect-long.svg`: +```svg + + + + +``` + +Elsewhere, in CSS: +```css +.flash-icon.operation use { + fill: #222; /* overrides the `inherit` */ + color: #79f; /* overrides the `currentColor` */ +} +.flash-icon.operation.disabled use { + fill: rgba(32,32,32,0.7); /* overrides the `inherit` */ + color: rgba(40,40,40,0.7); /* overrides the `currentColor` */ +} +``` + +This gives iD a lot of flexibility to control the runtime styling of the graphics. + +The above example means that classing a button as `.disabled` will automatically grey out the colors (you don't need to make separate grey versions of every button). diff --git a/svg/iD-sprite/graphics/graphic-areas.svg b/svg/iD-sprite/graphics/graphic-areas.svg new file mode 100644 index 000000000..11b874d75 --- /dev/null +++ b/svg/iD-sprite/graphics/graphic-areas.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/graphics/graphic-buildings.svg b/svg/iD-sprite/graphics/graphic-buildings.svg new file mode 100644 index 000000000..a0dc2a593 --- /dev/null +++ b/svg/iD-sprite/graphics/graphic-buildings.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/graphics/graphic-lines.svg b/svg/iD-sprite/graphics/graphic-lines.svg new file mode 100644 index 000000000..111016962 --- /dev/null +++ b/svg/iD-sprite/graphics/graphic-lines.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/graphics/graphic-points.svg b/svg/iD-sprite/graphics/graphic-points.svg new file mode 100644 index 000000000..a1b50b35e --- /dev/null +++ b/svg/iD-sprite/graphics/graphic-points.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/graphics/logo-features.svg b/svg/iD-sprite/graphics/logo-features.svg new file mode 100644 index 000000000..47f0a8cef --- /dev/null +++ b/svg/iD-sprite/graphics/logo-features.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/graphics/logo-osm.svg b/svg/iD-sprite/graphics/logo-osm.svg new file mode 100644 index 000000000..850a29b4e --- /dev/null +++ b/svg/iD-sprite/graphics/logo-osm.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/graphics/logo-reset.svg b/svg/iD-sprite/graphics/logo-reset.svg new file mode 100644 index 000000000..4108f8316 --- /dev/null +++ b/svg/iD-sprite/graphics/logo-reset.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/graphics/logo-restore.svg b/svg/iD-sprite/graphics/logo-restore.svg new file mode 100644 index 000000000..8125ab13a --- /dev/null +++ b/svg/iD-sprite/graphics/logo-restore.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/graphics/logo-walkthrough.svg b/svg/iD-sprite/graphics/logo-walkthrough.svg new file mode 100644 index 000000000..4def1ba4f --- /dev/null +++ b/svg/iD-sprite/graphics/logo-walkthrough.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/graphics/preset-icon-frame.svg b/svg/iD-sprite/graphics/preset-icon-frame.svg new file mode 100644 index 000000000..4c7e7368e --- /dev/null +++ b/svg/iD-sprite/graphics/preset-icon-frame.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/graphics/walkthrough-mouse.svg b/svg/iD-sprite/graphics/walkthrough-mouse.svg new file mode 100644 index 000000000..7b5ebdbec --- /dev/null +++ b/svg/iD-sprite/graphics/walkthrough-mouse.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/icons/icon-alert.svg b/svg/iD-sprite/icons/icon-alert.svg new file mode 100644 index 000000000..e3376c6a8 --- /dev/null +++ b/svg/iD-sprite/icons/icon-alert.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-apply.svg b/svg/iD-sprite/icons/icon-apply.svg new file mode 100644 index 000000000..08f5c0e28 --- /dev/null +++ b/svg/iD-sprite/icons/icon-apply.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-area.svg b/svg/iD-sprite/icons/icon-area.svg new file mode 100644 index 000000000..5388b0811 --- /dev/null +++ b/svg/iD-sprite/icons/icon-area.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/icons/icon-avatar.svg b/svg/iD-sprite/icons/icon-avatar.svg new file mode 100644 index 000000000..97b754e04 --- /dev/null +++ b/svg/iD-sprite/icons/icon-avatar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-backward.svg b/svg/iD-sprite/icons/icon-backward.svg new file mode 100644 index 000000000..9c3acb382 --- /dev/null +++ b/svg/iD-sprite/icons/icon-backward.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-bug.svg b/svg/iD-sprite/icons/icon-bug.svg new file mode 100644 index 000000000..1fe89faa3 --- /dev/null +++ b/svg/iD-sprite/icons/icon-bug.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-close.svg b/svg/iD-sprite/icons/icon-close.svg new file mode 100644 index 000000000..e197c6900 --- /dev/null +++ b/svg/iD-sprite/icons/icon-close.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-collapse-screen.svg b/svg/iD-sprite/icons/icon-collapse-screen.svg new file mode 100644 index 000000000..01bb699db --- /dev/null +++ b/svg/iD-sprite/icons/icon-collapse-screen.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-data.svg b/svg/iD-sprite/icons/icon-data.svg new file mode 100644 index 000000000..128eb763d --- /dev/null +++ b/svg/iD-sprite/icons/icon-data.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-down.svg b/svg/iD-sprite/icons/icon-down.svg new file mode 100644 index 000000000..544c4f6a9 --- /dev/null +++ b/svg/iD-sprite/icons/icon-down.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-edit.svg b/svg/iD-sprite/icons/icon-edit.svg new file mode 100644 index 000000000..ed16560db --- /dev/null +++ b/svg/iD-sprite/icons/icon-edit.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-forward.svg b/svg/iD-sprite/icons/icon-forward.svg new file mode 100644 index 000000000..90cb3b327 --- /dev/null +++ b/svg/iD-sprite/icons/icon-forward.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-full-screen.svg b/svg/iD-sprite/icons/icon-full-screen.svg new file mode 100644 index 000000000..a2ba5a0f0 --- /dev/null +++ b/svg/iD-sprite/icons/icon-full-screen.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-geolocate.svg b/svg/iD-sprite/icons/icon-geolocate.svg new file mode 100644 index 000000000..9e3037a5e --- /dev/null +++ b/svg/iD-sprite/icons/icon-geolocate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-help.svg b/svg/iD-sprite/icons/icon-help.svg new file mode 100644 index 000000000..468f8b720 --- /dev/null +++ b/svg/iD-sprite/icons/icon-help.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-inspect.svg b/svg/iD-sprite/icons/icon-inspect.svg new file mode 100644 index 000000000..d4f03d28c --- /dev/null +++ b/svg/iD-sprite/icons/icon-inspect.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-layers.svg b/svg/iD-sprite/icons/icon-layers.svg new file mode 100644 index 000000000..dc890db67 --- /dev/null +++ b/svg/iD-sprite/icons/icon-layers.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-line.svg b/svg/iD-sprite/icons/icon-line.svg new file mode 100644 index 000000000..11a16e5d8 --- /dev/null +++ b/svg/iD-sprite/icons/icon-line.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-load.svg b/svg/iD-sprite/icons/icon-load.svg new file mode 100644 index 000000000..4233fc685 --- /dev/null +++ b/svg/iD-sprite/icons/icon-load.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/icons/icon-minus.svg b/svg/iD-sprite/icons/icon-minus.svg new file mode 100644 index 000000000..278c5e780 --- /dev/null +++ b/svg/iD-sprite/icons/icon-minus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-more.svg b/svg/iD-sprite/icons/icon-more.svg new file mode 100644 index 000000000..e919b82ad --- /dev/null +++ b/svg/iD-sprite/icons/icon-more.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-nearby.svg b/svg/iD-sprite/icons/icon-nearby.svg new file mode 100644 index 000000000..64da55abf --- /dev/null +++ b/svg/iD-sprite/icons/icon-nearby.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/icons/icon-no.svg b/svg/iD-sprite/icons/icon-no.svg new file mode 100644 index 000000000..21573125a --- /dev/null +++ b/svg/iD-sprite/icons/icon-no.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-out-link.svg b/svg/iD-sprite/icons/icon-out-link.svg new file mode 100644 index 000000000..5452a71f8 --- /dev/null +++ b/svg/iD-sprite/icons/icon-out-link.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-plus.svg b/svg/iD-sprite/icons/icon-plus.svg new file mode 100644 index 000000000..da6a9ab20 --- /dev/null +++ b/svg/iD-sprite/icons/icon-plus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-point.svg b/svg/iD-sprite/icons/icon-point.svg new file mode 100644 index 000000000..17e5d26dc --- /dev/null +++ b/svg/iD-sprite/icons/icon-point.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-redo.svg b/svg/iD-sprite/icons/icon-redo.svg new file mode 100644 index 000000000..26cde555b --- /dev/null +++ b/svg/iD-sprite/icons/icon-redo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-relation.svg b/svg/iD-sprite/icons/icon-relation.svg new file mode 100644 index 000000000..72624a9d2 --- /dev/null +++ b/svg/iD-sprite/icons/icon-relation.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-save.svg b/svg/iD-sprite/icons/icon-save.svg new file mode 100644 index 000000000..03e42a158 --- /dev/null +++ b/svg/iD-sprite/icons/icon-save.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/icons/icon-search.svg b/svg/iD-sprite/icons/icon-search.svg new file mode 100644 index 000000000..16d655e9c --- /dev/null +++ b/svg/iD-sprite/icons/icon-search.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-translate.svg b/svg/iD-sprite/icons/icon-translate.svg new file mode 100644 index 000000000..21cd2ff44 --- /dev/null +++ b/svg/iD-sprite/icons/icon-translate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-undo.svg b/svg/iD-sprite/icons/icon-undo.svg new file mode 100644 index 000000000..37fcbcec6 --- /dev/null +++ b/svg/iD-sprite/icons/icon-undo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-up.svg b/svg/iD-sprite/icons/icon-up.svg new file mode 100644 index 000000000..448aaac6a --- /dev/null +++ b/svg/iD-sprite/icons/icon-up.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/icons/icon-vertex.svg b/svg/iD-sprite/icons/icon-vertex.svg new file mode 100644 index 000000000..c05476c54 --- /dev/null +++ b/svg/iD-sprite/icons/icon-vertex.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-circularize.svg b/svg/iD-sprite/operations/operation-circularize.svg new file mode 100644 index 000000000..547af94e9 --- /dev/null +++ b/svg/iD-sprite/operations/operation-circularize.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-continue.svg b/svg/iD-sprite/operations/operation-continue.svg new file mode 100644 index 000000000..f039b6055 --- /dev/null +++ b/svg/iD-sprite/operations/operation-continue.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-copy.svg b/svg/iD-sprite/operations/operation-copy.svg new file mode 100644 index 000000000..30ebe5309 --- /dev/null +++ b/svg/iD-sprite/operations/operation-copy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-delete.svg b/svg/iD-sprite/operations/operation-delete.svg new file mode 100644 index 000000000..d352bf40c --- /dev/null +++ b/svg/iD-sprite/operations/operation-delete.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-disconnect.svg b/svg/iD-sprite/operations/operation-disconnect.svg new file mode 100644 index 000000000..e8d22c68f --- /dev/null +++ b/svg/iD-sprite/operations/operation-disconnect.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-layers.svg b/svg/iD-sprite/operations/operation-layers.svg new file mode 100644 index 000000000..6f5ea5507 --- /dev/null +++ b/svg/iD-sprite/operations/operation-layers.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-merge.svg b/svg/iD-sprite/operations/operation-merge.svg new file mode 100644 index 000000000..49c97a89d --- /dev/null +++ b/svg/iD-sprite/operations/operation-merge.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-move.svg b/svg/iD-sprite/operations/operation-move.svg new file mode 100644 index 000000000..ac4b5c421 --- /dev/null +++ b/svg/iD-sprite/operations/operation-move.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-orthogonalize.svg b/svg/iD-sprite/operations/operation-orthogonalize.svg new file mode 100644 index 000000000..7ebe3b184 --- /dev/null +++ b/svg/iD-sprite/operations/operation-orthogonalize.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-paste.svg b/svg/iD-sprite/operations/operation-paste.svg new file mode 100644 index 000000000..68f1e37c4 --- /dev/null +++ b/svg/iD-sprite/operations/operation-paste.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/operations/operation-reflect-long.svg b/svg/iD-sprite/operations/operation-reflect-long.svg new file mode 100644 index 000000000..86473c416 --- /dev/null +++ b/svg/iD-sprite/operations/operation-reflect-long.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-reflect-short.svg b/svg/iD-sprite/operations/operation-reflect-short.svg new file mode 100644 index 000000000..0b663dd2c --- /dev/null +++ b/svg/iD-sprite/operations/operation-reflect-short.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-reverse.svg b/svg/iD-sprite/operations/operation-reverse.svg new file mode 100644 index 000000000..8fe1ff618 --- /dev/null +++ b/svg/iD-sprite/operations/operation-reverse.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-rotate.svg b/svg/iD-sprite/operations/operation-rotate.svg new file mode 100644 index 000000000..9dd2e8ee7 --- /dev/null +++ b/svg/iD-sprite/operations/operation-rotate.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-simplify.svg b/svg/iD-sprite/operations/operation-simplify.svg new file mode 100644 index 000000000..f47c5a6a9 --- /dev/null +++ b/svg/iD-sprite/operations/operation-simplify.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-smooth.svg b/svg/iD-sprite/operations/operation-smooth.svg new file mode 100644 index 000000000..449c78914 --- /dev/null +++ b/svg/iD-sprite/operations/operation-smooth.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/operations/operation-split.svg b/svg/iD-sprite/operations/operation-split.svg new file mode 100644 index 000000000..4918353eb --- /dev/null +++ b/svg/iD-sprite/operations/operation-split.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/operations/operation-straighten.svg b/svg/iD-sprite/operations/operation-straighten.svg new file mode 100644 index 000000000..d8a5c62e4 --- /dev/null +++ b/svg/iD-sprite/operations/operation-straighten.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/boundary.svg b/svg/iD-sprite/presets/boundary.svg new file mode 100644 index 000000000..1f75b3142 --- /dev/null +++ b/svg/iD-sprite/presets/boundary.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/category-path.svg b/svg/iD-sprite/presets/category-path.svg new file mode 100644 index 000000000..9807c1e67 --- /dev/null +++ b/svg/iD-sprite/presets/category-path.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/category-rail.svg b/svg/iD-sprite/presets/category-rail.svg new file mode 100644 index 000000000..984c4071d --- /dev/null +++ b/svg/iD-sprite/presets/category-rail.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/category-roads.svg b/svg/iD-sprite/presets/category-roads.svg new file mode 100644 index 000000000..071ccfdc7 --- /dev/null +++ b/svg/iD-sprite/presets/category-roads.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/category-water.svg b/svg/iD-sprite/presets/category-water.svg new file mode 100644 index 000000000..5fa4d6df3 --- /dev/null +++ b/svg/iD-sprite/presets/category-water.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/ferry-line.svg b/svg/iD-sprite/presets/ferry-line.svg new file mode 100644 index 000000000..d3fc47061 --- /dev/null +++ b/svg/iD-sprite/presets/ferry-line.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-bridleway.svg b/svg/iD-sprite/presets/highway-bridleway.svg new file mode 100644 index 000000000..fe828d4a8 --- /dev/null +++ b/svg/iD-sprite/presets/highway-bridleway.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-bus-guideway.svg b/svg/iD-sprite/presets/highway-bus-guideway.svg new file mode 100644 index 000000000..b803b617d --- /dev/null +++ b/svg/iD-sprite/presets/highway-bus-guideway.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-cycleway.svg b/svg/iD-sprite/presets/highway-cycleway.svg new file mode 100644 index 000000000..04e8e65a6 --- /dev/null +++ b/svg/iD-sprite/presets/highway-cycleway.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-footway.svg b/svg/iD-sprite/presets/highway-footway.svg new file mode 100644 index 000000000..f00631100 --- /dev/null +++ b/svg/iD-sprite/presets/highway-footway.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-living-street.svg b/svg/iD-sprite/presets/highway-living-street.svg new file mode 100644 index 000000000..8954ab0f9 --- /dev/null +++ b/svg/iD-sprite/presets/highway-living-street.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-motorway-link.svg b/svg/iD-sprite/presets/highway-motorway-link.svg new file mode 100644 index 000000000..1ac2ea938 --- /dev/null +++ b/svg/iD-sprite/presets/highway-motorway-link.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-motorway.svg b/svg/iD-sprite/presets/highway-motorway.svg new file mode 100644 index 000000000..fffb3cc4d --- /dev/null +++ b/svg/iD-sprite/presets/highway-motorway.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-path.svg b/svg/iD-sprite/presets/highway-path.svg new file mode 100644 index 000000000..82443531b --- /dev/null +++ b/svg/iD-sprite/presets/highway-path.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-primary-link.svg b/svg/iD-sprite/presets/highway-primary-link.svg new file mode 100644 index 000000000..b848ec033 --- /dev/null +++ b/svg/iD-sprite/presets/highway-primary-link.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-primary.svg b/svg/iD-sprite/presets/highway-primary.svg new file mode 100644 index 000000000..31281258f --- /dev/null +++ b/svg/iD-sprite/presets/highway-primary.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-residential.svg b/svg/iD-sprite/presets/highway-residential.svg new file mode 100644 index 000000000..aab994cb9 --- /dev/null +++ b/svg/iD-sprite/presets/highway-residential.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-road.svg b/svg/iD-sprite/presets/highway-road.svg new file mode 100644 index 000000000..031ce0634 --- /dev/null +++ b/svg/iD-sprite/presets/highway-road.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-secondary-link.svg b/svg/iD-sprite/presets/highway-secondary-link.svg new file mode 100644 index 000000000..e2361874f --- /dev/null +++ b/svg/iD-sprite/presets/highway-secondary-link.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-secondary.svg b/svg/iD-sprite/presets/highway-secondary.svg new file mode 100644 index 000000000..a7b7d43fe --- /dev/null +++ b/svg/iD-sprite/presets/highway-secondary.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-service.svg b/svg/iD-sprite/presets/highway-service.svg new file mode 100644 index 000000000..5ae813ca3 --- /dev/null +++ b/svg/iD-sprite/presets/highway-service.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-steps.svg b/svg/iD-sprite/presets/highway-steps.svg new file mode 100644 index 000000000..ea59a4759 --- /dev/null +++ b/svg/iD-sprite/presets/highway-steps.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-tertiary-link.svg b/svg/iD-sprite/presets/highway-tertiary-link.svg new file mode 100644 index 000000000..92ca37e14 --- /dev/null +++ b/svg/iD-sprite/presets/highway-tertiary-link.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-tertiary.svg b/svg/iD-sprite/presets/highway-tertiary.svg new file mode 100644 index 000000000..f990a4441 --- /dev/null +++ b/svg/iD-sprite/presets/highway-tertiary.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-track.svg b/svg/iD-sprite/presets/highway-track.svg new file mode 100644 index 000000000..83c6300bb --- /dev/null +++ b/svg/iD-sprite/presets/highway-track.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-trunk-link.svg b/svg/iD-sprite/presets/highway-trunk-link.svg new file mode 100644 index 000000000..bec29286e --- /dev/null +++ b/svg/iD-sprite/presets/highway-trunk-link.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-trunk.svg b/svg/iD-sprite/presets/highway-trunk.svg new file mode 100644 index 000000000..eb5807c90 --- /dev/null +++ b/svg/iD-sprite/presets/highway-trunk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/highway-unclassified.svg b/svg/iD-sprite/presets/highway-unclassified.svg new file mode 100644 index 000000000..19e26d53d --- /dev/null +++ b/svg/iD-sprite/presets/highway-unclassified.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/multipolygon.svg b/svg/iD-sprite/presets/multipolygon.svg new file mode 100644 index 000000000..0f6424b8b --- /dev/null +++ b/svg/iD-sprite/presets/multipolygon.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/other-line.svg b/svg/iD-sprite/presets/other-line.svg new file mode 100644 index 000000000..86efcc5af --- /dev/null +++ b/svg/iD-sprite/presets/other-line.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/pipeline-line.svg b/svg/iD-sprite/presets/pipeline-line.svg new file mode 100644 index 000000000..51557cfee --- /dev/null +++ b/svg/iD-sprite/presets/pipeline-line.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/piste-line.svg b/svg/iD-sprite/presets/piste-line.svg new file mode 100644 index 000000000..93b6af45c --- /dev/null +++ b/svg/iD-sprite/presets/piste-line.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/power-line.svg b/svg/iD-sprite/presets/power-line.svg new file mode 100644 index 000000000..143ff297a --- /dev/null +++ b/svg/iD-sprite/presets/power-line.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-abandoned.svg b/svg/iD-sprite/presets/railway-abandoned.svg new file mode 100644 index 000000000..cce58d938 --- /dev/null +++ b/svg/iD-sprite/presets/railway-abandoned.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-disused.svg b/svg/iD-sprite/presets/railway-disused.svg new file mode 100644 index 000000000..af212ca9d --- /dev/null +++ b/svg/iD-sprite/presets/railway-disused.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-light-rail.svg b/svg/iD-sprite/presets/railway-light-rail.svg new file mode 100644 index 000000000..e44411449 --- /dev/null +++ b/svg/iD-sprite/presets/railway-light-rail.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-monorail.svg b/svg/iD-sprite/presets/railway-monorail.svg new file mode 100644 index 000000000..3d0ad26a1 --- /dev/null +++ b/svg/iD-sprite/presets/railway-monorail.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-rail.svg b/svg/iD-sprite/presets/railway-rail.svg new file mode 100644 index 000000000..1719b3707 --- /dev/null +++ b/svg/iD-sprite/presets/railway-rail.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-subway.svg b/svg/iD-sprite/presets/railway-subway.svg new file mode 100644 index 000000000..67288aa5f --- /dev/null +++ b/svg/iD-sprite/presets/railway-subway.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/railway-tram.svg b/svg/iD-sprite/presets/railway-tram.svg new file mode 100644 index 000000000..30be971f8 --- /dev/null +++ b/svg/iD-sprite/presets/railway-tram.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/relation.svg b/svg/iD-sprite/presets/relation.svg new file mode 100644 index 000000000..a2dc02000 --- /dev/null +++ b/svg/iD-sprite/presets/relation.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/restriction-no-left-turn.svg b/svg/iD-sprite/presets/restriction-no-left-turn.svg new file mode 100644 index 000000000..47ecd1277 --- /dev/null +++ b/svg/iD-sprite/presets/restriction-no-left-turn.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/restriction-no-right-turn.svg b/svg/iD-sprite/presets/restriction-no-right-turn.svg new file mode 100644 index 000000000..7f8d11f1c --- /dev/null +++ b/svg/iD-sprite/presets/restriction-no-right-turn.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/restriction-no-straight-on.svg b/svg/iD-sprite/presets/restriction-no-straight-on.svg new file mode 100644 index 000000000..f90391e2f --- /dev/null +++ b/svg/iD-sprite/presets/restriction-no-straight-on.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/restriction-no-u-turn.svg b/svg/iD-sprite/presets/restriction-no-u-turn.svg new file mode 100644 index 000000000..50371cff1 --- /dev/null +++ b/svg/iD-sprite/presets/restriction-no-u-turn.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/svg/iD-sprite/presets/restriction-only-left-turn.svg b/svg/iD-sprite/presets/restriction-only-left-turn.svg new file mode 100644 index 000000000..7b7feb9be --- /dev/null +++ b/svg/iD-sprite/presets/restriction-only-left-turn.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/restriction-only-right-turn.svg b/svg/iD-sprite/presets/restriction-only-right-turn.svg new file mode 100644 index 000000000..edc410414 --- /dev/null +++ b/svg/iD-sprite/presets/restriction-only-right-turn.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/restriction-only-straight-on.svg b/svg/iD-sprite/presets/restriction-only-straight-on.svg new file mode 100644 index 000000000..3abc1ddfc --- /dev/null +++ b/svg/iD-sprite/presets/restriction-only-straight-on.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/restriction-only-u-turn.svg b/svg/iD-sprite/presets/restriction-only-u-turn.svg new file mode 100644 index 000000000..0169acf23 --- /dev/null +++ b/svg/iD-sprite/presets/restriction-only-u-turn.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/restriction.svg b/svg/iD-sprite/presets/restriction.svg new file mode 100644 index 000000000..3a598bd73 --- /dev/null +++ b/svg/iD-sprite/presets/restriction.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/svg/iD-sprite/presets/route-bicycle.svg b/svg/iD-sprite/presets/route-bicycle.svg new file mode 100644 index 000000000..ace6da0e2 --- /dev/null +++ b/svg/iD-sprite/presets/route-bicycle.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-bus.svg b/svg/iD-sprite/presets/route-bus.svg new file mode 100644 index 000000000..d5b12648a --- /dev/null +++ b/svg/iD-sprite/presets/route-bus.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-detour.svg b/svg/iD-sprite/presets/route-detour.svg new file mode 100644 index 000000000..22aa2463c --- /dev/null +++ b/svg/iD-sprite/presets/route-detour.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-ferry.svg b/svg/iD-sprite/presets/route-ferry.svg new file mode 100644 index 000000000..70c9890fe --- /dev/null +++ b/svg/iD-sprite/presets/route-ferry.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-foot.svg b/svg/iD-sprite/presets/route-foot.svg new file mode 100644 index 000000000..c62a329e6 --- /dev/null +++ b/svg/iD-sprite/presets/route-foot.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-horse.svg b/svg/iD-sprite/presets/route-horse.svg new file mode 100644 index 000000000..15e2d3fa5 --- /dev/null +++ b/svg/iD-sprite/presets/route-horse.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-light-rail.svg b/svg/iD-sprite/presets/route-light-rail.svg new file mode 100644 index 000000000..17ac56ffc --- /dev/null +++ b/svg/iD-sprite/presets/route-light-rail.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-line.svg b/svg/iD-sprite/presets/route-line.svg new file mode 100644 index 000000000..23134bd88 --- /dev/null +++ b/svg/iD-sprite/presets/route-line.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-master.svg b/svg/iD-sprite/presets/route-master.svg new file mode 100644 index 000000000..10dbe5bbb --- /dev/null +++ b/svg/iD-sprite/presets/route-master.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-pipeline.svg b/svg/iD-sprite/presets/route-pipeline.svg new file mode 100644 index 000000000..a13bd95aa --- /dev/null +++ b/svg/iD-sprite/presets/route-pipeline.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-piste.svg b/svg/iD-sprite/presets/route-piste.svg new file mode 100644 index 000000000..21b959d1b --- /dev/null +++ b/svg/iD-sprite/presets/route-piste.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-power.svg b/svg/iD-sprite/presets/route-power.svg new file mode 100644 index 000000000..fe0b5bc89 --- /dev/null +++ b/svg/iD-sprite/presets/route-power.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-road.svg b/svg/iD-sprite/presets/route-road.svg new file mode 100644 index 000000000..7873f89c0 --- /dev/null +++ b/svg/iD-sprite/presets/route-road.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-subway.svg b/svg/iD-sprite/presets/route-subway.svg new file mode 100644 index 000000000..338bc741d --- /dev/null +++ b/svg/iD-sprite/presets/route-subway.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-train.svg b/svg/iD-sprite/presets/route-train.svg new file mode 100644 index 000000000..bee1b2f25 --- /dev/null +++ b/svg/iD-sprite/presets/route-train.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-tram.svg b/svg/iD-sprite/presets/route-tram.svg new file mode 100644 index 000000000..63ef6638f --- /dev/null +++ b/svg/iD-sprite/presets/route-tram.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route-water.svg b/svg/iD-sprite/presets/route-water.svg new file mode 100644 index 000000000..da4f32f18 --- /dev/null +++ b/svg/iD-sprite/presets/route-water.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/route.svg b/svg/iD-sprite/presets/route.svg new file mode 100644 index 000000000..5ec6f518b --- /dev/null +++ b/svg/iD-sprite/presets/route.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/svg/iD-sprite/presets/waterway-canal.svg b/svg/iD-sprite/presets/waterway-canal.svg new file mode 100644 index 000000000..a7b02b973 --- /dev/null +++ b/svg/iD-sprite/presets/waterway-canal.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/waterway-ditch.svg b/svg/iD-sprite/presets/waterway-ditch.svg new file mode 100644 index 000000000..2b4d6be6c --- /dev/null +++ b/svg/iD-sprite/presets/waterway-ditch.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/waterway-river.svg b/svg/iD-sprite/presets/waterway-river.svg new file mode 100644 index 000000000..cc6affd7c --- /dev/null +++ b/svg/iD-sprite/presets/waterway-river.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/presets/waterway-stream.svg b/svg/iD-sprite/presets/waterway-stream.svg new file mode 100644 index 000000000..4e08fd7e3 --- /dev/null +++ b/svg/iD-sprite/presets/waterway-stream.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/svg/iD-sprite/turns/turn-no-u.svg b/svg/iD-sprite/turns/turn-no-u.svg new file mode 100644 index 000000000..d6e7d06f0 --- /dev/null +++ b/svg/iD-sprite/turns/turn-no-u.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/turns/turn-no.svg b/svg/iD-sprite/turns/turn-no.svg new file mode 100644 index 000000000..a234d000b --- /dev/null +++ b/svg/iD-sprite/turns/turn-no.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/turns/turn-only-u.svg b/svg/iD-sprite/turns/turn-only-u.svg new file mode 100644 index 000000000..3befa679f --- /dev/null +++ b/svg/iD-sprite/turns/turn-only-u.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/turns/turn-only.svg b/svg/iD-sprite/turns/turn-only.svg new file mode 100644 index 000000000..93c08a03e --- /dev/null +++ b/svg/iD-sprite/turns/turn-only.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/turns/turn-shadow.svg b/svg/iD-sprite/turns/turn-shadow.svg new file mode 100644 index 000000000..c4468ec89 --- /dev/null +++ b/svg/iD-sprite/turns/turn-shadow.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/svg/iD-sprite/turns/turn-yes-u.svg b/svg/iD-sprite/turns/turn-yes-u.svg new file mode 100644 index 000000000..4d6af03a4 --- /dev/null +++ b/svg/iD-sprite/turns/turn-yes-u.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/svg/iD-sprite/turns/turn-yes.svg b/svg/iD-sprite/turns/turn-yes.svg new file mode 100644 index 000000000..0a2081ec0 --- /dev/null +++ b/svg/iD-sprite/turns/turn-yes.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/test/spec/svg/icon.js b/test/spec/svg/icon.js index b799929ee..bf6f395f9 100644 --- a/test/spec/svg/icon.js +++ b/test/spec/svg/icon.js @@ -6,13 +6,13 @@ describe('iD.svgIcon', function () { }); it('creates a generic SVG icon', function () { - selection.call(iD.svgIcon('#icon-bug')); + selection.call(iD.svgIcon('#iD-icon-bug')); expect(selection.select('svg').classed('icon')).to.be.true; - expect(selection.select('use').attr('xlink:href')).to.eql('#icon-bug'); + expect(selection.select('use').attr('xlink:href')).to.eql('#iD-icon-bug'); }); it('classes the \'svg\' and \'use\' elements', function () { - selection.call(iD.svgIcon('#icon-bug', 'svg-class', 'use-class')); + selection.call(iD.svgIcon('#iD-icon-bug', 'svg-class', 'use-class')); expect(selection.select('svg').classed('icon svg-class')).to.be.true; expect(selection.select('use').classed('use-class')).to.be.true; });