Core refactor

API.md

@@ -75,22 +75,6 @@ which makes hot code replacement tricky.  (ES6 module exports are
 Because of this, the parts of Rapid which are designed for customization are exported
 as live bound objects that can be overridden at runtime _before initializing the Rapid context_.
 
-### Services
-
-The `Rapid.services` object includes code that talks to other web services.
-
-To replace the OSM service with a custom service that exactly mimics the default OSM service:
-```js
-Rapid.services.osm = serviceMyOSM;
-```
-
-Some services may be removed entirely.  For example, to remove the Mapillary service:
-```js
-Rapid.services.mapillary = undefined;
-// or
-delete Rapid.services.mapillary;
-```
-
 
 ### Background Imagery
 

data/intro_rapid_graph.json

@@ -2,47 +2,47 @@
     "n-2852": {
       "__fbid__": "-2852",
       "__origid__": "-2852",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-2852",
       "loc": [-85.6297512, 41.9561476]
     },
     "n-2805": {
       "__fbid__": "-2805",
       "__origid__": "-2805",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-2805",
       "loc": [-85.6282000, 41.9561500]
     },
     "n-5150": {
       "__fbid__": "-5150",
       "__origid__": "-5150",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5150",
       "loc": [-85.6281089, 41.9561288]
     },
     "n-5151": {
       "__fbid__": "-5151",
       "__origid__": "-5151",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5151",
       "loc": [-85.6278017, 41.9560522]
     },
     "n-5152": {
       "__fbid__": "-5152",
       "__origid__": "-5152",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "n-5152",
       "loc": [-85.6272470, 41.9558580]
     },
     "w-516": {
       "__fbid__": "-516",
       "__origid__": "-516",
-      "__service__": "fbml",
+      "__service__": "mapwithai",
       "__datasetid__": "rapid_intro_graph",
       "id": "w-516",
       "nodes": ["n-2852", "n-2805", "n-5150", "n-5151", "n-5152"],
@@ -51,4 +51,4 @@
         "name": "Tulip Lane"
       }
     }
-}
+}

dist/index.html

@@ -41,20 +41,21 @@
           container.style.padding = '20px';
 
         } else {
-          var context = Rapid.coreContext()
-            .assetPath('')
-            .apiConnections([
-              {
-                url: 'https://www.openstreetmap.org',
-                client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
-                client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
-              }, {
-                url: 'https://api06.dev.openstreetmap.org',
-                client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
-                client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
-              }
-            ])
-            .containerNode(container);
+          const context = new Rapid.Context();
+          context.containerNode = container;
+          context.assetPath = '';
+          context.apiConnections = [
+            {
+              url: 'https://www.openstreetmap.org',
+              client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
+              client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
+            }, {
+              url: 'https://api06.dev.openstreetmap.org',
+              client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
+              client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
+            }
+          ];
+
           context.init();
         }
       }

index.html

@@ -41,20 +41,21 @@
           container.style.padding = '20px';
 
         } else {
-          var context = Rapid.coreContext()
-            .assetPath('dist/')
-            .apiConnections([
-              {
-                url: 'https://www.openstreetmap.org',
-                client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
-                client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
-              }, {
-                url: 'https://api06.dev.openstreetmap.org',
-                client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
-                client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
-              }
-            ])
-            .containerNode(container);
+          const context = new Rapid.Context();
+          context.containerNode = container;
+          context.assetPath = 'dist/';
+          context.apiConnections = [
+            {
+              url: 'https://www.openstreetmap.org',
+              client_id: 'O3g0mOUuA2WY5Fs826j5tP260qR3DDX7cIIE2R2WWSc',
+              client_secret: 'b4aeHD1cNeapPPQTrvpPoExqQRjybit6JBlNnxh62uE'
+            }, {
+              url: 'https://api06.dev.openstreetmap.org',
+              client_id: 'zod4KxHLYtOOvr8LTdUIhZqeAtDxzHRoEsaNkMt2pBc',
+              client_secret: 'wnDUzUidx8CM948E5fgdk89_-IeOOyjfvDhtn0-mX6k'
+            }
+          ];
+
           window.context = context;  // for debugging
           context.init();
         }

karma.conf.cjs

@@ -1,6 +1,3 @@
-// Karma configuration
-// Generated on Wed Sep 01 2021 16:45:06 GMT+0200 (Central European Summer Time)
-
 module.exports = function (config) {
   config.set({
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -30,9 +27,6 @@ module.exports = function (config) {
     // list of files / patterns to exclude
     exclude: [
       'test/spec/pixi/*.js',
-      'test/spec/renderer/features.js',
-      'test/spec/renderer/map.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'
@@ -72,7 +66,7 @@ module.exports = function (config) {
     // start these browsers
     // available browser launchers: https://www.npmjs.com/search?q=keywords:karma-launcher
     browsers: [
-      'ChromeHeadless',
+      'ChromeHeadless'
     ],
 
     // Continuous Integration mode