Commit 48673e04 authored by Kushan Joshi's avatar Kushan Joshi Committed by GitHub

Merge pull request #3229 from kepta/sort-modules

Sort modules [eslint rule]
parents efc0be03 3ec8c501
......@@ -6,3 +6,4 @@ dist/*.js
dist/*.css
dist/img/*.svg
data/data.js
js/lib/id/*.js
{
"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,16 +246,16 @@
"type": "text",
"label": "Brand"
},
"building": {
"building_area": {
"key": "building",
"type": "combo",
"default": "yes",
"geometry": "area",
"label": "Building"
},
"building_area": {
"building": {
"key": "building",
"type": "combo",
"default": "yes",
"geometry": "area",
"label": "Building"
},
"capacity": {
......@@ -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,7 +666,7 @@
"type": "combo",
"label": "Layer"
},
"leaf_cycle": {
"leaf_cycle_singular": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
......@@ -675,12 +675,11 @@
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
"semi_deciduous": "Semi-Deciduous"
}
}
},
"leaf_cycle_singular": {
"leaf_cycle": {
"key": "leaf_cycle",
"type": "combo",
"label": "Leaf Cycle",
......@@ -689,11 +688,12 @@
"evergreen": "Evergreen",
"deciduous": "Deciduous",
"semi_evergreen": "Semi-Evergreen",
"semi_deciduous": "Semi-Deciduous"
"semi_deciduous": "Semi-Deciduous",
"mixed": "Mixed"
}
}
},
"leaf_type": {
"leaf_type_singular": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
......@@ -701,12 +701,11 @@
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
},
"leaf_type_singular": {
"leaf_type": {
"key": "leaf_type",
"type": "combo",
"label": "Leaf Type",
......@@ -714,6 +713,7 @@
"options": {
"broadleaved": "Broadleaved",
"needleleaved": "Needleleaved",
"mixed": "Mixed",
"leafless": "Leafless"
}
}
......@@ -856,25 +856,25 @@
"type": "typeCombo",
"label": "Type"
},
"oneway": {
"oneway_yes": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be No",
"undefined": "Assumed to be Yes",
"yes": "Yes",
"no": "No"
}
}
},
"oneway_yes": {
"oneway": {
"key": "oneway",
"type": "check",
"label": "One Way",
"strings": {
"options": {
"undefined": "Assumed to be Yes",
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
......@@ -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",
......
This diff is collapsed.
......@@ -278,15 +278,15 @@
},
{
"key": "amenity",
"value": "parking"
"value": "parking_entrance"
},
{
"key": "amenity",
"value": "parking_entrance"
"value": "parking_space"
},
{
"key": "amenity",
"value": "parking_space"
"value": "parking"
},
{
"key": "amenity",
......@@ -992,15 +992,15 @@
},
{
"key": "highway",
"value": "motorway"
"value": "motorway_junction"
},
{
"key": "highway",
"value": "motorway_junction"
"value": "motorway_link"
},
{
"key": "highway",
"value": "motorway_link"
"value": "motorway"
},
{
"key": "highway",
......@@ -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",
......@@ -1917,15 +1917,15 @@
},
{
"key": "shop",
"value": "car"
"value": "car_parts"
},
{
"key": "shop",
"value": "car_parts"
"value": "car_repair"
},
{
"key": "shop",
"value": "car_repair"
"value": "car"
},
{
"key": "shop",
......@@ -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"
......
This diff is collapsed.
This diff is collapsed.
......@@ -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,
......
import { euclideanDistance, interp } from '../geo/index';
import { Node } from '../core/index';
import { interp, euclideanDistance } from '../geo/index';
export function Circularize(wayId
, projection, maxAngle) {
......
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 = {
......
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) {
......
......@@ -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) {
......
// 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';
......
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:
//
// {
......
import { DeleteWay } from './delete_way';
import { DeleteRelation } from './delete_relation';
import { DeleteWay } from './delete_way';
export function Revert(id) {
......
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.
//
......
import { euclideanDistance, chooseEdge } from '../geo/index';
import { chooseEdge, euclideanDistance } from '../geo/index';
import { Edit } from './edit';
import { Hover } from './hover';
import { Tail } from './tail';
......
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),
......
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
......
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) {
......
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) {
......
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) {
......
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') {
......
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,
......
import { Entity } from './entity';
import { Extent, joinWays, polygonContainsPolygon, polygonIntersectsPolygon } from '../geo/index';
import { Entity } from './entity';
export function Relation() {
if (!(this instanceof Relation)) {
......
import { Extent, cross } from '../geo/index';
import { Entity } from './entity';
import { oneWayTags } from './tags';
import { cross, Extent } from '../geo/index';