CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 00:29:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3229 from kepta/sort-modules

Browse Source 
Sort modules [eslint rule]
This commit is contained in:
Kushan Joshi
2016-07-06 12:27:48 +05:30
committed by GitHub
parent efc0be033f 3ec8c50137
commit 48673e0420
68 changed files with 10456 additions and 10580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -6,3 +6,4 @@ dist/*.js
dist/*.css
dist/img/*.svg
data/data.js
js/lib/id/*.js
data/presets/fields.json
+104 -104
View File
@@ -1,4 +1,27 @@
{
"access_simple": {
"key": "access",
"type": "combo",
"label": "Allowed Access",
"placeholder": "yes",
"options": [
"permissive",
"private",
"customers",
"no"
]
},
"access_toilets": {
"key": "access",
"type": "combo",
"label": "Access",
"options": [
"yes",
"permissive",
"private",
"customers"
]
},
"access": {
"keys": [
"access",
@@ -53,29 +76,6 @@
}
}
},
"access_simple": {
"key": "access",
"type": "combo",
"label": "Allowed Access",
"placeholder": "yes",
"options": [
"permissive",
"private",
"customers",
"no"
]
},
"access_toilets": {
"key": "access",
"type": "combo",
"label": "Access",
"options": [
"yes",
"permissive",
"private",
"customers"
]
},
"address": {
"type": "address",
"keys": [
@@ -246,11 +246,6 @@
"type": "text",
"label": "Brand"
},
"building": {
"key": "building",
"type": "combo",
"label": "Building"
},
"building_area": {
"key": "building",
"type": "combo",
@@ -258,6 +253,11 @@
"geometry": "area",
"label": "Building"
},
"building": {
"key": "building",
"type": "combo",
"label": "Building"
},
"capacity": {
"key": "capacity",
"type": "number",
@@ -510,16 +510,16 @@
"label": "Fix Me",
"universal": true
},
"fuel": {
"key": "fuel",
"type": "combo",
"label": "Fuel"
},
"fuel_multi": {
"key": "fuel:",
"type": "multiCombo",
"label": "Fuel Types"
},
"fuel": {
"key": "fuel",
"type": "combo",
"label": "Fuel"
},
"gauge": {
"key": "gauge",
"type": "combo",
@@ -600,11 +600,6 @@
"type": "text",
"label": "ICAO"
},
"incline": {
"key": "incline",
"type": "combo",
"label": "Incline"
},
"incline_steps": {
"key": "incline",
"type": "combo",
@@ -616,6 +611,11 @@
}
}
},
"incline": {
"key": "incline",
"type": "combo",
"label": "Incline"
},
"information": {
"key": "information",
"type": "typeCombo",
@@ -666,6 +666,19 @@
"type": "combo",
"label": "Layer"
},
"leaf_cycle_singular": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
"strings": {
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
}
}
},
"leaf_cycle": {
"key": "leaf_cycle",
"type": "combo",
@@ -680,16 +693,15 @@
}
}
},
"leaf_cycle_singular": {
"key": "leaf_cycle",
"leaf_type_singular": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Cycle",
"label": "Leaf Type",
"strings": {
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"leafless": "Leafless"
}
}
},
@@ -706,18 +718,6 @@
}
}
},
"leaf_type_singular": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
"strings": {
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"leafless": "Leafless"
}
}
},
"leisure": {
"key": "leisure",
"type": "typeCombo",
@@ -856,18 +856,6 @@
"type": "typeCombo",
"label": "Type"
},
"oneway": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
}
},
"oneway_yes": {
"key": "oneway",
"type": "check",
@@ -880,6 +868,18 @@
}
}
},
"oneway": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
}
},
"opening_hours": {
"key": "opening_hours",
"type": "text",
@@ -1001,16 +1001,16 @@
"type": "text",
"label": "Population"
},
"power": {
"key": "power",
"type": "typeCombo",
"label": "Type"
},
"power_supply": {
"key": "power_supply",
"type": "check",
"label": "Power Supply"
},
"power": {
"key": "power",
"type": "typeCombo",
"label": "Type"
},
"railway": {
"key": "railway",
"type": "typeCombo",
@@ -1055,13 +1055,13 @@
"type": "number",
"label": "Rooms"
},
"route": {
"key": "route",
"route_master": {
"key": "route_master",
"type": "combo",
"label": "Type"
},
"route_master": {
"key": "route_master",
"route": {
"key": "route",
"type": "combo",
"label": "Type"
},
@@ -1091,6 +1091,19 @@
"type": "check",
"label": "Seasonal"
},
"service_rail": {
"key": "service",
"type": "combo",
"label": "Service Type",
"strings": {
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
}
},
"service": {
"key": "service",
"type": "combo",
@@ -1127,29 +1140,16 @@
}
}
},
"service_rail": {
"key": "service",
"shelter_type": {
"key": "shelter_type",
"type": "combo",
"label": "Service Type",
"strings": {
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
}
"label": "Type"
},
"shelter": {
"key": "shelter",
"type": "check",
"label": "Shelter"
},
"shelter_type": {
"key": "shelter_type",
"type": "combo",
"label": "Type"
},
"shop": {
"key": "shop",
"type": "typeCombo",
@@ -1223,11 +1223,6 @@
"universal": true,
"label": "Source"
},
"sport": {
"key": "sport",
"type": "combo",
"label": "Sport"
},
"sport_ice": {
"key": "sport",
"type": "combo",
@@ -1254,6 +1249,11 @@
"running"
]
},
"sport": {
"key": "sport",
"type": "combo",
"label": "Sport"
},
"stars": {
"key": "stars",
"type": "number",
@@ -1404,16 +1404,16 @@
"type": "combo",
"label": "Type of Goods"
},
"water": {
"key": "water",
"type": "combo",
"label": "Type"
},
"water_point": {
"key": "water_point",
"type": "check",
"label": "Water Point"
},
"water": {
"key": "water",
"type": "combo",
"label": "Type"
},
"waterway": {
"key": "waterway",
"type": "typeCombo",
data/presets/presets.json
+208 -208
View File
@@ -1218,31 +1218,6 @@
],
"name": "Nightclub"
},
"amenity/parking": {
"icon": "parking",
"fields": [
"operator",
"parking",
"capacity",
"fee",
"access_simple",
"supervised",
"park_ride",
"surface",
"maxstay",
"address"
],
"geometry": [
"point",
"vertex",
"area"
],
"tags": {
"amenity": "parking"
},
"terms": [],
"name": "Car Parking"
},
"amenity/parking_entrance": {
"icon": "entrance",
"fields": [
@@ -1272,6 +1247,31 @@
},
"name": "Parking Space"
},
"amenity/parking": {
"icon": "parking",
"fields": [
"operator",
"parking",
"capacity",
"fee",
"access_simple",
"supervised",
"park_ride",
"surface",
"maxstay",
"address"
],
"geometry": [
"point",
"vertex",
"area"
],
"tags": {
"amenity": "parking"
},
"terms": [],
"name": "Car Parking"
},
"amenity/pharmacy": {
"icon": "pharmacy",
"fields": [
@@ -4426,26 +4426,6 @@
],
"name": "Mini-Roundabout"
},
"highway/motorway": {
"icon": "highway-motorway",
"fields": [
"oneway_yes",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref"
],
"geometry": [
"line"
],
"tags": {
"highway": "motorway"
},
"terms": [],
"name": "Motorway"
},
"highway/motorway_junction": {
"geometry": [
"vertex"
@@ -4489,6 +4469,26 @@
],
"name": "Motorway Link"
},
"highway/motorway": {
"icon": "highway-motorway",
"fields": [
"oneway_yes",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref"
],
"geometry": [
"line"
],
"tags": {
"highway": "motorway"
},
"terms": [],
"name": "Motorway"
},
"highway/path": {
"icon": "highway-path",
"fields": [
@@ -4539,27 +4539,6 @@
"terms": [],
"name": "Pedestrian Street"
},
"highway/primary": {
"icon": "highway-primary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "primary"
},
"terms": [],
"name": "Primary Road"
},
"highway/primary_link": {
"icon": "highway-primary-link",
"fields": [
@@ -4584,6 +4563,27 @@
],
"name": "Primary Link"
},
"highway/primary": {
"icon": "highway-primary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "primary"
},
"terms": [],
"name": "Primary Road"
},
"highway/raceway": {
"icon": "highway-unclassified",
"fields": [
@@ -4660,27 +4660,6 @@
"terms": [],
"name": "Unknown Road"
},
"highway/secondary": {
"icon": "highway-secondary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "secondary"
},
"terms": [],
"name": "Secondary Road"
},
"highway/secondary_link": {
"icon": "highway-secondary-link",
"fields": [
@@ -4705,6 +4684,27 @@
],
"name": "Secondary Link"
},
"highway/secondary": {
"icon": "highway-secondary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "secondary"
},
"terms": [],
"name": "Secondary Road"
},
"highway/service": {
"icon": "highway-service",
"fields": [
@@ -4881,27 +4881,6 @@
],
"name": "Street Lamp"
},
"highway/tertiary": {
"icon": "highway-tertiary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "tertiary"
},
"terms": [],
"name": "Tertiary Road"
},
"highway/tertiary_link": {
"icon": "highway-tertiary-link",
"fields": [
@@ -4926,6 +4905,27 @@
],
"name": "Tertiary Link"
},
"highway/tertiary": {
"icon": "highway-tertiary",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref",
"cycleway"
],
"geometry": [
"line"
],
"tags": {
"highway": "tertiary"
},
"terms": [],
"name": "Tertiary Road"
},
"highway/track": {
"icon": "highway-track",
"fields": [
@@ -4987,26 +4987,6 @@
],
"name": "Traffic Signals"
},
"highway/trunk": {
"icon": "highway-trunk",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref"
],
"geometry": [
"line"
],
"tags": {
"highway": "trunk"
},
"terms": [],
"name": "Trunk Road"
},
"highway/trunk_link": {
"icon": "highway-trunk-link",
"fields": [
@@ -5030,6 +5010,26 @@
],
"name": "Trunk Link"
},
"highway/trunk": {
"icon": "highway-trunk",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"ref"
],
"geometry": [
"line"
],
"tags": {
"highway": "trunk"
},
"terms": [],
"name": "Trunk Road"
},
"highway/turning_circle": {
"icon": "circle",
"geometry": [
@@ -6736,6 +6736,22 @@
},
"name": "Spring"
},
"natural/tree_row": {
"fields": [
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
"geometry": [
"line"
],
"terms": [],
"tags": {
"natural": "tree_row"
},
"name": "Tree row"
},
"natural/tree": {
"fields": [
"leaf_type_singular",
@@ -6753,22 +6769,6 @@
},
"name": "Tree"
},
"natural/tree_row": {
"fields": [
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
"geometry": [
"line"
],
"terms": [],
"tags": {
"natural": "tree_row"
},
"name": "Tree row"
},
"natural/volcano": {
"icon": "triangle",
"fields": [
@@ -7797,6 +7797,17 @@
],
"name": "Railway Station"
},
"railway/subway_entrance": {
"icon": "rail-metro",
"geometry": [
"point"
],
"tags": {
"railway": "subway_entrance"
},
"terms": [],
"name": "Subway Entrance"
},
"railway/subway": {
"icon": "railway-subway",
"geometry": [
@@ -7814,17 +7825,6 @@
"terms": [],
"name": "Subway"
},
"railway/subway_entrance": {
"icon": "rail-metro",
"geometry": [
"point"
],
"tags": {
"railway": "subway_entrance"
},
"terms": [],
"name": "Subway Entrance"
},
"railway/tram": {
"icon": "railway-light-rail",
"geometry": [
@@ -8214,26 +8214,6 @@
},
"name": "Candle Shop"
},
"shop/car": {
"icon": "car",
"fields": [
"operator",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"auto"
],
"tags": {
"shop": "car"
},
"name": "Car Dealership"
},
"shop/car_parts": {
"icon": "car",
"fields": [
@@ -8274,6 +8254,26 @@
},
"name": "Car Repair Shop"
},
"shop/car": {
"icon": "car",
"fields": [
"operator",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"auto"
],
"tags": {
"shop": "car"
},
"name": "Car Dealership"
},
"shop/carpet": {
"icon": "shop",
"fields": [
@@ -9862,6 +9862,23 @@
},
"name": "Variety Store"
},
"shop/video_games": {
"icon": "shop",
"fields": [
"operator",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"tags": {
"shop": "video_games"
},
"name": "Video Game Store"
},
"shop/video": {
"icon": "shop",
"fields": [
@@ -9882,23 +9899,6 @@
},
"name": "Video Store"
},
"shop/video_games": {
"icon": "shop",
"fields": [
"operator",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"tags": {
"shop": "video_games"
},
"name": "Video Game Store"
},
"shop/water_sports": {
"icon": "shop",
"fields": [
@@ -10533,6 +10533,22 @@
],
"icon": "restriction-only-straight-on"
},
"type/route_master": {
"geometry": [
"relation"
],
"tags": {
"type": "route_master"
},
"name": "Route Master",
"icon": "route-master",
"fields": [
"route_master",
"ref",
"operator",
"network"
]
},
"type/route": {
"geometry": [
"relation"
@@ -10730,22 +10746,6 @@
"operator"
]
},
"type/route_master": {
"geometry": [
"relation"
],
"tags": {
"type": "route_master"
},
"name": "Route Master",
"icon": "route-master",
"fields": [
"route_master",
"ref",
"operator",
"network"
]
},
"type/site": {
"geometry": [
"relation"
data/taginfo.json
+30 -30
View File
@@ -276,10 +276,6 @@
"key": "amenity",
"value": "nightclub"
},
{
"key": "amenity",
"value": "parking"
},
{
"key": "amenity",
"value": "parking_entrance"
@@ -288,6 +284,10 @@
"key": "amenity",
"value": "parking_space"
},
{
"key": "amenity",
"value": "parking"
},
{
"key": "amenity",
"value": "pharmacy"
@@ -990,10 +990,6 @@
"key": "highway",
"value": "mini_roundabout"
},
{
"key": "highway",
"value": "motorway"
},
{
"key": "highway",
"value": "motorway_junction"
@@ -1002,6 +998,10 @@
"key": "highway",
"value": "motorway_link"
},
{
"key": "highway",
"value": "motorway"
},
{
"key": "highway",
"value": "path"
@@ -1012,11 +1012,11 @@
},
{
"key": "highway",
"value": "primary"
"value": "primary_link"
},
{
"key": "highway",
"value": "primary_link"
"value": "primary"
},
{
"key": "highway",
@@ -1036,11 +1036,11 @@
},
{
"key": "highway",
"value": "secondary"
"value": "secondary_link"
},
{
"key": "highway",
"value": "secondary_link"
"value": "secondary"
},
{
"key": "highway",
@@ -1084,11 +1084,11 @@
},
{
"key": "highway",
"value": "tertiary"
"value": "tertiary_link"
},
{
"key": "highway",
"value": "tertiary_link"
"value": "tertiary"
},
{
"key": "highway",
@@ -1100,11 +1100,11 @@
},
{
"key": "highway",
"value": "trunk"
"value": "trunk_link"
},
{
"key": "highway",
"value": "trunk_link"
"value": "trunk"
},
{
"key": "highway",
@@ -1575,11 +1575,11 @@
},
{
"key": "natural",
"value": "tree"
"value": "tree_row"
},
{
"key": "natural",
"value": "tree_row"
"value": "tree"
},
{
"key": "natural",
@@ -1826,11 +1826,11 @@
},
{
"key": "railway",
"value": "subway"
"value": "subway_entrance"
},
{
"key": "railway",
"value": "subway_entrance"
"value": "subway"
},
{
"key": "railway",
@@ -1915,10 +1915,6 @@
"key": "shop",
"value": "candles"
},
{
"key": "shop",
"value": "car"
},
{
"key": "shop",
"value": "car_parts"
@@ -1927,6 +1923,10 @@
"key": "shop",
"value": "car_repair"
},
{
"key": "shop",
"value": "car"
},
{
"key": "shop",
"value": "carpet"
@@ -2269,11 +2269,11 @@
},
{
"key": "shop",
"value": "video"
"value": "video_games"
},
{
"key": "shop",
"value": "video_games"
"value": "video"
},
{
"key": "shop",
@@ -2422,6 +2422,10 @@
"key": "restriction",
"value": "only_straight_on"
},
{
"key": "type",
"value": "route_master"
},
{
"key": "type",
"value": "route"
@@ -2474,10 +2478,6 @@
"key": "route",
"value": "tram"
},
{
"key": "type",
"value": "route_master"
},
{
"key": "type",
"value": "site"
dist/locales/en.json
Vendored
+103 -103
View File
@@ -648,6 +648,13 @@
}
},
"fields": {
"access_simple": {
"label": "Allowed Access",
"placeholder": "yes"
},
"access_toilets": {
"label": "Access"
},
"access": {
"label": "Allowed Access",
"placeholder": "Not Specified",
@@ -689,13 +696,6 @@
}
}
},
"access_simple": {
"label": "Allowed Access",
"placeholder": "yes"
},
"access_toilets": {
"label": "Access"
},
"address": {
"label": "Address",
"placeholders": {
@@ -794,10 +794,10 @@
"brand": {
"label": "Brand"
},
"building": {
"building_area": {
"label": "Building"
},
"building_area": {
"building": {
"label": "Building"
},
"capacity": {
@@ -962,12 +962,12 @@
"fixme": {
"label": "Fix Me"
},
"fuel": {
"label": "Fuel"
},
"fuel_multi": {
"label": "Fuel Types"
},
"fuel": {
"label": "Fuel"
},
"gauge": {
"label": "Gauge"
},
@@ -1016,9 +1016,6 @@
"icao": {
"label": "ICAO"
},
"incline": {
"label": "Incline"
},
"incline_steps": {
"label": "Incline",
"options": {
@@ -1026,6 +1023,9 @@
"down": "Down"
}
},
"incline": {
"label": "Incline"
},
"information": {
"label": "Type"
},
@@ -1058,6 +1058,15 @@
"layer": {
"label": "Layer"
},
"leaf_cycle_singular": {
"label": "Leaf Cycle",
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
}
},
"leaf_cycle": {
"label": "Leaf Cycle",
"options": {
@@ -1068,13 +1077,12 @@
"mixed": "Mixed"
}
},
"leaf_cycle_singular": {
"label": "Leaf Cycle",
"leaf_type_singular": {
"label": "Leaf Type",
"options": {
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"leafless": "Leafless"
}
},
"leaf_type": {
@@ -1086,14 +1094,6 @@
"leafless": "Leafless"
}
},
"leaf_type_singular": {
"label": "Leaf Type",
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"leafless": "Leafless"
}
},
"leisure": {
"label": "Type"
},
@@ -1175,14 +1175,6 @@
"office": {
"label": "Type"
},
"oneway": {
"label": "One Way",
"options": {
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
},
"oneway_yes": {
"label": "One Way",
"options": {
@@ -1191,6 +1183,14 @@
"no": "No"
}
},
"oneway": {
"label": "One Way",
"options": {
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
},
"opening_hours": {
"label": "Hours"
},
@@ -1274,12 +1274,12 @@
"population": {
"label": "Population"
},
"power": {
"label": "Type"
},
"power_supply": {
"label": "Power Supply"
},
"power": {
"label": "Type"
},
"railway": {
"label": "Type"
},
@@ -1304,10 +1304,10 @@
"rooms": {
"label": "Rooms"
},
"route": {
"route_master": {
"label": "Type"
},
"route_master": {
"route": {
"label": "Type"
},
"sac_scale": {
@@ -1328,6 +1328,15 @@
"seasonal": {
"label": "Seasonal"
},
"service_rail": {
"label": "Service Type",
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
},
"service": {
"label": "Type"
},
@@ -1347,21 +1356,12 @@
"no": "No"
}
},
"service_rail": {
"label": "Service Type",
"options": {
"spur": "Spur",
"yard": "Yard",
"siding": "Siding",
"crossover": "Crossover"
}
"shelter_type": {
"label": "Type"
},
"shelter": {
"label": "Shelter"
},
"shelter_type": {
"label": "Type"
},
"shop": {
"label": "Type"
},
@@ -1401,15 +1401,15 @@
"source": {
"label": "Source"
},
"sport": {
"label": "Sport"
},
"sport_ice": {
"label": "Sport"
},
"sport_racing": {
"label": "Sport"
},
"sport": {
"label": "Sport"
},
"stars": {
"label": "Stars"
},
@@ -1505,12 +1505,12 @@
"vending": {
"label": "Type of Goods"
},
"water": {
"label": "Type"
},
"water_point": {
"label": "Water Point"
},
"water": {
"label": "Type"
},
"waterway": {
"label": "Type"
},
@@ -1800,10 +1800,6 @@
"name": "Nightclub",
"terms": "disco*,night club,dancing,dance club"
},
"amenity/parking": {
"name": "Car Parking",
"terms": ""
},
"amenity/parking_entrance": {
"name": "Parking Garage Entrance/Exit",
"terms": ""
@@ -1812,6 +1808,10 @@
"name": "Parking Space",
"terms": ""
},
"amenity/parking": {
"name": "Car Parking",
"terms": ""
},
"amenity/pharmacy": {
"name": "Pharmacy",
"terms": "drug*,med*,prescription"
@@ -2520,10 +2520,6 @@
"name": "Mini-Roundabout",
"terms": ""
},
"highway/motorway": {
"name": "Motorway",
"terms": ""
},
"highway/motorway_junction": {
"name": "Motorway Junction / Exit",
"terms": ""
@@ -2532,6 +2528,10 @@
"name": "Motorway Link",
"terms": "ramp,on ramp,off ramp"
},
"highway/motorway": {
"name": "Motorway",
"terms": ""
},
"highway/path": {
"name": "Path",
"terms": "hike,hiking,trackway,trail,walk"
@@ -2540,14 +2540,14 @@
"name": "Pedestrian Street",
"terms": ""
},
"highway/primary": {
"name": "Primary Road",
"terms": ""
},
"highway/primary_link": {
"name": "Primary Link",
"terms": "ramp,on ramp,off ramp"
},
"highway/primary": {
"name": "Primary Road",
"terms": ""
},
"highway/raceway": {
"name": "Motor Raceway",
"terms": "auto*,race*,nascar"
@@ -2564,14 +2564,14 @@
"name": "Unknown Road",
"terms": ""
},
"highway/secondary": {
"name": "Secondary Road",
"terms": ""
},
"highway/secondary_link": {
"name": "Secondary Link",
"terms": "ramp,on ramp,off ramp"
},
"highway/secondary": {
"name": "Secondary Road",
"terms": ""
},
"highway/service": {
"name": "Service Road",
"terms": ""
@@ -2612,14 +2612,14 @@
"name": "Street Lamp",
"terms": "streetlight,street light,lamp,light,gaslight"
},
"highway/tertiary": {
"name": "Tertiary Road",
"terms": ""
},
"highway/tertiary_link": {
"name": "Tertiary Link",
"terms": "ramp,on ramp,off ramp"
},
"highway/tertiary": {
"name": "Tertiary Road",
"terms": ""
},
"highway/track": {
"name": "Unmaintained Track Road",
"terms": "woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track"
@@ -2628,14 +2628,14 @@
"name": "Traffic Signals",
"terms": "light,stoplight,traffic light"
},
"highway/trunk": {
"name": "Trunk Road",
"terms": ""
},
"highway/trunk_link": {
"name": "Trunk Link",
"terms": "ramp,on ramp,off ramp"
},
"highway/trunk": {
"name": "Trunk Road",
"terms": ""
},
"highway/turning_circle": {
"name": "Turning Circle",
"terms": "cul-de-sac"
@@ -3112,14 +3112,14 @@
"name": "Spring",
"terms": ""
},
"natural/tree": {
"name": "Tree",
"terms": ""
},
"natural/tree_row": {
"name": "Tree row",
"terms": ""
},
"natural/tree": {
"name": "Tree",
"terms": ""
},
"natural/volcano": {
"name": "Volcano",
"terms": "mountain,crater"
@@ -3372,14 +3372,14 @@
"name": "Railway Station",
"terms": "train station,station"
},
"railway/subway": {
"name": "Subway",
"terms": ""
},
"railway/subway_entrance": {
"name": "Subway Entrance",
"terms": ""
},
"railway/subway": {
"name": "Subway",
"terms": ""
},
"railway/tram": {
"name": "Tram",
"terms": "streetcar"
@@ -3468,10 +3468,6 @@
"name": "Candle Shop",
"terms": ""
},
"shop/car": {
"name": "Car Dealership",
"terms": "auto"
},
"shop/car_parts": {
"name": "Car Parts Store",
"terms": "auto"
@@ -3480,6 +3476,10 @@
"name": "Car Repair Shop",
"terms": "auto"
},
"shop/car": {
"name": "Car Dealership",
"terms": "auto"
},
"shop/carpet": {
"name": "Carpet Store",
"terms": "rug"
@@ -3820,14 +3820,14 @@
"name": "Variety Store",
"terms": ""
},
"shop/video": {
"name": "Video Store",
"terms": "DVD"
},
"shop/video_games": {
"name": "Video Game Store",
"terms": ""
},
"shop/video": {
"name": "Video Store",
"terms": "DVD"
},
"shop/water_sports": {
"name": "Watersport/Swim Shop",
"terms": ""
@@ -3976,6 +3976,10 @@
"name": "No Turns",
"terms": ""
},
"type/route_master": {
"name": "Route Master",
"terms": ""
},
"type/route": {
"name": "Route",
"terms": ""
@@ -4028,10 +4032,6 @@
"name": "Tram Route",
"terms": ""
},
"type/route_master": {
"name": "Route Master",
"terms": ""
},
"type/site": {
"name": "Site",
"terms": ""
js/lib/id/index.js
+9864 -9923
View File
File diff suppressed because it is too large Load Diff
modules/.eslintrc
+6 -1
View File
@@ -7,7 +7,12 @@
"plugin:import/errors"
],
rules: {
"no-invalid-this": 0
"no-invalid-this": 0,
"sort-imports": ["error", {
"ignoreCase": false,
"ignoreMemberSort": false,
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
}]
},
globals: {
"iD": false,
modules/actions/circularize.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { euclideanDistance, interp } from '../geo/index';
import { Node } from '../core/index';
import { interp, euclideanDistance } from '../geo/index';
export function Circularize(wayId
, projection, maxAngle) {
modules/actions/delete_multiple.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { DeleteWay } from './delete_way';
import { DeleteNode } from './delete_node';
import { DeleteRelation } from './delete_relation';
import { DeleteWay } from './delete_way';
export function DeleteMultiple(ids) {
var actions = {
modules/actions/delete_node.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { DeleteWay } from './delete_way';
import { DeleteRelation } from './delete_relation';
import { DeleteWay } from './delete_way';
// https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteNodeAction.as
export function DeleteNode(nodeId) {
modules/actions/join.js
+2 -2
View File
@@ -6,9 +6,9 @@
// https://github.com/systemed/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/MergeWaysAction.as
// https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/actions/CombineWayAction.java
//
import { joinWays } from '../geo/index';
import { interestingTag } from '../core/index';
import { DeleteWay } from './delete_way';
import { interestingTag } from '../core/index';
import { joinWays } from '../geo/index';
export function Join(ids) {
modules/actions/move.js
+4 -4
View File
@@ -1,12 +1,12 @@
// https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/command/MoveCommand.java
// https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
import {
angle as getAngle,
sphericalDistance,
chooseEdge,
pathLength,
angle as getAngle,
interp,
pathIntersections
pathIntersections,
pathLength,
sphericalDistance
} from '../geo/index';
import { Node } from '../core/index';
modules/actions/restrict_turn.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { Relation, Way } from '../core/index';
import { Split } from './split';
import { inferRestriction } from '../geo/index';
import { Relation, Way } from '../core/index';
// Create a restriction relation for `turn`, which must have the following structure:
//
// {
modules/actions/revert.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { DeleteWay } from './delete_way';
import { DeleteRelation } from './delete_relation';
import { DeleteWay } from './delete_way';
export function Revert(id) {
modules/actions/split.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { Relation, Way } from '../core/index';
import { isSimpleMultipolygonOuterMember, sphericalDistance } from '../geo/index';
import { AddMember } from './add_member';
import { sphericalDistance, isSimpleMultipolygonOuterMember} from '../geo/index';
import { wrap as Wrap } from '../util/index';
import { Way, Relation } from '../core/index';
// Split a way at the given node.
//
modules/behavior/draw.js
+1 -1
View File
@@ -1,4 +1,4 @@
import { euclideanDistance, chooseEdge } from '../geo/index';
import { chooseEdge, euclideanDistance } from '../geo/index';
import { Edit } from './edit';
import { Hover } from './hover';
import { Tail } from './tail';
modules/behavior/draw_way.js
+3 -3
View File
@@ -1,9 +1,9 @@
import { Node, Way } from '../core/index';
import { entitySelector } from '../util/index';
import { AddEntity, AddMidpoint, AddVertex, MoveNode } from '../actions/index';
import { Browse, Select } from '../modes/index';
import { Node, Way } from '../core/index';
import { chooseEdge, edgeEqual } from '../geo/index';
import { AddEntity, AddVertex, MoveNode, AddMidpoint } from '../actions/index';
import { Draw } from './draw';
import { entitySelector } from '../util/index';
export function DrawWay(context, wayId, index, mode, baseGraph) {
var way = context.entity(wayId),
modules/behavior/hash.js
+1 -1
View File
@@ -1,4 +1,4 @@
import { stringQs, qsString } from '../util/index';
import { qsString, stringQs } from '../util/index';
export function Hash(context) {
var s0 = null, // cached location.hash
lat = 90 - 1e-8; // allowable latitude range
modules/behavior/lasso.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { Select } from '../modes/index';
import { Extent, pointInPolygon } from '../geo/index';
import { Select } from '../modes/index';
import { Lasso as uiLasso } from '../ui/index';
export function Lasso(context) {
modules/behavior/paste.js
+2 -2
View File
@@ -1,6 +1,6 @@
import { Move as MoveMode } from '../modes/index';
import { ChangeTags, CopyEntities, Move as MoveAction} from '../actions/index';
import { Extent, pointInPolygon } from '../geo/index';
import { CopyEntities, ChangeTags, Move as MoveAction} from '../actions/index';
import { Move as MoveMode } from '../modes/index';
import { cmd } from '../ui/index';
export function Paste(context) {
modules/behavior/select.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { Entity } from '../core/index';
import { Browse, Select as SelectMode } from '../modes/index';
import { Entity } from '../core/index';
export function Select(context) {
function keydown() {
if (d3.event && d3.event.shiftKey) {
modules/core/connection.js
+4 -4
View File
@@ -1,10 +1,10 @@
import { Entity } from './entity';
import { Way } from './way';
import { Relation } from './relation';
import { Node } from './node';
import { Extent } from '../geo/index';
import osmAuth from 'osm-auth';
import { JXON } from '../util/jxon';
import { Node } from './node';
import { Relation } from './relation';
import { Way } from './way';
import osmAuth from 'osm-auth';
export function Connection(useHttps) {
if (typeof useHttps !== 'boolean') {
modules/core/history.js
+3 -3
View File
@@ -1,9 +1,9 @@
import { Difference } from './difference';
import { Entity } from './entity';
import { Graph } from './graph';
import { Difference } from './difference';
import { Tree } from './tree';
import { SessionMutex } from '../util/index';
import { Loading } from '../ui/index';
import { SessionMutex } from '../util/index';
import { Tree } from './tree';
export function History(context) {
var stack, index, tree,
modules/core/relation.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { Entity } from './entity';
import { Extent, joinWays, polygonContainsPolygon, polygonIntersectsPolygon } from '../geo/index';
import { Entity } from './entity';
export function Relation() {
if (!(this instanceof Relation)) {
modules/core/way.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { Extent, cross } from '../geo/index';
import { Entity } from './entity';
import { oneWayTags } from './tags';
import { cross, Extent } from '../geo/index';
export function Way() {
if (!(this instanceof Way)) {
modules/geo/intersection.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { angle as getAngle } from './index';
import { Way } from '../core/index';
import { angle as getAngle } from './index';
export function Turn(turn) {
if (!(this instanceof Turn))
modules/index.js
+3 -3
View File
@@ -1,12 +1,12 @@
import * as actions from './actions/index';
import * as geo from './geo/index';
import * as behavior from './behavior/index';
import * as geo from './geo/index';
import * as modes from './modes/index';
import * as util from './util/index';
import * as operations from './operations/index';
import * as presets from './presets/index';
import * as validations from './validations/index';
import * as ui from './ui/index';
import * as util from './util/index';
import * as validations from './validations/index';
// core
export { Connection } from './core/connection';
modules/modes/add_area.js
+3 -2
View File
@@ -1,7 +1,8 @@
import { AddWay } from '../behavior/index';
import { AddEntity, AddMidpoint, AddVertex } from '../actions/index';
import { Node, Way } from '../core/index';
import { AddWay } from '../behavior/index';
import { DrawArea } from './index';
import { AddEntity, AddVertex, AddMidpoint } from '../actions/index';
export function AddArea(context) {
var mode = {
id: 'add-area',
modules/modes/add_line.js
+3 -2
View File
@@ -1,7 +1,8 @@
import { AddWay } from '../behavior/index';
import { AddEntity, AddMidpoint, AddVertex } from '../actions/index';
import { Node, Way } from '../core/index';
import { AddWay } from '../behavior/index';
import { DrawLine } from './index';
import { AddEntity, AddVertex, AddMidpoint } from '../actions/index';
export function AddLine(context) {
var mode = {
id: 'add-line',
modules/modes/add_point.js
+3 -2
View File
@@ -1,7 +1,8 @@
import { Browse, Select } from './index';
import { AddEntity } from '../actions/index';
import { Draw } from '../behavior/index';
import { Node } from '../core/index';
import { Select, Browse } from './index';
import { AddEntity } from '../actions/index';
export function AddPoint(context) {
var mode = {
id: 'add-point',
modules/modes/browse.js
+2 -1
View File
@@ -1,5 +1,6 @@
import { Paste, Hover, Select, Lasso } from '../behavior/index';
import { Hover, Lasso, Paste, Select } from '../behavior/index';
import { DragNode } from './index';
export function Browse(context) {
var mode = {
button: 'browse',
modules/modes/drag_node.js
+5 -4
View File
@@ -1,9 +1,10 @@
import { Hover, Edit, drag } from '../behavior/index';
import { AddMidpoint, Connect, MoveNode, Noop } from '../actions/index';
import { Browse, Select } from './index';
import { Edit, Hover, drag } from '../behavior/index';
import { Node } from '../core/index';
import { entitySelector } from '../util/index';
import { Select, Browse } from './index';
import { chooseEdge } from '../geo/index';
import { AddMidpoint, Noop, MoveNode, Connect } from '../actions/index';
import { entitySelector } from '../util/index';
export function DragNode(context) {
var mode = {
id: 'drag-node',
modules/modes/draw_area.js
+1
View File
@@ -1,4 +1,5 @@
import { DrawWay } from '../behavior/index';
export function DrawArea(context, wayId, baseGraph) {
var mode = {
button: 'area',
modules/modes/move.js
+3 -2
View File
@@ -1,6 +1,7 @@
import { Edit } from '../behavior/index';
import { Select, Browse } from './index';
import { Browse, Select } from './index';
import { Move as MoveAction, Noop } from '../actions/index';
import { Edit } from '../behavior/index';
export function Move(context, entityIDs, baseGraph) {
var mode = {
id: 'move',
modules/modes/rotate_way.js
+3 -2
View File
@@ -1,6 +1,7 @@
import { Edit } from '../behavior/index';
import { Select, Browse } from './index';
import { Browse, Select } from './index';
import { Noop, RotateWay as RotateWayAction } from '../actions/index';
import { Edit } from '../behavior/index';
export function RotateWay(context, wayId) {
var mode = {
id: 'rotate-way',
modules/modes/save.js
+3 -3
View File
@@ -1,8 +1,8 @@
import { Graph } from '../core/index';
import { Commit, Conflicts, Loading, Success } from '../ui/index';
import { DiscardTags, MergeRemoteChanges, Noop, Revert } from '../actions/index';
import { displayName, displayType } from '../util/index';
import { Browse } from './index';
import { DiscardTags, Noop, MergeRemoteChanges, Revert } from '../actions/index';
import { Commit, Loading, Success, Conflicts } from '../ui/index';
import { Graph } from '../core/index';
import { JXON } from '../util/jxon';
export function Save(context) {
modules/modes/select.js
+8 -7
View File
@@ -1,11 +1,12 @@
import { Copy, Paste, Breathe, Hover, Select as SelectBehavior, Lasso } from '../behavior/index';
import { Way, Node } from '../core/index';
import { entityOrMemberSelector } from '../util/index';
import { DragNode, Browse } from './index';
import { Extent, pointInPolygon, chooseEdge } from '../geo/index';
import { AddMidpoint } from '../actions/index';
import * as Operations from '../operations/index';
import { RadialMenu, SelectionList } from '../ui/index';
import { Breathe, Copy, Hover, Lasso, Paste, Select as SelectBehavior } from '../behavior/index';
import { Extent, chooseEdge, pointInPolygon } from '../geo/index';
import { Node, Way } from '../core/index';
import { RadialMenu, SelectionList } from '../ui/index';
import { AddMidpoint } from '../actions/index';
import { Browse } from './browse';
import { DragNode } from './drag_node';
import { entityOrMemberSelector } from '../util/index';
export function Select(context, selectedIDs) {
var mode = {
modules/operations/delete.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { Select, Browse } from '../modes/index';
import { sphericalDistance } from '../geo/index';
import { Browse, Select } from '../modes/index';
import { DeleteMultiple } from '../actions/index';
import { cmd } from '../ui/index';
import { sphericalDistance } from '../geo/index';
export function Delete(selectedIDs, context) {
var action = DeleteMultiple(selectedIDs);
modules/operations/merge.js
+2 -1
View File
@@ -1,5 +1,6 @@
import { Select } from '../modes/index';
import { Join, Merge as MergeAction, MergePolygon } from '../actions/index';
import { Select } from '../modes/index';
export function Merge(selectedIDs, context) {
var join = Join(selectedIDs),
merge = MergeAction(selectedIDs),
modules/operations/move.js
+2 -1
View File
@@ -1,6 +1,7 @@
import { Move as MoveMode } from '../modes/index';
import { Extent } from '../geo/index';
import { Move as MoveAction } from '../actions/index';
import { Move as MoveMode } from '../modes/index';
export function Move(selectedIDs, context) {
var extent = selectedIDs.reduce(function(extent, id) {
return extent.extend(context.entity(id).extent(context.graph()));
modules/presets/presets.js
+1 -1
View File
@@ -1,7 +1,7 @@
import { Category } from './category';
import { Collection } from './collection';
import { Field } from './field';
import { Preset } from './preset';
import { Category } from './category';
export function presets() {
// an iD.presets.Collection with methods for
modules/renderer/background.js
+2 -2
View File
@@ -1,5 +1,5 @@
import { stringQs, qsString } from '../util/index';
import { offsetToMeters, Extent, metersToOffset } from '../geo/index';
import { Extent, metersToOffset, offsetToMeters} from '../geo/index';
import { qsString, stringQs } from '../util/index';
import { BackgroundSource } from './background_source';
import { TileLayer } from './tile_layer';
modules/renderer/background_source.js
+2 -1
View File
@@ -1,4 +1,5 @@
import { polygonIntersectsPolygon, Extent } from '../geo/index';
import { Extent, polygonIntersectsPolygon } from '../geo/index';
export function BackgroundSource(data) {
var source = _.clone(data),
offset = [0, 0],
modules/renderer/map.js
+3 -3
View File
@@ -1,6 +1,6 @@
import { setTransform, fastMouse } from '../util/index';
import { interp, Extent } from '../geo/index';
import { Layers, Areas, Midpoints, Points, Vertices, Lines, Labels } from '../svg/index';
import { Areas, Labels, Layers, Lines, Midpoints, Points, Vertices } from '../svg/index';
import { Extent, interp } from '../geo/index';
import { fastMouse, setTransform } from '../util/index';
import { flash } from '../ui/index';
export function Map(context) {
modules/ui/background.js
+4 -4
View File
@@ -1,9 +1,9 @@
import { Icon } from '../svg/index';
import { setTransform } from '../util/index';
import { metersToOffset, offsetToMeters } from '../geo/index';
import { BackgroundSource } from '../renderer/index';
import { offsetToMeters, metersToOffset } from '../geo/index';
import { cmd } from './cmd';
import { Icon } from '../svg/index';
import { MapInMap } from './map_in_map';
import { cmd } from './cmd';
import { setTransform } from '../util/index';
import { tooltipHtml } from './tooltipHtml';
export function Background(context) {
modules/ui/commit.js
+2 -1
View File
@@ -1,6 +1,7 @@
import { displayName, entityOrMemberSelector } from '../util/index';
import { Icon } from '../svg/index';
import { entityOrMemberSelector, displayName } from '../util/index';
import { Select } from '../modes/index';
export function Commit(context) {
var dispatch = d3.dispatch('cancel', 'save');
modules/ui/conflicts.js
+2 -1
View File
@@ -1,6 +1,7 @@
import { Extent } from '../geo/index';
import { Icon } from '../svg/index';
import { entityOrMemberSelector } from '../util/index';
import { Extent } from '../geo/index';
export function Conflicts(context) {
var dispatch = d3.dispatch('download', 'cancel', 'save'),
list;
modules/ui/entity_editor.js
+3 -3
View File
@@ -1,12 +1,12 @@
import { Icon } from '../svg/index';
import { Browse } from '../modes/index';
import { ChangeTags } from '../actions/index';
import { preset } from './preset';
import { Icon } from '../svg/index';
import { PresetIcon } from './preset_icon';
import { RawTagEditor } from './raw_tag_editor';
import { RawMemberEditor } from './raw_member_editor';
import { RawMembershipEditor } from './raw_membership_editor';
import { RawTagEditor } from './raw_tag_editor';
import { TagReference } from './tag_reference';
import { preset } from './preset';
export function EntityEditor(context) {
var dispatch = d3.dispatch('choose'),
modules/ui/feature_list.js
+5 -5
View File
@@ -1,9 +1,9 @@
import { Icon } from '../svg/index';
import { Entity } from '../core/index';
import { displayName, entityOrMemberSelector } from '../util/index';
import { Select } from '../modes/index';
import { Extent, chooseEdge } from '../geo/index';
import * as sexagesimal from 'sexagesimal';
import { Extent, chooseEdge } from '../geo/index';
import { displayName, entityOrMemberSelector } from '../util/index';
import { Entity } from '../core/index';
import { Icon } from '../svg/index';
import { Select } from '../modes/index';
export function FeatureList(context) {
var geocodeResults;
modules/ui/fields/index.js
+5 -4
View File
@@ -1,11 +1,12 @@
import { check, defaultcheck} from './check';
import { combo, multiCombo, typeCombo } from './combo';
import { email, number, tel, text, url } from './input';
import { access } from './access';
import { address } from './address';
import { check, defaultcheck} from './check';
import { combo, typeCombo, multiCombo } from './combo';
import { cycleway } from './cycleway';
import { text, url, number, email, tel } from './input';
import { localized } from './localized';
import { lanes } from './lanes';
import { localized } from './localized';
import { maxspeed } from './maxspeed';
import { radio } from './radio';
import { restrictions } from './restrictions';
modules/ui/fields/restrictions.js
+4 -4
View File
@@ -1,8 +1,8 @@
import { Layers, Vertices, Lines, Turns } from '../../svg/index';
import { Hover } from '../../behavior/index';
import { Extent, Intersection, RawMercator, Turn, inferRestriction } from '../../geo/index';
import { Layers, Lines, Turns, Vertices } from '../../svg/index';
import { RestrictTurn, UnrestrictTurn, } from '../../actions/index';
import { Entity } from '../../core/index';
import { Intersection, Extent, RawMercator, Turn, inferRestriction } from '../../geo/index';
import { UnrestrictTurn, RestrictTurn } from '../../actions/index';
import { Hover } from '../../behavior/index';
export function restrictions(field, context) {
var dispatch = d3.dispatch('change'),
modules/ui/fields/wikipedia.js
+2 -1
View File
@@ -1,5 +1,6 @@
import { Icon } from '../../svg/index';
import { ChangeTags } from '../../actions/index';
import { Icon } from '../../svg/index';
export function wikipedia(field, context) {
var dispatch = d3.dispatch('change'),
wikipedia = iD.services.wikipedia(),
modules/ui/geolocate.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { Icon } from '../svg/index';
import { Browse } from '../modes/index';
import { Extent } from '../geo/index';
import { Icon } from '../svg/index';
import { Loading } from './loading';
export function Geolocate(context) {
modules/ui/help.js
+1 -1
View File
@@ -1,7 +1,7 @@
import { Icon } from '../svg/index';
import { intro } from './intro';
import { tooltipHtml } from './tooltipHtml';
import marked from 'marked';
import { tooltipHtml } from './tooltipHtml';
export function Help(context) {
var key = 'H';
modules/ui/init.js
+4 -92
View File
@@ -1,58 +1,29 @@
import { fields } from './fields/index';
import { Defs, Icon } from '../svg/index';
import { Account } from './account';
import { Attribution } from './attribution';
import { Background } from './background';
import { cmd } from './cmd';
import { Commit } from './commit';
import { confirm } from './confirm';
import { Conflicts } from './conflicts';
import { Browse } from '../modes/index';
import { Contributors } from './contributors';
import { Disclosure } from './disclosure';
import { EntityEditor } from './entity_editor';
import { FeatureInfo } from './feature_info';
import { FeatureList } from './feature_list';
import { flash } from './flash';
import { FullScreen } from './full_screen';
import { Geolocate } from './geolocate';
import { Hash } from '../behavior/index';
import { Help } from './help';
import { Info } from './info';
import { Inspector } from './inspector';
import { intro } from './intro/index';
import { Lasso } from './lasso';
import { Loading } from './loading';
import { MapData } from './map_data';
import { MapInMap } from './map_in_map';
import { modal } from './modal';
import { Modes } from './modes';
import { Notice } from './notice';
import { preset } from './preset';
import { PresetIcon } from './preset_icon';
import { PresetList } from './preset_list';
import { RadialMenu } from './radial_menu';
import { RawMemberEditor } from './raw_member_editor';
import { RawMembershipEditor } from './raw_membership_editor';
import { RawTagEditor } from './raw_tag_editor';
import { Restore } from './restore';
import { Save } from './save';
import { Scale } from './scale';
import { SelectionList } from './selection_list';
import { Sidebar } from './sidebar';
import { SourceSwitch } from './source_switch';
import { Spinner } from './spinner';
import { Splash } from './splash';
import { Status } from './status';
import { Success } from './success';
import { TagReference } from './tag_reference';
import { Toggle } from './toggle';
import { tooltipHtml } from './tooltipHtml';
import { UndoRedo } from './undo_redo';
import { ViewOnOSM } from './view_on_osm';
import { Zoom } from './zoom';
import { Defs, Icon } from '../svg/index';
import { Hash } from '../behavior/index';
import { Browse } from '../modes/index';
import { cmd } from './cmd';
export function init(context) {
function render(container) {
@@ -279,66 +250,7 @@ export function init(context) {
});
}
//TODO: figure this sidebar
ui.sidebar = Sidebar(context);
return ui;
}
//
// ui.preset = preset;
// Object.keys(fields).map(function(p) {
// ui.preset[p] = fields[p];
// });
//
// ui.intro = intro;
// ui.Account = Account;
// ui.Attribution = Attribution;
// ui.Background = Background;
// ui.cmd = cmd;
// ui.Commit = Commit;
// ui.confirm = confirm;
// ui.Conflicts = Conflicts;
// ui.Contributors = Contributors;
// ui.Disclosure = Disclosure;
// ui.EntityEditor = EntityEditor;
// ui.FeatureInfo = FeatureInfo;
// ui.FeatureList = FeatureList;
// ui.flash = flash;
// ui.FullScreen = FullScreen;
// ui.Geolocate = Geolocate;
// ui.Help = Help;
// ui.Info = Info;
// ui.Inspector = Inspector;
// ui.intro = intro;
// ui.Lasso = Lasso;
// ui.Loading = Loading;
// ui.MapData = MapData;
// ui.MapInMap = MapInMap;
// ui.modal = modal;
// ui.Modes = Modes;
// ui.Notice = Notice;
// ui.preset = preset;
// ui.PresetIcon = PresetIcon;
// ui.PresetList = PresetList;
// ui.RadialMenu = RadialMenu;
// ui.RawMemberEditor = RawMemberEditor;
// ui.RawMembershipEditor = RawMembershipEditor;
// ui.RawTagEditor = RawTagEditor;
// ui.Restore = Restore;
// ui.Save = Save;
// ui.Scale = Scale;
// ui.SelectionList = SelectionList;
// ui.Sidebar = Sidebar;
// ui.SourceSwitch = SourceSwitch;
// ui.Spinner = Spinner;
// ui.Splash = Splash;
// ui.Status = Status;
// ui.Success = Success;
// ui.TagReference = TagReference;
// ui.Toggle = Toggle;
// ui.tooltipHtml = tooltipHtml;
// ui.UndoRedo = UndoRedo;
// ui.ViewOnOSM = ViewOnOSM;
// ui.Zoom = Zoom;
modules/ui/inspector.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { PresetList } from './preset_list';
import { EntityEditor } from './entity_editor';
import { PresetList } from './preset_list';
import { ViewOnOSM } from './view_on_osm';
export function Inspector(context) {
modules/ui/intro/intro.js
+1 -1
View File
@@ -1,6 +1,6 @@
import { Icon } from '../../svg/index';
import { Entity, Graph } from '../../core/index';
import { Browse } from '../../modes/index';
import { Icon } from '../../svg/index';
import { area } from './area';
import { line } from './line';
import { navigation } from './navigation';
modules/ui/intro/start_editing.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { modal } from '../modal';
import { icon } from './helper';
import { modal } from '../modal';
export function startEditing(context, reveal) {
var event = d3.dispatch('done', 'startEditing'),
modules/ui/map_in_map.js
+2 -2
View File
@@ -1,7 +1,7 @@
import { Gpx, Debug } from '../svg/index';
import { setTransform } from '../util/index';
import { Debug, Gpx } from '../svg/index';
import { RawMercator } from '../geo/index';
import { TileLayer } from '../renderer/index';
import { setTransform } from '../util/index';
export function MapInMap(context) {
var key = '/';
modules/ui/modes.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { AddArea, AddLine, AddPoint, Browse } from '../modes/index';
import { Icon } from '../svg/index';
import { AddPoint, AddLine, AddArea, Browse } from '../modes/index';
import { tooltipHtml } from './tooltipHtml';
export function Modes(context) {
modules/ui/preset.js
+2 -2
View File
@@ -1,8 +1,8 @@
import { Browse } from '../modes/index';
import { Disclosure } from './disclosure';
import { Icon } from '../svg/index';
import { TagReference } from './tag_reference';
import { Browse } from '../modes/index';
import { fields } from './fields/index';
import { Disclosure } from './disclosure';
export function preset(context) {
var event = d3.dispatch('change'),
modules/ui/preset_list.js
+1 -1
View File
@@ -1,7 +1,7 @@
import { Icon } from '../svg/index';
import { Browse } from '../modes/index';
import { ChangePreset } from '../actions/index';
import { Delete } from '../operations/index';
import { Icon } from '../svg/index';
import { PresetIcon } from './preset_icon';
import { TagReference } from './tag_reference';
modules/ui/raw_member_editor.js
+4 -4
View File
@@ -1,9 +1,9 @@
import { Icon } from '../svg/index';
import { Entity } from '../core/index';
import { displayName } from '../util/index';
import { Select, Browse } from '../modes/index';
import { Browse, Select } from '../modes/index';
import { ChangeMember, DeleteMember } from '../actions/index';
import { Disclosure } from './disclosure';
import { Entity } from '../core/index';
import { Icon } from '../svg/index';
import { displayName } from '../util/index';
export function RawMemberEditor(context) {
var id;
modules/ui/raw_membership_editor.js
+5 -5
View File
@@ -1,9 +1,9 @@
import { Icon } from '../svg/index';
import { Relation, Entity } from '../core/index';
import { displayName } from '../util/index';
import { Select } from '../modes/index';
import { ChangeMember, AddMember, AddEntity, DeleteMember } from '../actions/index';
import { AddEntity, AddMember, ChangeMember, DeleteMember } from '../actions/index';
import { Entity, Relation } from '../core/index';
import { Disclosure } from './disclosure';
import { Icon } from '../svg/index';
import { Select } from '../modes/index';
import { displayName } from '../util/index';
export function RawMembershipEditor(context) {
var id, showBlank;
modules/ui/raw_tag_editor.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { Icon } from '../svg/index';
import { Disclosure } from './disclosure';
import { Icon } from '../svg/index';
import { TagReference } from './tag_reference';
export function RawTagEditor(context) {
modules/ui/selection_list.js
+3 -2
View File
@@ -1,7 +1,8 @@
import { Icon } from '../svg/index';
import { Entity } from '../core/index';
import { displayName } from '../util/index';
import { Icon } from '../svg/index';
import { Select } from '../modes/index';
import { displayName } from '../util/index';
export function SelectionList(context, selectedIDs) {
function selectEntity(entity) {
modules/ui/sidebar.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { Inspector } from './inspector';
import { FeatureList } from './feature_list';
import { Inspector } from './inspector';
import { Notice } from './notice';
export function Sidebar(context) {
modules/ui/splash.js
+1 -1
View File
@@ -1,5 +1,5 @@
import { modal } from './modal';
import { intro } from './intro';
import { modal } from './modal';
export function Splash(context) {
return function(selection) {