Use Node's built-in test runner for tests that don't need to be run in a browser

karma.conf.cjs

@@ -25,17 +25,17 @@ module.exports = function (config) {
       { pattern: 'dist/rapid.js', included: true },
       { pattern: 'dist/rapid.css', included: true },
       { pattern: 'dist/**/*', included: false },
-      { pattern: 'test/spec/renderer/*.json', included: true, served: true},
-      'test/spec/spec_helpers.js',
-      'test/spec/**/*.js'
+      { pattern: 'test/browser/renderer/*.json', included: true, served: true},
+      'test/browser/spec_helpers.js',
+      'test/browser/**/*.js'
     ],
 
     // list of files / patterns to exclude
     exclude: [
-      'test/spec/pixi/*.js',
+      'test/browser/pixi/*.js',
       // Comment the next line to run the OSM renderer-specific unit test, which right now merely exercise the code.
       // These tests don't actually make any assertions and therefore always succeed.
-      'test/spec/renderer/PixiRenderer.js'
+      'test/browser/renderer/PixiRenderer.js'
     ],
 
     proxies: {
@@ -48,7 +48,7 @@ module.exports = function (config) {
     // available preprocessors: https://www.npmjs.com/search?q=keywords:karma-preprocessor
     preprocessors: {
       'dist/rapid.js': ['coverage'],
-      'test/spec/renderer/*.json': ['json_fixtures']
+      'test/browser/renderer/*.json': ['json_fixtures']
     },
 
     // test results reporter to use
@@ -98,4 +98,4 @@ module.exports = function (config) {
       }
     }
   });
-};
+};

modules/Context.js

@@ -3,12 +3,12 @@ import { select as d3_select } from 'd3-selection';
 import { Projection, geoScaleToZoom } from '@rapid-sdk/math';
 import { utilUnicodeCharsTruncated } from '@rapid-sdk/util';
 
-import { behaviors } from './behaviors';
-import { modes } from './modes';
-import { services } from './services';
-import { systems } from './core';
+import { behaviors } from './behaviors/index.js';
+import { modes } from './modes/index.js';
+import { services } from './services/index.js';
+import { systems } from './core/index.js';
 
-import { utilKeybinding } from './util';
+import { utilKeybinding } from './util/keybinding.js';
 
 const MINZOOM = 15;
 const TILESIZE = 256;

modules/actions/add_member.js

@@ -1,7 +1,7 @@
 import { utilArrayGroupBy, utilObjectOmit } from '@rapid-sdk/util';
 
-import { osmJoinWays } from '../osm/multipolygon';
-import { osmWay } from '../osm/way';
+import { osmJoinWays } from '../osm/multipolygon.js';
+import { osmWay } from '../osm/way.js';
 
 
 export function actionAddMember(relationId, member, memberIndex, insertPair) {

modules/actions/change_preset.js

@@ -1,4 +1,4 @@
-import { actionSyncCrossingTags } from './sync_crossing_tags';
+import { actionSyncCrossingTags } from './sync_crossing_tags.js';
 
 export function actionChangePreset(entityID, oldPreset, newPreset, skipFieldDefaults) {
   return function action(graph) {

modules/actions/circularize.js

@@ -7,7 +7,7 @@ import {
 import { vecInterp, vecLength, vecLengthSquare } from '@rapid-sdk/math';
 import { utilArrayUniq } from '@rapid-sdk/util';
 
-import { osmNode } from '../osm/node';
+import { osmNode } from '../osm/node.js';
 
 
 export function actionCircularize(wayId, projection, maxAngle) {

modules/actions/connect.js

@@ -1,7 +1,7 @@
 import { utilArrayUniq } from '@rapid-sdk/util';
 
-import { actionDeleteNode } from './delete_node';
-import { actionDeleteWay } from './delete_way';
+import { actionDeleteNode } from './delete_node.js';
+import { actionDeleteWay } from './delete_way.js';
 
 
 // Connect the ways at the given nodes.

modules/actions/delete_member.js

@@ -1,4 +1,4 @@
-import { actionDeleteRelation } from './delete_relation';
+import { actionDeleteRelation } from './delete_relation.js';
 
 
 export function actionDeleteMember(relationId, memberIndex) {

modules/actions/delete_members.js

@@ -1,4 +1,4 @@
-import { actionDeleteMember } from './delete_member';
+import { actionDeleteMember } from './delete_member.js';
 
 
 export function actionDeleteMembers(relationId, memberIndexes) {

modules/actions/delete_multiple.js

@@ -1,6 +1,6 @@
-import { actionDeleteNode } from './delete_node';
-import { actionDeleteRelation } from './delete_relation';
-import { actionDeleteWay } from './delete_way';
+import { actionDeleteNode } from './delete_node.js';
+import { actionDeleteRelation } from './delete_relation.js';
+import { actionDeleteWay } from './delete_way.js';
 
 
 export function actionDeleteMultiple(ids) {

modules/actions/delete_node.js

@@ -1,5 +1,5 @@
-import { actionDeleteRelation } from './delete_relation';
-import { actionDeleteWay } from './delete_way';
+import { actionDeleteRelation } from './delete_relation.js';
+import { actionDeleteWay } from './delete_way.js';
 
 
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteNodeAction.as

modules/actions/delete_relation.js

@@ -1,6 +1,6 @@
 import { utilArrayUniq } from '@rapid-sdk/util';
 
-import { actionDeleteMultiple } from './delete_multiple';
+import { actionDeleteMultiple } from './delete_multiple.js';
 
 
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteRelationAction.as

modules/actions/delete_way.js

@@ -1,5 +1,5 @@
-import { osmNodeGeometriesForTags } from '../osm/tags';
-import { actionDeleteRelation } from './delete_relation';
+import { osmNodeGeometriesForTags } from '../osm/tags.js';
+import { actionDeleteRelation } from './delete_relation.js';
 
 
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/DeleteWayAction.as

modules/actions/disconnect.js

@@ -1,4 +1,4 @@
-import { osmNode } from '../osm/node';
+import { osmNode } from '../osm/node.js';
 
 
 // Disconnect the ways at the given node.
@@ -15,7 +15,7 @@ import { osmNode } from '../osm/node';
 //   https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/actions/UnGlueAction.java
 //
 export function actionDisconnect(nodeId, newNodeID) {
-    var wayIds;
+    var _wayIDs;
 
 
     var action = function(graph) {
@@ -50,7 +50,7 @@ export function actionDisconnect(nodeId, newNodeID) {
         var way, waynode;
         for (var i = 0; i < parentWays.length; i++) {
             way = parentWays[i];
-            if (wayIds && wayIds.indexOf(way.id) === -1) {
+            if (_wayIDs && _wayIDs.indexOf(way.id) === -1) {
                 keeping = true;
                 continue;
             }
@@ -62,8 +62,8 @@ export function actionDisconnect(nodeId, newNodeID) {
                     if (waynode === nodeId) {
                         if (way.isClosed() &&
                             parentWays.length > 1 &&
-                            wayIds &&
-                            wayIds.indexOf(way.id) !== -1 &&
+                            _wayIDs &&
+                            _wayIDs.indexOf(way.id) !== -1 &&
                             j === way.nodes.length - 1) {
                             continue;
                         }
@@ -103,9 +103,9 @@ export function actionDisconnect(nodeId, newNodeID) {
             var relations = graph.parentRelations(way);
             relations.forEach(function(relation) {
                 if (relation.id in seenRelationIds) {
-                    if (wayIds) {
-                        if (wayIds.indexOf(way.id) !== -1 ||
-                            wayIds.indexOf(seenRelationIds[relation.id]) !== -1) {
+                    if (_wayIDs) {
+                        if (_wayIDs.indexOf(way.id) !== -1 ||
+                            _wayIDs.indexOf(seenRelationIds[relation.id]) !== -1) {
                             sharedRelation = relation;
                         }
                     } else {
@@ -122,8 +122,8 @@ export function actionDisconnect(nodeId, newNodeID) {
 
 
     action.limitWays = function(val) {
-        if (!arguments.length) return wayIds;
-        wayIds = val;
+        if (!arguments.length) return _wayIDs;
+        _wayIDs = val;
         return action;
     };
 

modules/actions/extract.js

@@ -1,6 +1,7 @@
 import { polygonCentroid as d3_polygonCentroid } from 'd3-polygon';
 import { vecInterp } from '@rapid-sdk/math';
-import { osmNode } from '../osm/node';
+
+import { osmNode } from '../osm/node.js';
 
 
 export function actionExtract(entityID, projection) {

modules/actions/index.js

@@ -1,42 +1,41 @@
-export { actionAddEntity } from './add_entity';
-export { actionAddMember } from './add_member';
-export { actionAddMidpoint } from './add_midpoint';
-export { actionAddVertex } from './add_vertex';
-export { actionChangeMember } from './change_member';
-export { actionChangePreset } from './change_preset';
-export { actionChangeTags } from './change_tags';
-export { actionCircularize } from './circularize';
-export { actionConnect } from './connect';
-export { actionCopyEntities } from './copy_entities';
-export { actionDeleteMember } from './delete_member';
-export { actionDeleteMultiple } from './delete_multiple';
-export { actionDeleteNode } from './delete_node';
-export { actionDeleteRelation } from './delete_relation';
-export { actionDeleteWay } from './delete_way';
-export { actionDiscardTags } from './discard_tags';
-export { actionDisconnect } from './disconnect';
-export { actionExtract } from './extract';
-export { actionJoin } from './join';
-export { actionMerge } from './merge';
-export { actionMergeNodes } from './merge_nodes';
-export { actionMergePolygon } from './merge_polygon';
-export { actionMergeRemoteChanges } from './merge_remote_changes';
-export { actionMove } from './move';
-export { actionMoveMember } from './move_member';
-export { actionMoveNode } from './move_node';
-export { actionNoop } from './noop';
-export { actionOrthogonalize } from './orthogonalize';
-export { actionRestrictTurn } from './restrict_turn';
-export { actionReverse } from './reverse';
-export { actionRevert } from './revert';
-export { actionRotate } from './rotate';
-export { actionScale } from './scale';
-export { actionSplit } from './split';
-export { actionStraightenNodes } from './straighten_nodes';
-export { actionStraightenWay } from './straighten_way';
-export { actionSyncCrossingTags } from './sync_crossing_tags';
-export { actionUnrestrictTurn } from './unrestrict_turn';
+export { actionAddEntity } from './add_entity.js';
+export { actionAddMember } from './add_member.js';
+export { actionAddMidpoint } from './add_midpoint.js';
+export { actionAddVertex } from './add_vertex.js';
+export { actionChangeMember } from './change_member.js';
+export { actionChangePreset } from './change_preset.js';
+export { actionChangeTags } from './change_tags.js';
+export { actionCircularize } from './circularize.js';
+export { actionConnect } from './connect.js';
+export { actionCopyEntities } from './copy_entities.js';
+export { actionDeleteMember } from './delete_member.js';
+export { actionDeleteMultiple } from './delete_multiple.js';
+export { actionDeleteNode } from './delete_node.js';
+export { actionDeleteRelation } from './delete_relation.js';
+export { actionDeleteWay } from './delete_way.js';
+export { actionDiscardTags } from './discard_tags.js';
+export { actionDisconnect } from './disconnect.js';
+export { actionExtract } from './extract.js';
+export { actionJoin } from './join.js';
+export { actionMerge } from './merge.js';
+export { actionMergeNodes } from './merge_nodes.js';
+export { actionMergePolygon } from './merge_polygon.js';
+export { actionMergeRemoteChanges } from './merge_remote_changes.js';
+export { actionMove } from './move.js';
+export { actionMoveMember } from './move_member.js';
+export { actionMoveNode } from './move_node.js';
+export { actionNoop } from './noop.js';
+export { actionOrthogonalize } from './orthogonalize.js';
+export { actionRapidAcceptFeature } from './rapid_accept_feature.js';
+export { actionRestrictTurn } from './restrict_turn.js';
+export { actionReverse } from './reverse.js';
+export { actionRevert } from './revert.js';
+export { actionRotate } from './rotate.js';
+export { actionScale } from './scale.js';
+export { actionSplit } from './split.js';
+export { actionStraightenNodes } from './straighten_nodes.js';
+export { actionStraightenWay } from './straighten_way.js';
+export { actionSyncCrossingTags } from './sync_crossing_tags.js';
+export { actionUnrestrictTurn } from './unrestrict_turn.js';
 export { actionReflect } from './reflect.js';
-export { actionUpgradeTags } from './upgrade_tags';
-
-export { actionRapidAcceptFeature } from './rapid_accept_feature';
+export { actionUpgradeTags } from './upgrade_tags.js';

modules/actions/join.js

@@ -1,10 +1,10 @@
 import { geomPathIntersections } from '@rapid-sdk/math';
 import { utilArrayGroupBy, utilArrayIdentical, utilArrayIntersection } from '@rapid-sdk/util';
 
-import { actionDeleteRelation } from './delete_relation';
-import { actionDeleteWay } from './delete_way';
-import { osmIsInterestingTag } from '../osm/tags';
-import { osmJoinWays } from '../osm/multipolygon';
+import { actionDeleteRelation } from './delete_relation.js';
+import { actionDeleteWay } from './delete_way.js';
+import { osmIsInterestingTag } from '../osm/tags.js';
+import { osmJoinWays } from '../osm/multipolygon.js';
 
 
 // Join ways at the end node they share.

modules/actions/merge.js

@@ -1,6 +1,6 @@
 import { utilArrayGroupBy, utilArrayUniq } from '@rapid-sdk/util';
 
-import { osmTagSuggestingArea } from '../osm/tags';
+import { osmTagSuggestingArea } from '../osm/tags.js';
 
 
 export function actionMerge(ids) {

modules/actions/merge_nodes.js

@@ -1,6 +1,7 @@
-import { actionConnect } from './connect';
 import { vecAdd, vecScale } from '@rapid-sdk/math';
 
+import { actionConnect } from './connect.js';
+
 
 // `actionMergeNodes` is just a combination of:
 //

modules/actions/merge_polygon.js

@@ -1,7 +1,7 @@
 import { geomPolygonContainsPolygon } from '@rapid-sdk/math';
 import { utilArrayGroupBy, utilArrayIntersection, utilObjectOmit } from '@rapid-sdk/util';
 
-import { osmJoinWays, osmRelation } from '../osm';
+import { osmJoinWays, osmRelation } from '../osm/index.js';
 
 
 export function actionMergePolygon(ids, newRelationId) {

modules/actions/merge_remote_changes.js

@@ -3,8 +3,8 @@ import { utilArrayUnion, utilArrayUniq } from '@rapid-sdk/util';
 import deepEqual from 'fast-deep-equal';
 import { diff3Merge } from 'node-diff3';
 
-import { actionDeleteMultiple } from './delete_multiple';
-import { osmEntity } from '../osm';
+import { actionDeleteMultiple } from './delete_multiple.js';
+import { osmEntity } from '../osm/entity.js';
 
 
 export function actionMergeRemoteChanges(id, options = {}) {

modules/actions/move.js

@@ -1,8 +1,8 @@
 import { geomPathIntersections, geomPathLength, vecAdd, vecAngle, vecEqual, vecInterp, vecSubtract } from '@rapid-sdk/math';
 import { utilArrayIntersection } from '@rapid-sdk/util';
 
-import { geoChooseEdge } from '../geo';
-import { osmNode } from '../osm/node';
+import { geoChooseEdge } from '../geo/index.js';
+import { osmNode } from '../osm/node.js';
 
 
 // https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/command/MoveCommand.java

modules/actions/orthogonalize.js

@@ -2,8 +2,8 @@ import {
   vecAdd, vecEqual, vecInterp, vecLength, vecNormalize, vecProject, vecScale, vecSubtract
 } from '@rapid-sdk/math';
 
-import { actionDeleteNode } from './delete_node';
-import { geoOrthoNormalizedDotProduct, geoOrthoCalcScore, geoOrthoCanOrthogonalize } from '../geo';
+import { actionDeleteNode } from './delete_node.js';
+import { geoOrthoNormalizedDotProduct, geoOrthoCalcScore, geoOrthoCanOrthogonalize } from '../geo/index.js';
 
 
 export function actionOrthogonalize(wayID, projection, vertexID, degThresh, ep) {

modules/actions/rapid_accept_feature.js

@@ -1,5 +1,6 @@
 import { vecInterp } from '@rapid-sdk/math';
-import { osmNode, osmRelation, osmWay } from '../osm';
+
+import { osmNode, osmRelation, osmWay } from '../osm/index.js';
 
 
 function findConnectionPoint(graph, newNode, targetWay, nodeA, nodeB) {

modules/actions/restrict_turn.js

@@ -1,4 +1,4 @@
-import { osmRelation } from '../osm/relation';
+import { osmRelation } from '../osm/relation.js';
 
 
 // `actionRestrictTurn` creates a turn restriction relation.

modules/actions/revert.js

@@ -1,5 +1,5 @@
-import { actionDeleteRelation } from './delete_relation';
-import { actionDeleteWay } from './delete_way';
+import { actionDeleteRelation } from './delete_relation.js';
+import { actionDeleteWay } from './delete_way.js';
 
 
 export function actionRevert(id) {